mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-06-08 00:05:01 +00:00
Update djs & knub (#395)
* update pkgs
Signed-off-by: GitHub <noreply@github.com>
* new knub typings
Signed-off-by: GitHub <noreply@github.com>
* more pkg updates
Signed-off-by: GitHub <noreply@github.com>
* more fixes
Signed-off-by: GitHub <noreply@github.com>
* channel typings
Signed-off-by: GitHub <noreply@github.com>
* more message utils typings fixes
Signed-off-by: GitHub <noreply@github.com>
* migrate permissions
Signed-off-by: GitHub <noreply@github.com>
* fix: InternalPoster webhookables
Signed-off-by: GitHub <noreply@github.com>
* djs typings: Attachment & Util
Signed-off-by: GitHub <noreply@github.com>
* more typings
Signed-off-by: GitHub <noreply@github.com>
* fix: rename permissionNames
Signed-off-by: GitHub <noreply@github.com>
* more fixes
Signed-off-by: GitHub <noreply@github.com>
* half the number of errors
* knub commands => messageCommands
Signed-off-by: GitHub <noreply@github.com>
* configPreprocessor => configParser
Signed-off-by: GitHub <noreply@github.com>
* fix channel.messages
Signed-off-by: GitHub <noreply@github.com>
* revert automod any typing
Signed-off-by: GitHub <noreply@github.com>
* more configParser typings
Signed-off-by: GitHub <noreply@github.com>
* revert
Signed-off-by: GitHub <noreply@github.com>
* remove knub type params
Signed-off-by: GitHub <noreply@github.com>
* fix more MessageEmbed / MessageOptions
Signed-off-by: GitHub <noreply@github.com>
* dumb commit for @almeidx to see why this is stupid
Signed-off-by: GitHub <noreply@github.com>
* temp disable custom_events
Signed-off-by: GitHub <noreply@github.com>
* more minor typings fixes - 23 err left
Signed-off-by: GitHub <noreply@github.com>
* update djs dep
* +debug build method (revert this)
Signed-off-by: GitHub <noreply@github.com>
* Revert "+debug build method (revert this)"
This reverts commit a80af1e729
.
* Redo +debug build (Revert this)
Signed-off-by: GitHub <noreply@github.com>
* uniform before/after Load shorthands
Signed-off-by: GitHub <noreply@github.com>
* remove unused imports & add prettier plugin
Signed-off-by: GitHub <noreply@github.com>
* env fixes for web platform hosting
Signed-off-by: GitHub <noreply@github.com>
* feat: knub v32-next; related fixes
* fix: allow legacy keys in change_perms action
* fix: request Message Content intent
* fix: use Knub's config validation logic in API
* fix(dashboard): fix error when there are no message and/or slash commands in a plugin
* fix(automod): start_thread action thread options
* fix(CustomEvents): message command types
* chore: remove unneeded type annotation
* feat: add forum channel icon; use thread icon for news threads
* chore: make tslint happy
* chore: fix formatting
---------
Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: almeidx <almeidx@pm.me>
Co-authored-by: Dragory <2606411+Dragory@users.noreply.github.com>
This commit is contained in:
parent
293115af22
commit
06877e90cc
476 changed files with 2965 additions and 3251 deletions
|
@ -1,5 +1,7 @@
|
|||
import { PluginOptions } from "knub";
|
||||
import { onGuildEvent } from "../../data/GuildEvents";
|
||||
import { GuildVCAlerts } from "../../data/GuildVCAlerts";
|
||||
import { makeIoTsConfigParser } from "../../pluginUtils";
|
||||
import { trimPluginDescription } from "../../utils";
|
||||
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
|
||||
import { FollowCmd } from "./commands/FollowCmd";
|
||||
|
@ -8,9 +10,8 @@ import { WhereCmd } from "./commands/WhereCmd";
|
|||
import { GuildBanRemoveAlertsEvt } from "./events/BanRemoveAlertsEvt";
|
||||
import { VoiceStateUpdateAlertEvt } from "./events/SendAlertsEvts";
|
||||
import { ConfigSchema, LocateUserPluginType } from "./types";
|
||||
import { fillActiveAlertsList } from "./utils/fillAlertsList";
|
||||
import { onGuildEvent } from "../../data/GuildEvents";
|
||||
import { clearExpiredAlert } from "./utils/clearExpiredAlert";
|
||||
import { fillActiveAlertsList } from "./utils/fillAlertsList";
|
||||
|
||||
const defaultOptions: PluginOptions<LocateUserPluginType> = {
|
||||
config: {
|
||||
|
@ -38,13 +39,14 @@ export const LocateUserPlugin = zeppelinGuildPlugin<LocateUserPluginType>()({
|
|||
* Instantly receive an invite to the voice channel of a user
|
||||
* Be notified as soon as a user switches or joins a voice channel
|
||||
`),
|
||||
configSchema: ConfigSchema,
|
||||
},
|
||||
|
||||
configSchema: ConfigSchema,
|
||||
configParser: makeIoTsConfigParser(ConfigSchema),
|
||||
defaultOptions,
|
||||
|
||||
// prettier-ignore
|
||||
commands: [
|
||||
messageCommands: [
|
||||
WhereCmd,
|
||||
FollowCmd,
|
||||
ListFollowCmd,
|
||||
|
@ -65,13 +67,17 @@ export const LocateUserPlugin = zeppelinGuildPlugin<LocateUserPluginType>()({
|
|||
},
|
||||
|
||||
afterLoad(pluginData) {
|
||||
pluginData.state.unregisterGuildEventListener = onGuildEvent(pluginData.guild.id, "expiredVCAlert", (alert) =>
|
||||
const { state, guild } = pluginData;
|
||||
|
||||
state.unregisterGuildEventListener = onGuildEvent(guild.id, "expiredVCAlert", (alert) =>
|
||||
clearExpiredAlert(pluginData, alert),
|
||||
);
|
||||
fillActiveAlertsList(pluginData);
|
||||
},
|
||||
|
||||
beforeUnload(pluginData) {
|
||||
pluginData.state.unregisterGuildEventListener?.();
|
||||
const { state, guild } = pluginData;
|
||||
|
||||
state.unregisterGuildEventListener?.();
|
||||
},
|
||||
});
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import humanizeDuration from "humanize-duration";
|
||||
import moment from "moment-timezone";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { registerExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop";
|
||||
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
|
||||
import { MINUTES, SECONDS } from "../../../utils";
|
||||
import { locateUserCmd } from "../types";
|
||||
import { registerExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop";
|
||||
|
||||
export const FollowCmd = locateUserCmd({
|
||||
trigger: ["follow", "f"],
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop";
|
||||
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
|
||||
import { createChunkedMessage, sorter } from "../../../utils";
|
||||
import { locateUserCmd } from "../types";
|
||||
import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop";
|
||||
|
||||
export const ListFollowCmd = locateUserCmd({
|
||||
trigger: ["follows", "fs"],
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { locateUserEvt } from "../types";
|
||||
import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop";
|
||||
import { locateUserEvt } from "../types";
|
||||
|
||||
export const GuildBanRemoveAlertsEvt = locateUserEvt({
|
||||
event: "guildBanAdd",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { Snowflake, TextChannel } from "discord.js";
|
||||
import { Snowflake } from "discord.js";
|
||||
import { locateUserEvt } from "../types";
|
||||
import { sendAlerts } from "../utils/sendAlerts";
|
||||
|
||||
|
@ -20,11 +20,13 @@ export const VoiceStateUpdateAlertEvt = locateUserEvt({
|
|||
const voiceChannel = meta.args.oldState.channel!;
|
||||
|
||||
triggeredAlerts.forEach((alert) => {
|
||||
const txtChannel = meta.pluginData.guild.channels.resolve(alert.channel_id as Snowflake) as TextChannel;
|
||||
txtChannel.send({
|
||||
content: `🔴 <@!${alert.requestor_id}> the user <@!${alert.user_id}> disconnected out of \`${voiceChannel.name}\``,
|
||||
allowedMentions: { users: [alert.requestor_id as Snowflake] },
|
||||
});
|
||||
const txtChannel = meta.pluginData.guild.channels.resolve(alert.channel_id as Snowflake);
|
||||
if (txtChannel?.isTextBased()) {
|
||||
txtChannel.send({
|
||||
content: `🔴 <@!${alert.requestor_id}> the user <@!${alert.user_id}> disconnected out of \`${voiceChannel.name}\``,
|
||||
allowedMentions: { users: [alert.requestor_id as Snowflake] },
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import * as t from "io-ts";
|
||||
import { BasePluginType, typedGuildCommand, typedGuildEventListener } from "knub";
|
||||
import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub";
|
||||
import { GuildVCAlerts } from "../../data/GuildVCAlerts";
|
||||
import Timeout = NodeJS.Timeout;
|
||||
|
||||
export const ConfigSchema = t.type({
|
||||
can_where: t.boolean,
|
||||
|
@ -18,5 +17,5 @@ export interface LocateUserPluginType extends BasePluginType {
|
|||
};
|
||||
}
|
||||
|
||||
export const locateUserCmd = typedGuildCommand<LocateUserPluginType>();
|
||||
export const locateUserEvt = typedGuildEventListener<LocateUserPluginType>();
|
||||
export const locateUserCmd = guildPluginMessageCommand<LocateUserPluginType>();
|
||||
export const locateUserEvt = guildPluginEventListener<LocateUserPluginType>();
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { GuildPluginData } from "knub";
|
||||
import { VCAlert } from "../../../data/entities/VCAlert";
|
||||
import { LocateUserPluginType } from "../types";
|
||||
import { removeUserIdFromActiveAlerts } from "./removeUserIdFromActiveAlerts";
|
||||
import { VCAlert } from "../../../data/entities/VCAlert";
|
||||
|
||||
export async function clearExpiredAlert(pluginData: GuildPluginData<LocateUserPluginType>, alert: VCAlert) {
|
||||
await pluginData.state.alerts.delete(alert.id);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { GuildMember, Snowflake, TextChannel } from "discord.js";
|
||||
import { GuildMember, GuildTextBasedChannel, Snowflake } from "discord.js";
|
||||
import { GuildPluginData } from "knub";
|
||||
import { sendErrorMessage } from "../../../pluginUtils";
|
||||
import { LocateUserPluginType } from "../types";
|
||||
|
@ -7,7 +7,7 @@ export async function moveMember(
|
|||
pluginData: GuildPluginData<LocateUserPluginType>,
|
||||
toMoveID: string,
|
||||
target: GuildMember,
|
||||
errorChannel: TextChannel,
|
||||
errorChannel: GuildTextBasedChannel,
|
||||
) {
|
||||
const modMember: GuildMember = await pluginData.guild.members.fetch(toMoveID as Snowflake);
|
||||
if (modMember.voice.channelId != null) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { Snowflake, TextChannel } from "discord.js";
|
||||
import { Snowflake } from "discord.js";
|
||||
import { GuildPluginData } from "knub";
|
||||
import { resolveMember } from "../../../utils";
|
||||
import { LocateUserPluginType } from "../types";
|
||||
|
@ -12,10 +12,12 @@ export async function sendAlerts(pluginData: GuildPluginData<LocateUserPluginTyp
|
|||
|
||||
triggeredAlerts.forEach((alert) => {
|
||||
const prepend = `<@!${alert.requestor_id}>, an alert requested by you has triggered!\nReminder: \`${alert.body}\`\n`;
|
||||
const txtChannel = pluginData.guild.channels.resolve(alert.channel_id as Snowflake) as TextChannel;
|
||||
sendWhere(pluginData, member, txtChannel, prepend);
|
||||
if (alert.active) {
|
||||
moveMember(pluginData, alert.requestor_id, member, txtChannel);
|
||||
const txtChannel = pluginData.guild.channels.resolve(alert.channel_id as Snowflake);
|
||||
if (txtChannel?.isTextBased()) {
|
||||
sendWhere(pluginData, member, txtChannel, prepend);
|
||||
if (alert.active) {
|
||||
moveMember(pluginData, alert.requestor_id, member, txtChannel);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { GuildMember, Invite, TextChannel, VoiceChannel } from "discord.js";
|
||||
import { GuildMember, GuildTextBasedChannel, Invite, VoiceChannel } from "discord.js";
|
||||
import { GuildPluginData } from "knub";
|
||||
import { getInviteLink } from "knub/dist/helpers";
|
||||
import { getInviteLink } from "knub/helpers";
|
||||
import { sendErrorMessage } from "../../../pluginUtils";
|
||||
import { LocateUserPluginType } from "../types";
|
||||
import { createOrReuseInvite } from "./createOrReuseInvite";
|
||||
|
@ -8,7 +8,7 @@ import { createOrReuseInvite } from "./createOrReuseInvite";
|
|||
export async function sendWhere(
|
||||
pluginData: GuildPluginData<LocateUserPluginType>,
|
||||
member: GuildMember,
|
||||
channel: TextChannel,
|
||||
channel: GuildTextBasedChannel,
|
||||
prepend: string,
|
||||
) {
|
||||
const voice = member.voice.channelId
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue