StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-10 12:25:02 +00:00
Code Releases Activity

Type fixes for djs

Browse source
This commit is contained in:
Dark 2021-06-30 04:56:56 +02:00
parent 653d6c1dc2
commit 0822fc15e5
No known key found for this signature in database
GPG key ID: 2CD6ACB6B0A87B8A
130 changed files with 8877 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/plugins/ReactionRoles/commands/ClearReactionRolesCmd.ts
View file

@ -1,4 +1,4 @@
import { Message } from "discord.js";
import { Message, Snowflake } from "discord.js";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { isDiscordRESTError } from "../../../utils";
@ -23,7 +23,7 @@ export const ClearReactionRolesCmd = reactionRolesCmd({
let targetMessage: Message;
try {
targetMessage = await args.message.channel.messages.fetch(args.message.messageId);
targetMessage = await args.message.channel.messages.fetch(args.message.messageId as Snowflake);
} catch (err) {
if (isDiscordRESTError(err) && err.code === 50001) {
sendErrorMessage(pluginData, msg.channel, "Missing access to the specified message");

5
backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts
View file

@ -1,3 +1,4 @@
import { Snowflake } from "discord.js";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { canUseEmoji, isDiscordRESTError, isValidEmoji, noop, trimPluginDescription } from "../../../utils";
@ -39,7 +40,7 @@ export const InitReactionRolesCmd = reactionRolesCmd({
let targetMessage;
try {
targetMessage = await args.message.channel.messages.fetch(args.message.messageId).catch(noop);
targetMessage = await args.message.channel.messages.fetch(args.message.messageId as Snowflake).catch(noop);
} catch (e) {
if (isDiscordRESTError(e)) {
sendErrorMessage(pluginData, msg.channel, `Error ${e.code} while getting message: ${e.message}`);
@ -94,7 +95,7 @@ export const InitReactionRolesCmd = reactionRolesCmd({
return;
}
if (!pluginData.guild.roles.cache.has(pair[1])) {
if (!pluginData.guild.roles.cache.has(pair[1] as Snowflake)) {
sendErrorMessage(pluginData, msg.channel, `Unknown role ${pair[1]}`);
return;
}

5
backend/src/plugins/ReactionRoles/commands/PostButtonRolesCmd.ts
View file

@ -1,4 +1,4 @@
import { MessageActionRow, MessageButton, TextChannel } from "discord.js";
import { MessageActionRow, MessageButton, Snowflake, TextChannel } from "discord.js";
import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { reactionRolesCmd } from "../types";
@ -38,12 +38,11 @@ export const PostButtonRolesCmd = reactionRolesCmd({
const btn = new MessageButton()
.setLabel(button.label ?? "")
.setStyle(button.style ?? "PRIMARY")
.setType("BUTTON")
.setCustomID(customId)
.setDisabled(button.disabled ?? false);
if (button.emoji) {
const emo = pluginData.client.emojis.resolve(button.emoji) ?? button.emoji;
const emo = pluginData.client.emojis.resolve(button.emoji as Snowflake) ?? button.emoji;
btn.setEmoji(emo);
}

2
backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts
View file

@ -87,5 +87,5 @@ export const ButtonInteractionEvt = reactionRolesEvt({
});
async function sendEphemeralReply(interaction: MessageComponentInteraction, message: string) {
await interaction.reply(message, { ephemeral: true });
await interaction.reply({ content: message, ephemeral: true });
}

5
backend/src/plugins/ReactionRoles/util/addMemberPendingRoleChange.ts
View file

@ -1,3 +1,4 @@
import { Snowflake } from "discord.js";
import { GuildPluginData } from "knub";
import { logger } from "../../../logger";
import { resolveMember } from "../../../utils";
@ -25,8 +26,8 @@ export async function addMemberPendingRoleChange(
if (member) {
const newRoleIds = new Set(member.roles.cache.keyArray());
for (const change of newPendingRoleChangeObj.changes) {
if (change.mode === "+") newRoleIds.add(change.roleId);
else newRoleIds.delete(change.roleId);
if (change.mode === "+") newRoleIds.add(change.roleId as Snowflake);
else newRoleIds.delete(change.roleId as Snowflake);
}
try {

6
backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts
View file

@ -1,4 +1,4 @@
import { TextChannel } from "discord.js";
import { Snowflake, TextChannel } from "discord.js";
import { GuildPluginData } from "knub";
import { ReactionRole } from "../../../data/entities/ReactionRole";
import { LogType } from "../../../data/LogType";
@ -17,7 +17,7 @@ export async function applyReactionRoleReactionsToMessage(
messageId: string,
reactionRoles: ReactionRole[],
): Promise<string[] | undefined> {
const channel = pluginData.guild.channels.cache.get(channelId) as TextChannel;
const channel = pluginData.guild.channels.cache.get(channelId as Snowflake) as TextChannel;
if (!channel) return;
const errors: string[] = [];
@ -25,7 +25,7 @@ export async function applyReactionRoleReactionsToMessage(
let targetMessage;
try {
targetMessage = await channel.messages.fetch(messageId);
targetMessage = await channel.messages.fetch(messageId as Snowflake);
} catch (e) {
if (isDiscordRESTError(e)) {
if (e.code === 10008) {

5
backend/src/plugins/ReactionRoles/util/buttonActionHandlers.ts
View file

@ -1,4 +1,4 @@
import { MessageButton, MessageActionRow, MessageComponentInteraction } from "discord.js";
import { MessageButton, MessageActionRow, MessageComponentInteraction, Snowflake } from "discord.js";
import { GuildPluginData } from "knub";
import { LogType } from "../../../data/LogType";
import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin";
@ -33,12 +33,11 @@ export async function handleOpenMenu(
const btn = new MessageButton()
.setLabel(menuButton.label ?? "")
.setStyle("PRIMARY")
.setType("BUTTON")
.setCustomID(customId)
.setDisabled(menuButton.disabled ?? false);
if (menuButton.emoji) {
const emo = pluginData.client.emojis.resolve(menuButton.emoji) ?? menuButton.emoji;
const emo = pluginData.client.emojis.resolve(menuButton.emoji as Snowflake) ?? menuButton.emoji;
btn.setEmoji(emo);
}
menuButtons.push(btn);

3
backend/src/plugins/ReactionRoles/util/buttonCustomIdFunctions.ts
View file

@ -1,3 +1,4 @@
import { Snowflake } from "discord.js";
import { GuildPluginData } from "knub";
import { ReactionRolesPluginType } from "../types";
import { ButtonMenuActions } from "./buttonMenuActions";
@ -5,7 +6,7 @@ import { ButtonMenuActions } from "./buttonMenuActions";
export const BUTTON_CONTEXT_SEPARATOR = "::";
export async function getButtonAction(pluginData: GuildPluginData<ReactionRolesPluginType>, roleOrMenu: string) {
if (await pluginData.guild.roles.fetch(roleOrMenu)) {
if (await pluginData.guild.roles.fetch(roleOrMenu as Snowflake).catch(() => false)) {
return ButtonMenuActions.MODIFY_ROLE;
} else {
return ButtonMenuActions.OPEN_MENU;