Merge pull request #70 from DarkView/k30_reminders
[K30] Migrated Reminders
This commit is contained in:
commit
0644001f98
7 changed files with 247 additions and 0 deletions
50
backend/src/plugins/Reminders/RemindersPlugin.ts
Normal file
50
backend/src/plugins/Reminders/RemindersPlugin.ts
Normal file
|
@ -0,0 +1,50 @@
|
|||
import { PluginOptions } from "knub";
|
||||
import { ConfigSchema, RemindersPluginType } from "./types";
|
||||
import { zeppelinPlugin } from "../ZeppelinPluginBlueprint";
|
||||
import { GuildReminders } from "src/data/GuildReminders";
|
||||
import { postDueRemindersLoop } from "./utils/postDueRemindersLoop";
|
||||
import { RemindCmd } from "./commands/RemindCmd";
|
||||
import { RemindersCmd } from "./commands/RemindersCmd";
|
||||
import { RemindersDeleteCmd } from "./commands/RemindersDeleteCmd";
|
||||
|
||||
const defaultOptions: PluginOptions<RemindersPluginType> = {
|
||||
config: {
|
||||
can_use: false,
|
||||
},
|
||||
overrides: [
|
||||
{
|
||||
level: ">=50",
|
||||
config: {
|
||||
can_use: true,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const RemindersPlugin = zeppelinPlugin<RemindersPluginType>()("reminders", {
|
||||
configSchema: ConfigSchema,
|
||||
defaultOptions,
|
||||
|
||||
// prettier-ignore
|
||||
commands: [
|
||||
RemindCmd,
|
||||
RemindersCmd,
|
||||
RemindersDeleteCmd,
|
||||
],
|
||||
|
||||
onLoad(pluginData) {
|
||||
const { state, guild } = pluginData;
|
||||
|
||||
state.reminders = GuildReminders.getGuildInstance(guild.id);
|
||||
state.tries = new Map();
|
||||
state.unloaded = false;
|
||||
|
||||
state.postRemindersTimeout = null;
|
||||
postDueRemindersLoop(pluginData);
|
||||
},
|
||||
|
||||
onUnload(pluginData) {
|
||||
clearTimeout(pluginData.state.postRemindersTimeout);
|
||||
pluginData.state.unloaded = true;
|
||||
},
|
||||
});
|
65
backend/src/plugins/Reminders/commands/RemindCmd.ts
Normal file
65
backend/src/plugins/Reminders/commands/RemindCmd.ts
Normal file
|
@ -0,0 +1,65 @@
|
|||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import moment from "moment-timezone";
|
||||
import { convertDelayStringToMS } from "src/utils";
|
||||
import humanizeDuration from "humanize-duration";
|
||||
import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils";
|
||||
import { remindersCommand } from "../types";
|
||||
|
||||
export const RemindCmd = remindersCommand({
|
||||
trigger: ["remind", "remindme"],
|
||||
usage: "!remind 3h Remind me of this in 3 hours please",
|
||||
permission: "can_use",
|
||||
|
||||
signature: {
|
||||
time: ct.string(),
|
||||
reminder: ct.string({ required: false, catchAll: true }),
|
||||
},
|
||||
|
||||
async run({ message: msg, args, pluginData }) {
|
||||
const now = moment();
|
||||
|
||||
let reminderTime;
|
||||
if (args.time.match(/^\d{4}-\d{1,2}-\d{1,2}$/)) {
|
||||
// Date in YYYY-MM-DD format, remind at current time on that date
|
||||
reminderTime = moment(args.time, "YYYY-M-D").set({
|
||||
hour: now.hour(),
|
||||
minute: now.minute(),
|
||||
second: now.second(),
|
||||
});
|
||||
} else if (args.time.match(/^\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}$/)) {
|
||||
// Date and time in YYYY-MM-DD[T]HH:mm format
|
||||
reminderTime = moment(args.time, "YYYY-M-D[T]HH:mm").second(0);
|
||||
} else {
|
||||
// "Delay string" i.e. e.g. "2h30m"
|
||||
const ms = convertDelayStringToMS(args.time);
|
||||
if (ms === null) {
|
||||
sendErrorMessage(pluginData, msg.channel, "Invalid reminder time");
|
||||
return;
|
||||
}
|
||||
|
||||
reminderTime = moment().add(ms, "millisecond");
|
||||
}
|
||||
|
||||
if (!reminderTime.isValid() || reminderTime.isBefore(now)) {
|
||||
sendErrorMessage(pluginData, msg.channel, "Invalid reminder time");
|
||||
return;
|
||||
}
|
||||
|
||||
const reminderBody = args.reminder || `https://discord.com/channels/${this.guildId}/${msg.channel.id}/${msg.id}`;
|
||||
await pluginData.state.reminders.add(
|
||||
msg.author.id,
|
||||
msg.channel.id,
|
||||
reminderTime.format("YYYY-MM-DD HH:mm:ss"),
|
||||
reminderBody,
|
||||
moment().format("YYYY-MM-DD HH:mm:ss"),
|
||||
);
|
||||
|
||||
const msUntilReminder = reminderTime.diff(now);
|
||||
const timeUntilReminder = humanizeDuration(msUntilReminder, { largest: 2, round: true });
|
||||
sendSuccessMessage(
|
||||
pluginData,
|
||||
msg.channel,
|
||||
`I will remind you in **${timeUntilReminder}** at **${reminderTime.format("YYYY-MM-DD, HH:mm")}**`,
|
||||
);
|
||||
},
|
||||
});
|
31
backend/src/plugins/Reminders/commands/RemindersCmd.ts
Normal file
31
backend/src/plugins/Reminders/commands/RemindersCmd.ts
Normal file
|
@ -0,0 +1,31 @@
|
|||
import { remindersCommand } from "../types";
|
||||
import { sendErrorMessage } from "src/pluginUtils";
|
||||
import { sorter, createChunkedMessage } from "src/utils";
|
||||
import moment from "moment-timezone";
|
||||
import humanizeDuration from "humanize-duration";
|
||||
|
||||
export const RemindersCmd = remindersCommand({
|
||||
trigger: "reminders",
|
||||
permission: "can_use",
|
||||
|
||||
async run({ message: msg, args, pluginData }) {
|
||||
const reminders = await pluginData.state.reminders.getRemindersByUserId(msg.author.id);
|
||||
if (reminders.length === 0) {
|
||||
sendErrorMessage(pluginData, msg.channel, "No reminders");
|
||||
return;
|
||||
}
|
||||
|
||||
reminders.sort(sorter("remind_at"));
|
||||
const longestNum = (reminders.length + 1).toString().length;
|
||||
const lines = Array.from(reminders.entries()).map(([i, reminder]) => {
|
||||
const num = i + 1;
|
||||
const paddedNum = num.toString().padStart(longestNum, " ");
|
||||
const target = moment(reminder.remind_at, "YYYY-MM-DD HH:mm:ss");
|
||||
const diff = target.diff(moment());
|
||||
const result = humanizeDuration(diff, { largest: 2, round: true });
|
||||
return `\`${paddedNum}.\` \`${reminder.remind_at} (${result})\` ${reminder.body}`;
|
||||
});
|
||||
|
||||
createChunkedMessage(msg.channel, lines.join("\n"));
|
||||
},
|
||||
});
|
29
backend/src/plugins/Reminders/commands/RemindersDeleteCmd.ts
Normal file
29
backend/src/plugins/Reminders/commands/RemindersDeleteCmd.ts
Normal file
|
@ -0,0 +1,29 @@
|
|||
import { remindersCommand } from "../types";
|
||||
import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils";
|
||||
import { sorter } from "src/utils";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
|
||||
export const RemindersDeleteCmd = remindersCommand({
|
||||
trigger: ["reminders delete", "reminders d"],
|
||||
permission: "can_use",
|
||||
|
||||
signature: {
|
||||
num: ct.number(),
|
||||
},
|
||||
|
||||
async run({ message: msg, args, pluginData }) {
|
||||
const reminders = await pluginData.state.reminders.getRemindersByUserId(msg.author.id);
|
||||
reminders.sort(sorter("remind_at"));
|
||||
const lastNum = reminders.length + 1;
|
||||
|
||||
if (args.num > lastNum || args.num < 0) {
|
||||
sendErrorMessage(pluginData, msg.channel, "Unknown reminder");
|
||||
return;
|
||||
}
|
||||
|
||||
const toDelete = reminders[args.num - 1];
|
||||
await pluginData.state.reminders.delete(toDelete.id);
|
||||
|
||||
sendSuccessMessage(pluginData, msg.channel, "Reminder deleted");
|
||||
},
|
||||
});
|
22
backend/src/plugins/Reminders/types.ts
Normal file
22
backend/src/plugins/Reminders/types.ts
Normal file
|
@ -0,0 +1,22 @@
|
|||
import * as t from "io-ts";
|
||||
import { BasePluginType, command } from "knub";
|
||||
import { GuildReminders } from "src/data/GuildReminders";
|
||||
|
||||
export const ConfigSchema = t.type({
|
||||
can_use: t.boolean,
|
||||
});
|
||||
export type TConfigSchema = t.TypeOf<typeof ConfigSchema>;
|
||||
|
||||
export interface RemindersPluginType extends BasePluginType {
|
||||
config: TConfigSchema;
|
||||
|
||||
state: {
|
||||
reminders: GuildReminders;
|
||||
tries: Map<number, number>;
|
||||
|
||||
postRemindersTimeout;
|
||||
unloaded: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
export const remindersCommand = command<RemindersPluginType>();
|
48
backend/src/plugins/Reminders/utils/postDueRemindersLoop.ts
Normal file
48
backend/src/plugins/Reminders/utils/postDueRemindersLoop.ts
Normal file
|
@ -0,0 +1,48 @@
|
|||
import { TextChannel } from "eris";
|
||||
import { PluginData } from "knub";
|
||||
import { RemindersPluginType } from "../types";
|
||||
import moment from "moment-timezone";
|
||||
import humanizeDuration from "humanize-duration";
|
||||
import { disableLinkPreviews } from "knub/dist/helpers";
|
||||
import { SECONDS } from "src/utils";
|
||||
|
||||
const REMINDER_LOOP_TIME = 10 * SECONDS;
|
||||
const MAX_TRIES = 3;
|
||||
|
||||
export async function postDueRemindersLoop(pluginData: PluginData<RemindersPluginType>) {
|
||||
const pendingReminders = await pluginData.state.reminders.getDueReminders();
|
||||
for (const reminder of pendingReminders) {
|
||||
const channel = pluginData.guild.channels.get(reminder.channel_id);
|
||||
if (channel && channel instanceof TextChannel) {
|
||||
try {
|
||||
// Only show created at date if one exists
|
||||
if (moment(reminder.created_at).isValid()) {
|
||||
const target = moment();
|
||||
const diff = target.diff(moment(reminder.created_at, "YYYY-MM-DD HH:mm:ss"));
|
||||
const result = humanizeDuration(diff, { largest: 2, round: true });
|
||||
await channel.createMessage(
|
||||
disableLinkPreviews(
|
||||
`Reminder for <@!${reminder.user_id}>: ${reminder.body} \n\`Set at ${reminder.created_at} (${result} ago)\``,
|
||||
),
|
||||
);
|
||||
} else {
|
||||
await channel.createMessage(disableLinkPreviews(`Reminder for <@!${reminder.user_id}>: ${reminder.body}`));
|
||||
}
|
||||
} catch (e) {
|
||||
// Probably random Discord internal server error or missing permissions or somesuch
|
||||
// Try again next round unless we've already tried to post this a bunch of times
|
||||
const tries = pluginData.state.tries.get(reminder.id) || 0;
|
||||
if (tries < MAX_TRIES) {
|
||||
pluginData.state.tries.set(reminder.id, tries + 1);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await pluginData.state.reminders.delete(reminder.id);
|
||||
}
|
||||
|
||||
if (!pluginData.state.unloaded) {
|
||||
pluginData.state.postRemindersTimeout = setTimeout(() => postDueRemindersLoop(pluginData), REMINDER_LOOP_TIME);
|
||||
}
|
||||
}
|
|
@ -1,12 +1,14 @@
|
|||
import { UtilityPlugin } from "./Utility/UtilityPlugin";
|
||||
import { LocateUserPlugin } from "./LocateUser/LocateUserPlugin";
|
||||
import { ZeppelinPluginBlueprint } from "./ZeppelinPluginBlueprint";
|
||||
import { RemindersPlugin } from "./Reminders/RemindersPlugin";
|
||||
import { UsernameSaverPlugin } from "./UsernameSaver/UsernameSaverPlugin";
|
||||
import { WelcomeMessagePlugin } from "./WelcomeMessage/WelcomeMessagePlugin";
|
||||
|
||||
// prettier-ignore
|
||||
export const guildPlugins: Array<ZeppelinPluginBlueprint<any>> = [
|
||||
LocateUserPlugin,
|
||||
RemindersPlugin,
|
||||
UsernameSaverPlugin,
|
||||
UtilityPlugin,
|
||||
WelcomeMessagePlugin,
|
||||
|
|
Loading…
Add table
Reference in a new issue