Skip to content

Commit

Permalink
close #35, close #36
Browse files Browse the repository at this point in the history
  • Loading branch information
gx1285 committed Nov 11, 2023
1 parent 9e5ae15 commit 336de96
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint",
"version": "8.44.0-sdk",
"version": "8.52.0-sdk",
"main": "./lib/api.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.8.8-sdk",
"version": "3.0.3-sdk",
"main": "./index.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.1.6-sdk",
"version": "5.2.2-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@commitlint/cli": "^18.0.0",
"@commitlint/config-conventional": "^18.0.0",
"@types/json-bigint": "^1.0.3",
"@types/node": "20.8.7",
"@types/node": "^20.8.7",
"@types/ws": "^8.5.8",
"@types/xml2js": "^0.4.13",
"@typescript-eslint/eslint-plugin": "^6.8.0",
Expand Down
4 changes: 0 additions & 4 deletions src/command/messagecotextmenu/ForcePin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ export default {
userId: interaction.targetMessage.author.id,
latestMessageId: message_.id,
latestChannelId: message_.channelId,
avatarURL: messageUser.extDefaultAvatarURL({ extension: 'webp' }),
username: messageUser.displayName,
};
await forcePin.set(interaction.targetMessage.channelId, data);
});
Expand All @@ -116,8 +114,6 @@ export default {
userId: interaction.targetMessage.author.id,
latestMessageId: message_.id,
latestChannelId: message_.channelId,
avatarURL: messageUser.extDefaultAvatarURL({ extension: 'webp' }),
username: messageUser.displayName,
};
await forcePin.set(interaction.targetMessage.channelId, data);
});
Expand Down
8 changes: 2 additions & 6 deletions src/messages/ForcePin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,13 @@ export default async function (message: Message) {
userId: data.userId,
latestMessageId: message_.id,
latestChannelId: message_.channelId,
avatarURL: user_.extDefaultAvatarURL({ extension: 'webp' }),
username: user_.displayName,
};
await botData.forcePin.set(data.latestChannelId, setData);
})
: webhook
.send({
avatarURL: data.avatarURL,
username: data.username,
avatarURL: user_.extDefaultAvatarURL({ extension: 'webp' }),
username: user_.displayName,
embeds: data.embeds,
content: data.content,
files: data.attachments,
Expand All @@ -61,8 +59,6 @@ export default async function (message: Message) {
userId: data.userId,
latestMessageId: message_.id,
latestChannelId: message_.channelId,
avatarURL: data.avatarURL,
username: data.username,
};
await botData.forcePin.set(data.latestChannelId, setData);
});
Expand Down
2 changes: 0 additions & 2 deletions src/utils/ForcePinDataType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ export interface ForcePinDataType {
content: string;
latestMessageId: string;
latestChannelId: string;
avatarURL: string;
username: string;
}
1 change: 1 addition & 0 deletions src/utils/interactionExtrans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
ButtonInteraction,
RoleSelectMenuInteraction,
ModalSubmitInteraction,
Message,
} from 'discord.js';
declare module 'discord.js' {
interface ChatInputCommandInteraction {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/permission.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,5 @@ export const translatePermission = (permissionFlags: PermissionFlags[] | Permiss
'4398046511104': 'サウンドボードを使用',
'35184372088832': '外部のサウンドの使用',
'70368744177664': 'ボイスメッセージを送信',
}[flag.toString()]),
})[flag.toString()],
);
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,14 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:20.8.7":
"@types/node@npm:^18.11.9, @types/node@npm:^18.17.15":
version: 18.18.6
resolution: "@types/node@npm:18.18.6"
checksum: a847639b8455fd3dfa6dbc2917274c82c9db789f1d41aaf69f94ac6c9e54c3c1dd29be6e1e1ccd7c17e54db3d78d7011bc4e70544c6447ceca253dccc0a187e1
languageName: node
linkType: hard

"@types/node@npm:^20.8.7":
version: 20.8.7
resolution: "@types/node@npm:20.8.7"
dependencies:
Expand All @@ -737,13 +744,6 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^18.11.9, @types/node@npm:^18.17.15":
version: 18.18.6
resolution: "@types/node@npm:18.18.6"
checksum: a847639b8455fd3dfa6dbc2917274c82c9db789f1d41aaf69f94ac6c9e54c3c1dd29be6e1e1ccd7c17e54db3d78d7011bc4e70544c6447ceca253dccc0a187e1
languageName: node
linkType: hard

"@types/normalize-package-data@npm:^2.4.0":
version: 2.4.1
resolution: "@types/normalize-package-data@npm:2.4.1"
Expand Down Expand Up @@ -1209,7 +1209,7 @@ __metadata:
"@commitlint/config-conventional": ^18.0.0
"@napi-rs/canvas": ^0.1.44
"@types/json-bigint": ^1.0.3
"@types/node": 20.8.7
"@types/node": ^20.8.7
"@types/ws": ^8.5.8
"@types/xml2js": ^0.4.13
"@typescript-eslint/eslint-plugin": ^6.8.0
Expand Down

0 comments on commit 336de96

Please sign in to comment.