From 22316eb714eb00d01849d61bef906244700e6ab9 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Sun, 23 May 2021 17:01:08 +0300
Subject: [PATCH] More initialization order fixes

---
 backend/src/plugins/AutoDelete/AutoDeletePlugin.ts       | 6 +++++-
 backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts | 8 +++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/src/plugins/AutoDelete/AutoDeletePlugin.ts b/backend/src/plugins/AutoDelete/AutoDeletePlugin.ts
index 99ddc48d..80973641 100644
--- a/backend/src/plugins/AutoDelete/AutoDeletePlugin.ts
+++ b/backend/src/plugins/AutoDelete/AutoDeletePlugin.ts
@@ -29,7 +29,7 @@ export const AutoDeletePlugin = zeppelinGuildPlugin<AutoDeletePluginType>()({
   configSchema: ConfigSchema,
   defaultOptions,
 
-  afterLoad(pluginData) {
+  beforeLoad(pluginData) {
     const { state, guild } = pluginData;
 
     state.guildSavedMessages = GuildSavedMessages.getGuildInstance(guild.id);
@@ -40,6 +40,10 @@ export const AutoDeletePlugin = zeppelinGuildPlugin<AutoDeletePluginType>()({
     state.nextDeletionTimeout = null;
 
     state.maxDelayWarningSent = false;
+  },
+
+  afterLoad(pluginData) {
+    const { state, guild } = pluginData;
 
     state.onMessageCreateFn = msg => onMessageCreate(pluginData, msg);
     state.guildSavedMessages.events.on("create", state.onMessageCreateFn);
diff --git a/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts b/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts
index 1ecb35a0..2192a774 100644
--- a/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts
+++ b/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts
@@ -48,10 +48,8 @@ export const AutoReactionsPlugin = zeppelinGuildPlugin<AutoReactionsPluginType>(
     AddReactionsEvt,
   ],
 
-  afterLoad(pluginData) {
-    const { state, guild } = pluginData;
-
-    state.savedMessages = GuildSavedMessages.getGuildInstance(guild.id);
-    state.autoReactions = GuildAutoReactions.getGuildInstance(guild.id);
+  beforeLoad(pluginData) {
+    pluginData.state.savedMessages = GuildSavedMessages.getGuildInstance(pluginData.guild.id);
+    pluginData.state.autoReactions = GuildAutoReactions.getGuildInstance(pluginData.guild.id);
   },
 });