From b6fe6116d73adfc02b6685febf43925f32ac81bc Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 12 May 2022 21:32:49 +0300
Subject: [PATCH 1/4] feat: add 'av' as alias for 'add_server_from_invite'

---
 .../src/plugins/BotControl/commands/AddServerFromInviteCmd.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts b/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts
index 385df13b..8175d1fe 100644
--- a/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts
+++ b/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts
@@ -8,7 +8,7 @@ import moment from "moment-timezone";
 import { isEligible } from "../functions/isEligible";
 
 export const AddServerFromInviteCmd = botControlCmd({
-  trigger: ["add_server_from_invite", "allow_server_from_invite"],
+  trigger: ["add_server_from_invite", "allow_server_from_invite", "av"],
   permission: "can_add_server_from_invite",
 
   signature: {

From 5e0fbb5caed6ce48494667fb497e14e9ea113991 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 12 May 2022 21:38:01 +0300
Subject: [PATCH 2/4] fix: only retry reminders in case of HTTP errors

Doesn't make a lot of sense to keep trying to e.g. post a reminder in
a deleted channel or a channel we have no perms to post in.
---
 .../src/plugins/Reminders/functions/postReminder.ts   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/plugins/Reminders/functions/postReminder.ts b/backend/src/plugins/Reminders/functions/postReminder.ts
index 665fc3fb..d96ad7b6 100644
--- a/backend/src/plugins/Reminders/functions/postReminder.ts
+++ b/backend/src/plugins/Reminders/functions/postReminder.ts
@@ -1,10 +1,10 @@
 import { GuildPluginData } from "knub";
 import { RemindersPluginType } from "../types";
 import { Reminder } from "../../../data/entities/Reminder";
-import { Snowflake, TextChannel } from "discord.js";
+import { DiscordAPIError, HTTPError, Snowflake, TextChannel } from "discord.js";
 import moment from "moment-timezone";
 import { disableLinkPreviews } from "knub/dist/helpers";
-import { DBDateFormat, SECONDS } from "../../../utils";
+import { DBDateFormat, isDiscordHTTPError, SECONDS } from "../../../utils";
 import humanizeDuration from "humanize-duration";
 
 export async function postReminder(pluginData: GuildPluginData<RemindersPluginType>, reminder: Reminder) {
@@ -31,10 +31,13 @@ export async function postReminder(pluginData: GuildPluginData<RemindersPluginTy
         });
       }
     } catch (err) {
-      // If we were unable to post the reminder, we'll try again later
       // tslint:disable-next-line:no-console
       console.warn(`Error when posting reminder for ${reminder.user_id} in guild ${reminder.guild_id}: ${String(err)}`);
-      return;
+
+      if (err instanceof HTTPError && err.code >= 500) {
+        // If we get a server error, try again later
+        return;
+      }
     }
   }
 

From 3be9748f50e1541207f461b1770b099d0a693be4 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 12 May 2022 21:46:20 +0300
Subject: [PATCH 3/4] fix: fix error from 'config: null' in config

---
 backend/src/pluginUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/pluginUtils.ts b/backend/src/pluginUtils.ts
index f9093ad1..031d1fa7 100644
--- a/backend/src/pluginUtils.ts
+++ b/backend/src/pluginUtils.ts
@@ -164,7 +164,7 @@ export function getPluginConfigPreprocessor(
 
     if (options.overrides) {
       for (const override of options.overrides) {
-        const overrideConfigMergedWithBaseConfig = configUtils.mergeConfig(options.config, override.config || {});
+        const overrideConfigMergedWithBaseConfig = configUtils.mergeConfig(options.config || {}, override.config || {});
         const decodedOverrideConfig = blueprint.configSchema
           ? decodeAndValidateStrict(blueprint.configSchema, overrideConfigMergedWithBaseConfig)
           : overrideConfigMergedWithBaseConfig;

From bc0862430f8d72885115b6979cb469d17e9f2ce6 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 12 May 2022 21:47:13 +0300
Subject: [PATCH 4/4] fix: change new 'av' alias to 'adv' to avoid conflict
 with the 'avatar' alias

---
 .../src/plugins/BotControl/commands/AddServerFromInviteCmd.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts b/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts
index 8175d1fe..5bdb2ace 100644
--- a/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts
+++ b/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts
@@ -8,7 +8,7 @@ import moment from "moment-timezone";
 import { isEligible } from "../functions/isEligible";
 
 export const AddServerFromInviteCmd = botControlCmd({
-  trigger: ["add_server_from_invite", "allow_server_from_invite", "av"],
+  trigger: ["add_server_from_invite", "allow_server_from_invite", "adv"],
   permission: "can_add_server_from_invite",
 
   signature: {