chore: release 3.1.2

aqued-dev · Jul 16, 2023 · 797392c · 797392c
1 parent 8683ed6
commit 797392c
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 103 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "aqued",
-	"version": "3.1.1",
+	"version": "3.1.2",
 	"description": "Discord Bot",
 	"main": "dist/index.js",
 	"author": "aqued-dev",
@@ -13,8 +13,8 @@
 		"start": "node dist/src/index.js"
 	},
 	"dependencies": {
-		"@discordjs/rest": "^1.7.2-dev.1689249890-ceab07b.0",
-		"discord.js": "^14.11.1-dev.1689249910-ceab07b.0",
+		"@discordjs/rest": "^1.7.2-dev.1689422667-8c782bf.0",
+		"discord.js": "^14.11.1-dev.1689422688-8c782bf.0",
 		"enka-network-api": "^3.7.1",
 		"json-bigint": "^1.0.0",
 		"mongoose": "^7.3.4",
@@ -33,10 +33,10 @@
 		"@typescript-eslint/parser": "^6.0.0",
 		"@yarnpkg/pnpify": "3.1.6",
 		"@yarnpkg/sdks": "^3.0.0-rc.48",
-		"eslint": "^8.44.0",
+		"eslint": "^8.45.0",
 		"eslint-config-prettier": "^8.8.0",
 		"eslint-formatter-pretty": "^5.0.0",
-		"eslint-plugin-unicorn": "^47.0.0",
+		"eslint-plugin-unicorn": "^48.0.0",
 		"husky": "^8.0.3",
 		"prettier": "2.8.8",
 		"rimraf": "^5.0.1"

diff --git a/src/index.ts b/src/index.ts
@@ -93,7 +93,7 @@ const {
 	commandExecutors,
 	load,
 } = client.botData;
-await infos.set('version', (await infos.get('version')) || '3.1.1');
+await infos.set('version', (await infos.get('version')) || '3.1.2');
 
 info('Aqued');
 info('repository: https://github.com/aqued-dev/aqued');

diff --git a/src/messages/superGlobalChat.ts b/src/messages/superGlobalChat.ts
@@ -48,8 +48,13 @@ export default async function (message: Message) {
 			message.content.slice(0, 1500) === message.content ? message.content : `${message.content.slice(0, 1500)}...`;
 		const embeds: EmbedBuilder[] = [];
 		if (message.reference) {
-			const repliedMessage: { content: string; id: string; user: User } | undefined =
-				await message.client.botData.superGlobalChat.replyMessages.get(message.reference.messageId);
+			const repliedMessage:
+				| {
+						content: string;
+						id: string;
+						user: { discriminator: string; globalName: string; username: string; extDefaultAvatarURL: string };
+				  }
+				| undefined = await message.client.botData.superGlobalChat.replyMessages.get(message.reference.messageId);
 			if (!repliedMessage) return;
 			data['reference'] = repliedMessage.id;
 			const embed = new EmbedBuilder()
@@ -60,7 +65,7 @@ export default async function (message: Message) {
 								? `${repliedMessage.user.globalName}(@${repliedMessage.user.username})`
 								: `@${repliedMessage.user.username}`
 							: `${repliedMessage.user.username}#${repliedMessage.user.discriminator}`,
-					iconURL: repliedMessage.user.extDefaultAvatarURL({ extension: 'webp' }),
+					iconURL: repliedMessage.user.extDefaultAvatarURL,
 				})
 				.setDescription(repliedMessage.content ?? 'メッセージの内容がありません。')
 				.setColor(Colors.Blue);
@@ -103,8 +108,13 @@ export default async function (message: Message) {
 					});
 					await message.client.botData.superGlobalChat.messages.set(message.id, array);
 					if (message.reference) {
-						const repliedMessage: { content: string; id: string; user: User } | undefined =
-							await message.client.botData.superGlobalChat.replyMessages.get(message.reference.messageId);
+						const repliedMessage:
+							| {
+									content: string;
+									id: string;
+									user: { discriminator: string; globalName: string; username: string; extDefaultAvatarURL: string };
+							  }
+							| undefined = await message.client.botData.superGlobalChat.replyMessages.get(message.reference.messageId);
 						if (!repliedMessage) return;
 						await message.client.botData.superGlobalChat.replyMessages.set(value.id, {
 							content: message.content,
@@ -117,7 +127,12 @@ export default async function (message: Message) {
 		await message.client.botData.superGlobalChat.replyMessages.set(message.id, {
 			content: message.content,
 			id: message.id,
-			user: message.author,
+			user: {
+				discriminator: message.author.discriminator,
+				globalName: message.author.globalName,
+				username: message.author.username,
+				extDefaultAvatarURL: message.author.extDefaultAvatarURL({ extension: 'webp' }),
+			},
 		});
 		message.react('✅');
 		const channel = message.client.channels.cache.get(message.client.botData.sgcJsonChannelId);

diff --git a/src/messages/superGlobalChatDataGet.ts b/src/messages/superGlobalChatDataGet.ts
@@ -15,7 +15,16 @@ export default async function (message: Message) {
 		const data: MessageData | MessageDeleteData | MessageEditData | EmptyData = JSON.parse(message.content);
 		switch (data.type) {
 			case 'message': {
-				await replyMessages.set(data.messageId, { content: data.content, id: message.id, user: message.author });
+				await replyMessages.set(data.messageId, {
+					content: data.content,
+					id: message.id,
+					user: {
+						discriminator: message.author.discriminator,
+						globalName: message.author.globalName,
+						username: message.author.username,
+						extDefaultAvatarURL: message.author.extDefaultAvatarURL({ extension: 'webp' }),
+					},
+				});
 
 				for (const value of registers) {
 					const channel = message.client.channels.cache.get(value);
@@ -31,8 +40,13 @@ export default async function (message: Message) {
 					const files = data.attachmentsUrl ?? [];
 					const embeds: EmbedBuilder[] = [];
 					if (data.reference) {
-						const repliedMessage: { content: string; id: string; user: User } | undefined =
-							await message.client.botData.superGlobalChat.replyMessages.get(data.reference);
+						const repliedMessage:
+							| {
+									content: string;
+									id: string;
+									user: { discriminator: string; globalName: string; username: string; extDefaultAvatarURL: string };
+							  }
+							| undefined = await message.client.botData.superGlobalChat.replyMessages.get(data.reference);
 						if (!repliedMessage) return;
 						const embed = new EmbedBuilder()
 							.setAuthor({
@@ -42,7 +56,7 @@ export default async function (message: Message) {
 											? `${repliedMessage.user.globalName}(@${repliedMessage.user.username})`
 											: `@${repliedMessage.user.username}`
 										: `${repliedMessage.user.username}#${repliedMessage.user.discriminator}`,
-								iconURL: repliedMessage.user.extDefaultAvatarURL({ extension: 'webp' }),
+								iconURL: repliedMessage.user.extDefaultAvatarURL,
 							})
 							.setDescription(repliedMessage.content ?? 'メッセージの内容がありません。')
 							.setColor(Colors.Blue);
@@ -77,7 +91,12 @@ export default async function (message: Message) {
 							await message.client.botData.superGlobalChat.replyMessages.set(value.id, {
 								content: message.content,
 								id: data.messageId,
-								user: message.author,
+								user: {
+									discriminator: message.author.discriminator,
+									globalName: message.author.globalName,
+									username: message.author.username,
+									extDefaultAvatarURL: message.author.extDefaultAvatarURL({ extension: 'webp' }),
+								},
 							});
 						});
 				}