Split BaseRepository into non-guild and guild

BaseRepository includes all the non-guild-specific functionality,
such as with() and getRelations().
BaseGuildRepository includes guild-specific functionality, such as
getInstance().

src/plugins/AutoReactionsPlugin.ts

@@ -36,8 +36,8 @@ export class AutoReactionsPlugin extends ZeppelinPlugin<IAutoReactionsPluginConf
   }
 
   onLoad() {
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
-    this.autoReactions = GuildAutoReactions.getInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
+    this.autoReactions = GuildAutoReactions.getGuildInstance(this.guildId);
 
     this.onMessageCreateFn = this.savedMessages.events.on("create", this.onMessageCreate.bind(this));
   }

src/plugins/Cases.ts

@@ -57,8 +57,8 @@ export class CasesPlugin extends ZeppelinPlugin<ICasesPluginConfig> {
   }
 
   onLoad() {
-    this.cases = GuildCases.getInstance(this.guildId);
-    this.archives = GuildArchives.getInstance(this.guildId);
+    this.cases = GuildCases.getGuildInstance(this.guildId);
+    this.archives = GuildArchives.getGuildInstance(this.guildId);
     this.logs = new GuildLogs(this.guildId);
   }
 

src/plugins/Censor.ts

@@ -81,7 +81,7 @@ export class CensorPlugin extends ZeppelinPlugin<ICensorPluginConfig> {
 
   onLoad() {
     this.serverLogs = new GuildLogs(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
 
     this.onMessageCreateFn = this.onMessageCreate.bind(this);
     this.onMessageUpdateFn = this.onMessageUpdate.bind(this);

src/plugins/Logs.ts

@@ -93,9 +93,9 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
 
   onLoad() {
     this.guildLogs = new GuildLogs(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
-    this.archives = GuildArchives.getInstance(this.guildId);
-    this.cases = GuildCases.getInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
+    this.archives = GuildArchives.getGuildInstance(this.guildId);
+    this.cases = GuildCases.getGuildInstance(this.guildId);
 
     this.logListener = ({ type, data }) => this.log(type, data);
     this.guildLogs.on("log", this.logListener);

src/plugins/MessageSaver.ts

@@ -30,7 +30,7 @@ export class MessageSaverPlugin extends Plugin<IMessageSaverPluginConfig> {
   }
 
   onLoad() {
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
   }
 
   @d.event("messageCreate", "guild", false)

src/plugins/ModActions.ts

@@ -75,8 +75,8 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
   protected ignoredEvents: IIgnoredEvent[];
 
   async onLoad() {
-    this.mutes = GuildMutes.getInstance(this.guildId);
-    this.cases = GuildCases.getInstance(this.guildId);
+    this.mutes = GuildMutes.getGuildInstance(this.guildId);
+    this.cases = GuildCases.getGuildInstance(this.guildId);
     this.serverLogs = new GuildLogs(this.guildId);
 
     this.ignoredEvents = [];

src/plugins/Mutes.ts

@@ -99,8 +99,8 @@ export class MutesPlugin extends ZeppelinPlugin<IMutesPluginConfig> {
   }
 
   protected onLoad() {
-    this.mutes = GuildMutes.getInstance(this.guildId);
-    this.cases = GuildCases.getInstance(this.guildId);
+    this.mutes = GuildMutes.getGuildInstance(this.guildId);
+    this.cases = GuildCases.getGuildInstance(this.guildId);
     this.serverLogs = new GuildLogs(this.guildId);
 
     // Check for expired mutes every 5s

src/plugins/NameHistory.ts

@@ -33,8 +33,8 @@ export class NameHistoryPlugin extends ZeppelinPlugin<INameHistoryPluginConfig>
   }
 
   onLoad() {
-    this.nicknameHistory = GuildNicknameHistory.getInstance(this.guildId);
-    this.usernameHistory = UsernameHistory.getInstance(null);
+    this.nicknameHistory = GuildNicknameHistory.getGuildInstance(this.guildId);
+    this.usernameHistory = new UsernameHistory();
   }
 
   @d.command("names", "<userId:userid>")

src/plugins/Persist.ts

@@ -30,7 +30,7 @@ export class PersistPlugin extends ZeppelinPlugin<IPersistPluginConfig> {
   }
 
   onLoad() {
-    this.persistedData = GuildPersistedData.getInstance(this.guildId);
+    this.persistedData = GuildPersistedData.getGuildInstance(this.guildId);
     this.logs = new GuildLogs(this.guildId);
   }
 

src/plugins/PingableRolesPlugin.ts

@@ -36,7 +36,7 @@ export class PingableRolesPlugin extends ZeppelinPlugin<IPingableRolesPluginConf
   }
 
   onLoad() {
-    this.pingableRoles = GuildPingableRoles.getInstance(this.guildId);
+    this.pingableRoles = GuildPingableRoles.getGuildInstance(this.guildId);
 
     this.cache = new Map();
     this.timeouts = new Map();

src/plugins/Post.ts

@@ -43,8 +43,8 @@ export class PostPlugin extends ZeppelinPlugin<IPostPluginConfig> {
   private scheduledPostLoopTimeout;
 
   onLoad() {
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
-    this.scheduledPosts = GuildScheduledPosts.getInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
+    this.scheduledPosts = GuildScheduledPosts.getGuildInstance(this.guildId);
     this.logs = new GuildLogs(this.guildId);
 
     this.scheduledPostLoop();

src/plugins/ReactionRoles.ts

@@ -64,8 +64,8 @@ export class ReactionRolesPlugin extends ZeppelinPlugin<IReactionRolesPluginConf
   }
 
   async onLoad() {
-    this.reactionRoles = GuildReactionRoles.getInstance(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
+    this.reactionRoles = GuildReactionRoles.getGuildInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
     this.reactionRemoveQueue = new Queue();
     this.pendingRoleChanges = new Map();
     this.pendingRefreshes = new Set();

src/plugins/Reminders.ts

@@ -46,7 +46,7 @@ export class RemindersPlugin extends ZeppelinPlugin<IRemindersPluginConfig> {
   }
 
   onLoad() {
-    this.reminders = GuildReminders.getInstance(this.guildId);
+    this.reminders = GuildReminders.getGuildInstance(this.guildId);
     this.tries = new Map();
     this.postDueRemindersLoop();
   }

src/plugins/SelfGrantableRolesPlugin.ts

@@ -41,7 +41,7 @@ export class SelfGrantableRolesPlugin extends ZeppelinPlugin<ISelfGrantableRoles
   }
 
   onLoad() {
-    this.selfGrantableRoles = GuildSelfGrantableRoles.getInstance(this.guildId);
+    this.selfGrantableRoles = GuildSelfGrantableRoles.getGuildInstance(this.guildId);
   }
 
   @d.command("role remove", "<roleNames:string...>")

src/plugins/Slowmode.ts

@@ -61,8 +61,8 @@ export class SlowmodePlugin extends ZeppelinPlugin<ISlowmodePluginConfig> {
   }
 
   onLoad() {
-    this.slowmodes = GuildSlowmodes.getInstance(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
+    this.slowmodes = GuildSlowmodes.getGuildInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
     this.logs = new GuildLogs(this.guildId);
     this.clearInterval = setInterval(() => this.clearExpiredSlowmodes(), BOT_SLOWMODE_CLEAR_INTERVAL);
 

src/plugins/Spam.ts

@@ -128,9 +128,9 @@ export class SpamPlugin extends ZeppelinPlugin<ISpamPluginConfig> {
 
   onLoad() {
     this.logs = new GuildLogs(this.guildId);
-    this.archives = GuildArchives.getInstance(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
-    this.mutes = GuildMutes.getInstance(this.guildId);
+    this.archives = GuildArchives.getGuildInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
+    this.mutes = GuildMutes.getGuildInstance(this.guildId);
 
     this.recentActions = [];
     this.expiryInterval = setInterval(() => this.clearOldRecentActions(), 1000 * 60);

src/plugins/Starboard.ts

@@ -47,8 +47,8 @@ export class StarboardPlugin extends ZeppelinPlugin<IStarboardPluginConfig> {
   }
 
   onLoad() {
-    this.starboards = GuildStarboards.getInstance(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
+    this.starboards = GuildStarboards.getGuildInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
 
     this.onMessageDeleteFn = this.onMessageDelete.bind(this);
     this.savedMessages.events.on("delete", this.onMessageDeleteFn);

src/plugins/Tags.ts

@@ -55,9 +55,9 @@ export class TagsPlugin extends ZeppelinPlugin<ITagsPluginConfig> {
   }
 
   onLoad() {
-    this.archives = GuildArchives.getInstance(this.guildId);
-    this.tags = GuildTags.getInstance(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
+    this.archives = GuildArchives.getGuildInstance(this.guildId);
+    this.tags = GuildTags.getGuildInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
 
     this.onMessageCreateFn = this.onMessageCreate.bind(this);
     this.savedMessages.events.on("create", this.onMessageCreateFn);

src/plugins/UsernameSaver.ts

@@ -8,7 +8,7 @@ export class UsernameSaver extends GlobalPlugin {
   protected usernameHistory: UsernameHistory;
 
   async onLoad() {
-    this.usernameHistory = UsernameHistory.getInstance(null);
+    this.usernameHistory = new UsernameHistory();
   }
 
   protected async updateUsername(user: User) {

src/plugins/Utility.ts

@@ -136,9 +136,9 @@ export class UtilityPlugin extends ZeppelinPlugin<IUtilityPluginConfig> {
 
   onLoad() {
     this.logs = new GuildLogs(this.guildId);
-    this.cases = GuildCases.getInstance(this.guildId);
-    this.savedMessages = GuildSavedMessages.getInstance(this.guildId);
-    this.archives = GuildArchives.getInstance(this.guildId);
+    this.cases = GuildCases.getGuildInstance(this.guildId);
+    this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId);
+    this.archives = GuildArchives.getGuildInstance(this.guildId);
 
     if (activeReloads && activeReloads.has(this.guildId)) {
       activeReloads.get(this.guildId).createMessage(successMessage("Reloaded!"));