diff --git a/api/package-lock.json b/api/package-lock.json index 0a9af8e0..276ae72a 100644 Binary files a/api/package-lock.json and b/api/package-lock.json differ diff --git a/api/package.json b/api/package.json index 96afa82e..c9dd6b1f 100644 --- a/api/package.json +++ b/api/package.json @@ -35,7 +35,6 @@ }, "homepage": "https://github.com/fosscord/fosscord-api#readme", "dependencies": { - "@fosscord/server-util": "^1.3.52", "@fosscord/util": "file:../util", "@types/jest": "^26.0.22", "@types/json-schema": "^7.0.7", diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts b/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts index 5784b5d5..e4308364 100644 --- a/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -17,8 +17,8 @@ router.patch("/", check(MemberNickChangeSchema), async (req: Request, res: Respo const perms = await getPermission(req.user_id, guild_id); perms.hasThrow(permissionString); - await changeNickname(member_id, guild_id, req.body.nickname); - res.status(204); + await changeNickname(member_id, guild_id, req.body.nick); + res.status(200).send(); }); export default router; diff --git a/api/src/schema/Emoji.ts b/api/src/schema/Emoji.ts new file mode 100644 index 00000000..deaccf5c --- /dev/null +++ b/api/src/schema/Emoji.ts @@ -0,0 +1,14 @@ +// https://discord.com/developers/docs/resources/emoji + + +export const EmojiCreateSchema = { + name: String, //name of the emoji + image: String, // image data the 128x128 emoji image uri + roles: Array //roles allowed to use this emoji +}; + +export interface EmojiCreateSchema { + name: string; // name of the emoji + image: string; // image data the 128x128 emoji image uri + roles: []; //roles allowed to use this emoji +} diff --git a/api/src/util/Member.ts b/api/src/util/Member.ts index ee3f64ad..53ff4632 100644 --- a/api/src/util/Member.ts +++ b/api/src/util/Member.ts @@ -197,6 +197,7 @@ export async function removeRole(user_id: string, guild_id: string, role_id: str export async function changeNickname(user_id: string, guild_id: string, nickname: string) { const user = await getPublicUser(user_id); + var memberObj = await MemberModel.findOneAndUpdate( { id: user_id, diff --git a/gateway/src/schema/Identify.ts b/gateway/src/schema/Identify.ts index 646c5f05..f6d95204 100644 --- a/gateway/src/schema/Identify.ts +++ b/gateway/src/schema/Identify.ts @@ -26,6 +26,8 @@ export const IdentifySchema = { $client_event_source: String, $client_version: String, $system_locale: String, + $window_manager: String, + $distro: String, }, $presence: ActivitySchema, $compress: Boolean, diff --git a/util/package.json b/util/package.json index c2b08a3d..5ce97669 100644 --- a/util/package.json +++ b/util/package.json @@ -1,7 +1,7 @@ { "name": "@fosscord/util", - "version": "1.3.52", - "description": "Utility functions and database models for fosscord", + "version": "1.3.55", + "description": "Utility functions for the all server repositories", "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { diff --git a/util/src/util/Permissions.ts b/util/src/util/Permissions.ts index 445e901f..63d87e48 100644 --- a/util/src/util/Permissions.ts +++ b/util/src/util/Permissions.ts @@ -49,7 +49,7 @@ type PermissionString = | "MANAGE_NICKNAMES" | "MANAGE_ROLES" | "MANAGE_WEBHOOKS" - | "MANAGE_EMOJIS"; + | "MANAGE_EMOJIS_AND_STICKERS"; const CUSTOM_PERMISSION_OFFSET = BigInt(1) << BigInt(48); // 16 free custom permission bits, and 16 for discord to add new ones @@ -87,7 +87,7 @@ export class Permissions extends BitField { MANAGE_NICKNAMES: BigInt(1) << BigInt(27), MANAGE_ROLES: BigInt(1) << BigInt(28), MANAGE_WEBHOOKS: BigInt(1) << BigInt(29), - MANAGE_EMOJIS: BigInt(1) << BigInt(30), + MANAGE_EMOJIS_AND_STICKERS: BigInt(1) << BigInt(30), /** * CUSTOM PERMISSIONS ideas: * - allow user to dm members