Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Larsundso committed Dec 19, 2023
1 parent f230f27 commit 8d8f292
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 53 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@discordjs/core": "^1.1.1",
"@discordjs/rest": "^2.2.0",
"@prisma/client": "5.7.0",
"@prisma/client": "5.7.1",
"@total-typescript/ts-reset": "^0.5.1",
"@types/lodash": "^4.14.202",
"@types/lodash.merge": "^4.6.9",
Expand Down Expand Up @@ -73,7 +73,7 @@
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.0.1",
"prisma": "^5.7.0",
"prisma": "^5.7.1",
"source-map-support": "^0.5.21"
},
"pnpm": {
Expand Down
56 changes: 28 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ export default async (
body: Discord.RESTPutAPIApplicationGuildCommandsJSONBody,
) =>
(cache.apis.get(guild.id) ?? API).applicationCommands
.bulkOverwriteGuildCommands(await getBotIdFromGuild(guild), guild.id, body)
.bulkOverwriteGuildCommands(
await getBotIdFromGuild(guild),
guild.id,
body.map((c) => ({ ...c, default_member_permissions: String(c.default_member_permissions) })),
)
.then((cmds) => {
const parsed = cmds.map(
(cmd) => new Classes.ApplicationCommand(guild.client, cmd, guild, guild.id),
Expand Down
8 changes: 2 additions & 6 deletions src/Commands/ButtonCommands/rp/toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,14 @@ export const create = async (guild: Discord.Guild) => {
});

await ch.request.commands.bulkOverwriteGuildCommands(guild, [
...registerCommands.map((c) => c.toJSON() as Discord.APIApplicationCommand),
...registerCommands.map((c) => c.toJSON()),
...(ch.cache.commands.get(guild.id) ?? guild.commands.cache.map((c) => c))
.map((c) => c.toJSON() as Discord.APIApplicationCommand)
.filter((c) => !ch.constants.commands.interactions.find((i) => i.name === c.name)),
]);

await ch.DataBase.guildsettings.update({
where: { guildid: guild.id },
data: {
rpenableruns: {
increment: 1,
},
},
data: { rpenableruns: { increment: 1 } },
});
};
2 changes: 2 additions & 0 deletions src/Events/readyEvents/startupTasks/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,8 @@ export const tasks = {
pins: async (guild: Discord.Guild) => {
guild.channels.cache.forEach(async (c) => {
if (!c.isTextBased()) return;
if (c.isThread() && c.name === '⚠️') return;

ch.cache.pins.get('', c);
});
},
Expand Down
40 changes: 24 additions & 16 deletions src/Languages/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -314,22 +314,22 @@
"descMemberUpdateAudit": "{{executor}}has updated\n{{user}}",
"descGuildUpdate": "The Server was updated",
"descGuildUpdateAudit": "{{executor}}has updated the Server",
"descAuditLogCreate": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}",
"descAuditLogCreateGuild": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{guild}}",
"descAuditLogCreateChannel": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{channel}}",
"descAuditLogCreateUser": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{user}}",
"descAuditLogCreateRole": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{role}}",
"descAuditLogCreateInvite": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{invite}}",
"descAuditLogCreateWebhook": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{webhook}}",
"descAuditLogCreateEmoji": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{emoji}}",
"descAuditLogCreateMessage": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{message}}",
"descAuditLogCreateIntegration": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{integration}}",
"descAuditLogCreateStageInstance": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{stageInstance}}",
"descAuditLogCreateSticker": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{sticker}}",
"descAuditLogCreateThread": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{thread}}",
"descAuditLogCreateGuildScheduledEvent": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{guildScheduledEvent}}",
"descAuditLogCreateApplicationCommand": "New {{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{applicationCommand}}",
"descAuditLogCreateAutoModerationRule": "New \n{{audit}}created {{audit.executor ? `by\n${this.languageFunction.getUser(audit.executor)}` : ''}}for\n{{autoModerationRule}}",
"descAuditLogCreate": "New \n{{audit}}created {{executor}}",
"descAuditLogCreateGuild": "New \n{{audit}}created {{executor}}for\n{{guild}}",
"descAuditLogCreateChannel": "New \n{{audit}}created {{executor}}for\n{{channel}}",
"descAuditLogCreateUser": "New \n{{audit}}created {{executor}}for\n{{user}}",
"descAuditLogCreateRole": "New \n{{audit}}created {{executor}}for\n{{role}}",
"descAuditLogCreateInvite": "New \n{{audit}}created {{executor}}for\n{{invite}}",
"descAuditLogCreateWebhook": "New \n{{audit}}created {{executor}}for\n{{webhook}}",
"descAuditLogCreateEmoji": "New \n{{audit}}created {{executor}}for\n{{emoji}}",
"descAuditLogCreateMessage": "New \n{{audit}}created {{executor}}for\n{{message}}",
"descAuditLogCreateIntegration": "New \n{{audit}}created {{executor}}for\n{{integration}}",
"descAuditLogCreateStageInstance": "New \n{{audit}}created {{executor}}for\n{{stageInstance}}",
"descAuditLogCreateSticker": "New \n{{audit}}created {{executor}}for\n{{sticker}}",
"descAuditLogCreateThread": "New \n{{audit}}created {{executor}}for\n{{thread}}",
"descAuditLogCreateGuildScheduledEvent": "New \n{{audit}}created {{executor}}for\n{{guildScheduledEvent}}",
"descAuditLogCreateApplicationCommand": "New {{audit}}created {{executor}}for\n{{applicationCommand}}",
"descAuditLogCreateAutoModerationRule": "New \n{{audit}}created {{executor}}for\n{{autoModerationRule}}",
"descAuditLogCreateAutoModeration": "New \n{{audit}}created by\n{{autoModerationRule}}for\n{{user}}",
"descMemberPrune": "{{executor}}pruned `{{amount}}` Members\nfor `{{days}}` Days of inactivity",
"auditLogChangeKeys": {
Expand Down Expand Up @@ -3435,6 +3435,14 @@
"name": "Error Channel",
"desc": "The Channel to post Error Messages in"
},
"statuschannel": {
"name": "Status-Channel",
"desc": "The Channel to post Ayako Status Messages in"
},
"updateschannel": {
"name": "Updates-Channel",
"desc": "The Channel to post Ayako Updates in"
},
"ptreminderenabled": {
"name": "Privacy & Terms Reminder",
"desc": "Whethr the Privacy and Terms Reminder is enabled or not"
Expand Down

0 comments on commit 8d8f292

Please sign in to comment.