diff --git a/src/data/BaseGuildRepository.ts b/src/data/BaseGuildRepository.ts index 3a0d7ae4..47cbceaf 100644 --- a/src/data/BaseGuildRepository.ts +++ b/src/data/BaseGuildRepository.ts @@ -1,19 +1,20 @@ -export class BaseRepository { +import { BaseRepository } from "./BaseRepository"; + +export class BaseGuildRepository extends BaseRepository { private static guildInstances: Map; - private nextRelations: string[]; protected guildId: string; constructor(guildId: string) { + super(); this.guildId = guildId; - this.nextRelations = []; } /** * Returns a cached instance of the inheriting class for the specified guildId, * or creates a new instance if one doesn't exist yet */ - public static getInstance(this: T, guildId: string): InstanceType { + public static getGuildInstance(this: T, guildId: string): InstanceType { if (!this.guildInstances) { this.guildInstances = new Map(); } @@ -24,27 +25,4 @@ export class BaseRepository { return this.guildInstances.get(guildId) as InstanceType; } - - /** - * Primes the specified relation(s) to be used in the next database operation. - * Can be chained. - */ - public with(relations: string | string[]): this { - if (Array.isArray(relations)) { - this.nextRelations.push(...relations); - } else { - this.nextRelations.push(relations); - } - - return this; - } - - /** - * Gets and resets the relations primed using with() - */ - protected getRelations(): string[] { - const relations = this.nextRelations || []; - this.nextRelations = []; - return relations; - } } diff --git a/src/data/BaseRepository.ts b/src/data/BaseRepository.ts new file mode 100644 index 00000000..c78d050d --- /dev/null +++ b/src/data/BaseRepository.ts @@ -0,0 +1,30 @@ +export class BaseRepository { + private nextRelations: string[]; + + constructor() { + this.nextRelations = []; + } + + /** + * Primes the specified relation(s) to be used in the next database operation. + * Can be chained. + */ + public with(relations: string | string[]): this { + if (Array.isArray(relations)) { + this.nextRelations.push(...relations); + } else { + this.nextRelations.push(relations); + } + + return this; + } + + /** + * Gets and resets the relations primed using with() + */ + protected getRelations(): string[] { + const relations = this.nextRelations || []; + this.nextRelations = []; + return relations; + } +} diff --git a/src/data/GuildArchives.ts b/src/data/GuildArchives.ts index e3836a0d..dedbb307 100644 --- a/src/data/GuildArchives.ts +++ b/src/data/GuildArchives.ts @@ -2,7 +2,7 @@ import uuid from "uuid/v4"; // tslint:disable-line import moment from "moment-timezone"; import { ArchiveEntry } from "./entities/ArchiveEntry"; import { getRepository, Repository } from "typeorm"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { trimLines } from "../utils"; import { SavedMessage } from "./entities/SavedMessage"; import { Channel, Guild, User } from "eris"; @@ -16,7 +16,7 @@ const MESSAGE_ARCHIVE_HEADER_FORMAT = trimLines(` const MESSAGE_ARCHIVE_MESSAGE_FORMAT = "[#{channel.name}] [{user.id}] [{timestamp}] {user.username}#{user.discriminator}: {content}{attachments}"; -export class GuildArchives extends BaseRepository { +export class GuildArchives extends BaseGuildRepository { protected archives: Repository; constructor(guildId) { diff --git a/src/data/GuildAutoReactions.ts b/src/data/GuildAutoReactions.ts index a0d1976c..8c556bda 100644 --- a/src/data/GuildAutoReactions.ts +++ b/src/data/GuildAutoReactions.ts @@ -1,8 +1,8 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { AutoReaction } from "./entities/AutoReaction"; -export class GuildAutoReactions extends BaseRepository { +export class GuildAutoReactions extends BaseGuildRepository { private autoReactions: Repository; constructor(guildId) { @@ -13,8 +13,8 @@ export class GuildAutoReactions extends BaseRepository { async all(): Promise { return this.autoReactions.find({ where: { - guild_id: this.guildId - } + guild_id: this.guildId, + }, }); } @@ -22,15 +22,15 @@ export class GuildAutoReactions extends BaseRepository { return this.autoReactions.findOne({ where: { guild_id: this.guildId, - channel_id: channelId - } + channel_id: channelId, + }, }); } async removeFromChannel(channelId: string) { await this.autoReactions.delete({ guild_id: this.guildId, - channel_id: channelId + channel_id: channelId, }); } @@ -40,17 +40,17 @@ export class GuildAutoReactions extends BaseRepository { this.autoReactions.update( { guild_id: this.guildId, - channel_id: channelId + channel_id: channelId, }, { - reactions - } + reactions, + }, ); } else { await this.autoReactions.insert({ guild_id: this.guildId, channel_id: channelId, - reactions + reactions, }); } } diff --git a/src/data/GuildCases.ts b/src/data/GuildCases.ts index 64849bb2..de105b01 100644 --- a/src/data/GuildCases.ts +++ b/src/data/GuildCases.ts @@ -1,6 +1,6 @@ import { Case } from "./entities/Case"; import { CaseNote } from "./entities/CaseNote"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, In, Repository } from "typeorm"; import { disableLinkPreviews } from "../utils"; import { CaseTypes } from "./CaseTypes"; @@ -8,7 +8,7 @@ import moment = require("moment-timezone"); const CASE_SUMMARY_REASON_MAX_LENGTH = 300; -export class GuildCases extends BaseRepository { +export class GuildCases extends BaseGuildRepository { private cases: Repository; private caseNotes: Repository; diff --git a/src/data/GuildEvents.ts b/src/data/GuildEvents.ts index 3f36b60f..085711bb 100644 --- a/src/data/GuildEvents.ts +++ b/src/data/GuildEvents.ts @@ -1,7 +1,7 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { QueuedEventEmitter } from "../QueuedEventEmitter"; -export class GuildEvents extends BaseRepository { +export class GuildEvents extends BaseGuildRepository { private queuedEventEmitter: QueuedEventEmitter; private pluginListeners: Map>; diff --git a/src/data/GuildMutes.ts b/src/data/GuildMutes.ts index 156bbe35..94cfb28f 100644 --- a/src/data/GuildMutes.ts +++ b/src/data/GuildMutes.ts @@ -1,9 +1,9 @@ import moment from "moment-timezone"; import { Mute } from "./entities/Mute"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository, Brackets } from "typeorm"; -export class GuildMutes extends BaseRepository { +export class GuildMutes extends BaseGuildRepository { private mutes: Repository; constructor(guildId) { diff --git a/src/data/GuildNicknameHistory.ts b/src/data/GuildNicknameHistory.ts index 1909f234..58ed7273 100644 --- a/src/data/GuildNicknameHistory.ts +++ b/src/data/GuildNicknameHistory.ts @@ -1,11 +1,11 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { NicknameHistoryEntry } from "./entities/NicknameHistoryEntry"; import { sorter } from "../utils"; export const MAX_NICKNAME_ENTRIES_PER_USER = 10; -export class GuildNicknameHistory extends BaseRepository { +export class GuildNicknameHistory extends BaseGuildRepository { private nicknameHistory: Repository; constructor(guildId) { diff --git a/src/data/GuildPersistedData.ts b/src/data/GuildPersistedData.ts index 674654da..544581df 100644 --- a/src/data/GuildPersistedData.ts +++ b/src/data/GuildPersistedData.ts @@ -1,5 +1,5 @@ import { PersistedData } from "./entities/PersistedData"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; export interface IPartialPersistData { @@ -8,7 +8,7 @@ export interface IPartialPersistData { is_voice_muted?: boolean; } -export class GuildPersistedData extends BaseRepository { +export class GuildPersistedData extends BaseGuildRepository { private persistedData: Repository; constructor(guildId) { @@ -20,8 +20,8 @@ export class GuildPersistedData extends BaseRepository { return this.persistedData.findOne({ where: { guild_id: this.guildId, - user_id: userId - } + user_id: userId, + }, }); } @@ -36,15 +36,15 @@ export class GuildPersistedData extends BaseRepository { await this.persistedData.update( { guild_id: this.guildId, - user_id: userId + user_id: userId, }, - finalData + finalData, ); } else { await this.persistedData.insert({ ...finalData, guild_id: this.guildId, - user_id: userId + user_id: userId, }); } } @@ -52,7 +52,7 @@ export class GuildPersistedData extends BaseRepository { async clear(userId: string) { await this.persistedData.delete({ guild_id: this.guildId, - user_id: userId + user_id: userId, }); } } diff --git a/src/data/GuildPingableRoles.ts b/src/data/GuildPingableRoles.ts index 80382274..8d1f8a3b 100644 --- a/src/data/GuildPingableRoles.ts +++ b/src/data/GuildPingableRoles.ts @@ -1,8 +1,8 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { PingableRole } from "./entities/PingableRole"; -export class GuildPingableRoles extends BaseRepository { +export class GuildPingableRoles extends BaseGuildRepository { private pingableRoles: Repository; constructor(guildId) { @@ -13,8 +13,8 @@ export class GuildPingableRoles extends BaseRepository { async all(): Promise { return this.pingableRoles.find({ where: { - guild_id: this.guildId - } + guild_id: this.guildId, + }, }); } @@ -22,8 +22,8 @@ export class GuildPingableRoles extends BaseRepository { return this.pingableRoles.find({ where: { guild_id: this.guildId, - channel_id: channelId - } + channel_id: channelId, + }, }); } @@ -32,8 +32,8 @@ export class GuildPingableRoles extends BaseRepository { where: { guild_id: this.guildId, channel_id: channelId, - role_id: roleId - } + role_id: roleId, + }, }); } @@ -41,7 +41,7 @@ export class GuildPingableRoles extends BaseRepository { await this.pingableRoles.delete({ guild_id: this.guildId, channel_id: channelId, - role_id: roleId + role_id: roleId, }); } @@ -49,7 +49,7 @@ export class GuildPingableRoles extends BaseRepository { await this.pingableRoles.insert({ guild_id: this.guildId, channel_id: channelId, - role_id: roleId + role_id: roleId, }); } } diff --git a/src/data/GuildReactionRoles.ts b/src/data/GuildReactionRoles.ts index 1f7ad422..0f7196c2 100644 --- a/src/data/GuildReactionRoles.ts +++ b/src/data/GuildReactionRoles.ts @@ -1,8 +1,8 @@ import { ReactionRole } from "./entities/ReactionRole"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; -export class GuildReactionRoles extends BaseRepository { +export class GuildReactionRoles extends BaseGuildRepository { private reactionRoles: Repository; constructor(guildId) { @@ -13,8 +13,8 @@ export class GuildReactionRoles extends BaseRepository { async all(): Promise { return this.reactionRoles.find({ where: { - guild_id: this.guildId - } + guild_id: this.guildId, + }, }); } @@ -22,8 +22,8 @@ export class GuildReactionRoles extends BaseRepository { return this.reactionRoles.find({ where: { guild_id: this.guildId, - message_id: messageId - } + message_id: messageId, + }, }); } @@ -32,15 +32,15 @@ export class GuildReactionRoles extends BaseRepository { where: { guild_id: this.guildId, message_id: messageId, - emoji - } + emoji, + }, }); } async removeFromMessage(messageId: string, emoji: string = null) { const criteria: any = { guild_id: this.guildId, - message_id: messageId + message_id: messageId, }; if (emoji) { @@ -56,7 +56,7 @@ export class GuildReactionRoles extends BaseRepository { channel_id: channelId, message_id: messageId, emoji, - role_id: roleId + role_id: roleId, }); } } diff --git a/src/data/GuildReminders.ts b/src/data/GuildReminders.ts index 079af4f1..13f2f5b2 100644 --- a/src/data/GuildReminders.ts +++ b/src/data/GuildReminders.ts @@ -1,8 +1,8 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { Reminder } from "./entities/Reminder"; -export class GuildReminders extends BaseRepository { +export class GuildReminders extends BaseGuildRepository { private reminders: Repository; constructor(guildId) { diff --git a/src/data/GuildSavedMessages.ts b/src/data/GuildSavedMessages.ts index ec57a0c3..76e523d2 100644 --- a/src/data/GuildSavedMessages.ts +++ b/src/data/GuildSavedMessages.ts @@ -1,5 +1,5 @@ import { Brackets, getRepository, Repository } from "typeorm"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage"; import { QueuedEventEmitter } from "../QueuedEventEmitter"; import { GuildChannel, Message } from "eris"; @@ -36,7 +36,7 @@ async function cleanup() { // Start first cleanup 30 seconds after startup setTimeout(cleanup, 30 * 1000); -export class GuildSavedMessages extends BaseRepository { +export class GuildSavedMessages extends BaseGuildRepository { private messages: Repository; protected toBePermanent: Set; diff --git a/src/data/GuildScheduledPosts.ts b/src/data/GuildScheduledPosts.ts index d462bc0e..0e37426e 100644 --- a/src/data/GuildScheduledPosts.ts +++ b/src/data/GuildScheduledPosts.ts @@ -1,8 +1,8 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { ScheduledPost } from "./entities/ScheduledPost"; -export class GuildScheduledPosts extends BaseRepository { +export class GuildScheduledPosts extends BaseGuildRepository { private scheduledPosts: Repository; constructor(guildId) { diff --git a/src/data/GuildSelfGrantableRoles.ts b/src/data/GuildSelfGrantableRoles.ts index 1b7a58f6..b2fe2b50 100644 --- a/src/data/GuildSelfGrantableRoles.ts +++ b/src/data/GuildSelfGrantableRoles.ts @@ -1,8 +1,8 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { SelfGrantableRole } from "./entities/SelfGrantableRole"; -export class GuildSelfGrantableRoles extends BaseRepository { +export class GuildSelfGrantableRoles extends BaseGuildRepository { private selfGrantableRoles: Repository; constructor(guildId) { diff --git a/src/data/GuildSlowmodes.ts b/src/data/GuildSlowmodes.ts index db0d4dc8..80132235 100644 --- a/src/data/GuildSlowmodes.ts +++ b/src/data/GuildSlowmodes.ts @@ -1,10 +1,10 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { SlowmodeChannel } from "./entities/SlowmodeChannel"; import { SlowmodeUser } from "./entities/SlowmodeUser"; import moment from "moment-timezone"; -export class GuildSlowmodes extends BaseRepository { +export class GuildSlowmodes extends BaseGuildRepository { private slowmodeChannels: Repository; private slowmodeUsers: Repository; diff --git a/src/data/GuildStarboards.ts b/src/data/GuildStarboards.ts index 5db94f14..b5f86e08 100644 --- a/src/data/GuildStarboards.ts +++ b/src/data/GuildStarboards.ts @@ -1,9 +1,9 @@ -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { getRepository, Repository } from "typeorm"; import { Starboard } from "./entities/Starboard"; import { StarboardMessage } from "./entities/StarboardMessage"; -export class GuildStarboards extends BaseRepository { +export class GuildStarboards extends BaseGuildRepository { private starboards: Repository; private starboardMessages: Repository; @@ -17,8 +17,8 @@ export class GuildStarboards extends BaseRepository { return this.starboards.findOne({ where: { guild_id: this.guildId, - channel_id: channelId - } + channel_id: channelId, + }, }); } @@ -26,8 +26,8 @@ export class GuildStarboards extends BaseRepository { return this.starboards.find({ where: { guild_id: this.guildId, - emoji - } + emoji, + }, }); } @@ -36,8 +36,8 @@ export class GuildStarboards extends BaseRepository { relations: this.getRelations(), where: { starboard_id: starboardId, - message_id: messageId - } + message_id: messageId, + }, }); } @@ -45,8 +45,8 @@ export class GuildStarboards extends BaseRepository { return this.starboardMessages.find({ relations: this.getRelations(), where: { - message_id: id - } + message_id: id, + }, }); } @@ -54,14 +54,14 @@ export class GuildStarboards extends BaseRepository { await this.starboardMessages.insert({ starboard_id: starboardId, message_id: messageId, - starboard_message_id: starboardMessageId + starboard_message_id: starboardMessageId, }); } async deleteStarboardMessage(starboardId, messageId): Promise { await this.starboardMessages.delete({ starboard_id: starboardId, - message_id: messageId + message_id: messageId, }); } @@ -71,14 +71,14 @@ export class GuildStarboards extends BaseRepository { channel_id: channelId, channel_whitelist: channelWhitelist ? channelWhitelist.join(",") : null, emoji, - reactions_required: reactionsRequired + reactions_required: reactionsRequired, }); } async delete(channelId: string): Promise { await this.starboards.delete({ guild_id: this.guildId, - channel_id: channelId + channel_id: channelId, }); } } diff --git a/src/data/GuildTags.ts b/src/data/GuildTags.ts index f403ebe2..cc879ded 100644 --- a/src/data/GuildTags.ts +++ b/src/data/GuildTags.ts @@ -1,9 +1,9 @@ import { Tag } from "./entities/Tag"; import { getRepository, Repository } from "typeorm"; -import { BaseRepository } from "./BaseRepository"; +import { BaseGuildRepository } from "./BaseGuildRepository"; import { TagResponse } from "./entities/TagResponse"; -export class GuildTags extends BaseRepository { +export class GuildTags extends BaseGuildRepository { private tags: Repository; private tagResponses: Repository; @@ -16,8 +16,8 @@ export class GuildTags extends BaseRepository { async all(): Promise { return this.tags.find({ where: { - guild_id: this.guildId - } + guild_id: this.guildId, + }, }); } @@ -25,8 +25,8 @@ export class GuildTags extends BaseRepository { return this.tags.findOne({ where: { guild_id: this.guildId, - tag - } + tag, + }, }); } @@ -39,7 +39,7 @@ export class GuildTags extends BaseRepository { .set({ body, user_id: userId, - created_at: () => "NOW()" + created_at: () => "NOW()", }) .where("guild_id = :guildId", { guildId: this.guildId }) .andWhere("tag = :tag", { tag }) @@ -49,7 +49,7 @@ export class GuildTags extends BaseRepository { guild_id: this.guildId, user_id: userId, tag, - body + body, }); } } @@ -57,7 +57,7 @@ export class GuildTags extends BaseRepository { async delete(tag) { await this.tags.delete({ guild_id: this.guildId, - tag + tag, }); } @@ -65,8 +65,8 @@ export class GuildTags extends BaseRepository { return this.tagResponses.findOne({ where: { guild_id: this.guildId, - command_message_id: messageId - } + command_message_id: messageId, + }, }); } @@ -74,8 +74,8 @@ export class GuildTags extends BaseRepository { return this.tagResponses.findOne({ where: { guild_id: this.guildId, - response_message_id: messageId - } + response_message_id: messageId, + }, }); } @@ -83,7 +83,7 @@ export class GuildTags extends BaseRepository { await this.tagResponses.insert({ guild_id: this.guildId, command_message_id: cmdMessageId, - response_message_id: responseMessageId + response_message_id: responseMessageId, }); } } diff --git a/src/data/UsernameHistory.ts b/src/data/UsernameHistory.ts index 31cee860..e97d58cb 100644 --- a/src/data/UsernameHistory.ts +++ b/src/data/UsernameHistory.ts @@ -1,22 +1,21 @@ -import { BaseRepository } from "./BaseRepository"; import { getRepository, Repository } from "typeorm"; import { UsernameHistoryEntry } from "./entities/UsernameHistoryEntry"; import { sorter } from "../utils"; +import { BaseRepository } from "./BaseRepository"; export const MAX_USERNAME_ENTRIES_PER_USER = 10; export class UsernameHistory extends BaseRepository { private usernameHistory: Repository; - constructor(guildId) { - super(guildId); + constructor() { + super(); this.usernameHistory = getRepository(UsernameHistoryEntry); } async getByUserId(userId): Promise { return this.usernameHistory.find({ where: { - guild_id: this.guildId, user_id: userId, }, order: { @@ -29,7 +28,6 @@ export class UsernameHistory extends BaseRepository { getLastEntry(userId): Promise { return this.usernameHistory.findOne({ where: { - guild_id: this.guildId, user_id: userId, }, order: { diff --git a/src/plugins/AutoReactionsPlugin.ts b/src/plugins/AutoReactionsPlugin.ts index 86979e30..a9a791f1 100644 --- a/src/plugins/AutoReactionsPlugin.ts +++ b/src/plugins/AutoReactionsPlugin.ts @@ -36,8 +36,8 @@ export class AutoReactionsPlugin extends ZeppelinPlugin { } 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); } diff --git a/src/plugins/Censor.ts b/src/plugins/Censor.ts index ef9daad8..4a672e73 100644 --- a/src/plugins/Censor.ts +++ b/src/plugins/Censor.ts @@ -81,7 +81,7 @@ export class CensorPlugin extends ZeppelinPlugin { 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); diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts index dd86dbc7..2570a6c7 100644 --- a/src/plugins/Logs.ts +++ b/src/plugins/Logs.ts @@ -93,9 +93,9 @@ export class LogsPlugin extends ZeppelinPlugin { 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); diff --git a/src/plugins/MessageSaver.ts b/src/plugins/MessageSaver.ts index 9f0d5a84..e60054f1 100644 --- a/src/plugins/MessageSaver.ts +++ b/src/plugins/MessageSaver.ts @@ -30,7 +30,7 @@ export class MessageSaverPlugin extends Plugin { } onLoad() { - this.savedMessages = GuildSavedMessages.getInstance(this.guildId); + this.savedMessages = GuildSavedMessages.getGuildInstance(this.guildId); } @d.event("messageCreate", "guild", false) diff --git a/src/plugins/ModActions.ts b/src/plugins/ModActions.ts index 6c777811..b50bd0d0 100644 --- a/src/plugins/ModActions.ts +++ b/src/plugins/ModActions.ts @@ -75,8 +75,8 @@ export class ModActionsPlugin extends ZeppelinPlugin { 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 = []; diff --git a/src/plugins/Mutes.ts b/src/plugins/Mutes.ts index f009b976..b11b2432 100644 --- a/src/plugins/Mutes.ts +++ b/src/plugins/Mutes.ts @@ -99,8 +99,8 @@ export class MutesPlugin extends ZeppelinPlugin { } 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 diff --git a/src/plugins/NameHistory.ts b/src/plugins/NameHistory.ts index 53394a9d..72f8defa 100644 --- a/src/plugins/NameHistory.ts +++ b/src/plugins/NameHistory.ts @@ -33,8 +33,8 @@ export class NameHistoryPlugin extends ZeppelinPlugin } 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", "") diff --git a/src/plugins/Persist.ts b/src/plugins/Persist.ts index ba9563ea..4fa9b544 100644 --- a/src/plugins/Persist.ts +++ b/src/plugins/Persist.ts @@ -30,7 +30,7 @@ export class PersistPlugin extends ZeppelinPlugin { } onLoad() { - this.persistedData = GuildPersistedData.getInstance(this.guildId); + this.persistedData = GuildPersistedData.getGuildInstance(this.guildId); this.logs = new GuildLogs(this.guildId); } diff --git a/src/plugins/PingableRolesPlugin.ts b/src/plugins/PingableRolesPlugin.ts index 3cd0287b..62d90b9d 100644 --- a/src/plugins/PingableRolesPlugin.ts +++ b/src/plugins/PingableRolesPlugin.ts @@ -36,7 +36,7 @@ export class PingableRolesPlugin extends ZeppelinPlugin { 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(); diff --git a/src/plugins/ReactionRoles.ts b/src/plugins/ReactionRoles.ts index 4a6f732f..5e0940bb 100644 --- a/src/plugins/ReactionRoles.ts +++ b/src/plugins/ReactionRoles.ts @@ -64,8 +64,8 @@ export class ReactionRolesPlugin extends ZeppelinPlugin { } onLoad() { - this.reminders = GuildReminders.getInstance(this.guildId); + this.reminders = GuildReminders.getGuildInstance(this.guildId); this.tries = new Map(); this.postDueRemindersLoop(); } diff --git a/src/plugins/SelfGrantableRolesPlugin.ts b/src/plugins/SelfGrantableRolesPlugin.ts index b008c8bf..4a26bff4 100644 --- a/src/plugins/SelfGrantableRolesPlugin.ts +++ b/src/plugins/SelfGrantableRolesPlugin.ts @@ -41,7 +41,7 @@ export class SelfGrantableRolesPlugin extends ZeppelinPlugin") diff --git a/src/plugins/Slowmode.ts b/src/plugins/Slowmode.ts index d33aed4d..1fbc30f3 100644 --- a/src/plugins/Slowmode.ts +++ b/src/plugins/Slowmode.ts @@ -61,8 +61,8 @@ export class SlowmodePlugin extends ZeppelinPlugin { } 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); diff --git a/src/plugins/Spam.ts b/src/plugins/Spam.ts index cf72913e..65b084f4 100644 --- a/src/plugins/Spam.ts +++ b/src/plugins/Spam.ts @@ -128,9 +128,9 @@ export class SpamPlugin extends ZeppelinPlugin { 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); diff --git a/src/plugins/Starboard.ts b/src/plugins/Starboard.ts index 54f2b514..9ad11901 100644 --- a/src/plugins/Starboard.ts +++ b/src/plugins/Starboard.ts @@ -47,8 +47,8 @@ export class StarboardPlugin extends ZeppelinPlugin { } 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); diff --git a/src/plugins/Tags.ts b/src/plugins/Tags.ts index 3d0776b8..bcb8902b 100644 --- a/src/plugins/Tags.ts +++ b/src/plugins/Tags.ts @@ -55,9 +55,9 @@ export class TagsPlugin extends ZeppelinPlugin { } 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); diff --git a/src/plugins/UsernameSaver.ts b/src/plugins/UsernameSaver.ts index 3d1f60cb..41095f1f 100644 --- a/src/plugins/UsernameSaver.ts +++ b/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) { diff --git a/src/plugins/Utility.ts b/src/plugins/Utility.ts index 607ec4f2..3b7f96d0 100644 --- a/src/plugins/Utility.ts +++ b/src/plugins/Utility.ts @@ -136,9 +136,9 @@ export class UtilityPlugin extends ZeppelinPlugin { 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!"));