diff --git a/backend/src/data/GuildLogs.ts b/backend/src/data/GuildLogs.ts index 042e5e5f..58488906 100644 --- a/backend/src/data/GuildLogs.ts +++ b/backend/src/data/GuildLogs.ts @@ -50,6 +50,9 @@ export class GuildLogs extends EventEmitter { } clearIgnoredLog(type: LogType, ignoreId: any) { - this.ignoredLogs.splice(this.ignoredLogs.findIndex(info => type === info.type && ignoreId === info.ignoreId), 1); + this.ignoredLogs.splice( + this.ignoredLogs.findIndex(info => type === info.type && ignoreId === info.ignoreId), + 1, + ); } } diff --git a/backend/src/data/GuildReminders.ts b/backend/src/data/GuildReminders.ts index 6425ff61..b370b465 100644 --- a/backend/src/data/GuildReminders.ts +++ b/backend/src/data/GuildReminders.ts @@ -41,7 +41,7 @@ export class GuildReminders extends BaseGuildRepository { channel_id: channelId, remind_at: remindAt, body, - created_at + created_at, }); } } diff --git a/backend/src/data/entities/ApiLogin.ts b/backend/src/data/entities/ApiLogin.ts index 76204224..5dc7ebeb 100644 --- a/backend/src/data/entities/ApiLogin.ts +++ b/backend/src/data/entities/ApiLogin.ts @@ -19,7 +19,10 @@ export class ApiLogin { @Column() expires_at: string; - @ManyToOne(type => ApiUserInfo, userInfo => userInfo.logins) + @ManyToOne( + type => ApiUserInfo, + userInfo => userInfo.logins, + ) @JoinColumn({ name: "user_id" }) userInfo: ApiUserInfo; } diff --git a/backend/src/data/entities/ApiPermissionAssignment.ts b/backend/src/data/entities/ApiPermissionAssignment.ts index b97ce26b..c454206c 100644 --- a/backend/src/data/entities/ApiPermissionAssignment.ts +++ b/backend/src/data/entities/ApiPermissionAssignment.ts @@ -18,7 +18,10 @@ export class ApiPermissionAssignment { @Column("simple-array") permissions: string[]; - @ManyToOne(type => ApiUserInfo, userInfo => userInfo.permissionAssignments) + @ManyToOne( + type => ApiUserInfo, + userInfo => userInfo.permissionAssignments, + ) @JoinColumn({ name: "target_id" }) userInfo: ApiUserInfo; } diff --git a/backend/src/data/entities/ApiUserInfo.ts b/backend/src/data/entities/ApiUserInfo.ts index 9d36eb2c..e546db60 100644 --- a/backend/src/data/entities/ApiUserInfo.ts +++ b/backend/src/data/entities/ApiUserInfo.ts @@ -20,9 +20,15 @@ export class ApiUserInfo { @Column() updated_at: string; - @OneToMany(type => ApiLogin, login => login.userInfo) + @OneToMany( + type => ApiLogin, + login => login.userInfo, + ) logins: ApiLogin[]; - @OneToMany(type => ApiPermissionAssignment, p => p.userInfo) + @OneToMany( + type => ApiPermissionAssignment, + p => p.userInfo, + ) permissionAssignments: ApiPermissionAssignment[]; } diff --git a/backend/src/data/entities/Case.ts b/backend/src/data/entities/Case.ts index 88a920e3..5b65e75a 100644 --- a/backend/src/data/entities/Case.ts +++ b/backend/src/data/entities/Case.ts @@ -29,6 +29,9 @@ export class Case { @Column() pp_name: string; - @OneToMany(type => CaseNote, note => note.case) + @OneToMany( + type => CaseNote, + note => note.case, + ) notes: CaseNote[]; } diff --git a/backend/src/data/entities/CaseNote.ts b/backend/src/data/entities/CaseNote.ts index 109f72de..4541717c 100644 --- a/backend/src/data/entities/CaseNote.ts +++ b/backend/src/data/entities/CaseNote.ts @@ -15,7 +15,10 @@ export class CaseNote { @Column() created_at: string; - @ManyToOne(type => Case, theCase => theCase.notes) + @ManyToOne( + type => Case, + theCase => theCase.notes, + ) @JoinColumn({ name: "case_id" }) case: Case; } diff --git a/backend/src/data/entities/Reminder.ts b/backend/src/data/entities/Reminder.ts index b232c796..d7e33972 100644 --- a/backend/src/data/entities/Reminder.ts +++ b/backend/src/data/entities/Reminder.ts @@ -16,5 +16,5 @@ export class Reminder { @Column() body: string; - @Column() created_at: string + @Column() created_at: string; } diff --git a/backend/src/migrations/1578445483917-CreateReminderCreatedAtField.ts b/backend/src/migrations/1578445483917-CreateReminderCreatedAtField.ts index b078d18f..74ba8cf8 100644 --- a/backend/src/migrations/1578445483917-CreateReminderCreatedAtField.ts +++ b/backend/src/migrations/1578445483917-CreateReminderCreatedAtField.ts @@ -1,18 +1,18 @@ -import {MigrationInterface, QueryRunner, TableColumn} from "typeorm"; +import { MigrationInterface, QueryRunner, TableColumn } from "typeorm"; export class CreateReminderCreatedAtField1578445483917 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.addColumn( + "reminders", + new TableColumn({ + name: "created_at", + type: "datetime", + isNullable: false, + }), + ); + } - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.addColumn("reminders", - new TableColumn({ - name: "created_at", - type: "datetime", - isNullable: false - })); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn("reminders", "created_at"); - } - + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.dropColumn("reminders", "created_at"); + } } diff --git a/backend/src/plugins/MessageSaver.ts b/backend/src/plugins/MessageSaver.ts index d8567b05..ae413f33 100644 --- a/backend/src/plugins/MessageSaver.ts +++ b/backend/src/plugins/MessageSaver.ts @@ -125,7 +125,10 @@ export class MessageSaverPlugin extends ZeppelinPlugin { await msg.channel.createMessage(`Saving pins from <#${args.channel.id}>...`); const pins = await args.channel.getPins(); - const { savedCount, failed } = await this.saveMessagesToDB(args.channel, pins.map(m => m.id)); + const { savedCount, failed } = await this.saveMessagesToDB( + args.channel, + pins.map(m => m.id), + ); if (failed.length) { msg.channel.createMessage( diff --git a/backend/src/plugins/ModActions.ts b/backend/src/plugins/ModActions.ts index 7d4e28dc..9e0ce862 100644 --- a/backend/src/plugins/ModActions.ts +++ b/backend/src/plugins/ModActions.ts @@ -197,7 +197,10 @@ export class ModActionsPlugin extends ZeppelinPlugin { } clearIgnoredEvent(type: IgnoredEventType, userId: any) { - this.ignoredEvents.splice(this.ignoredEvents.findIndex(info => type === info.type && userId === info.userId), 1); + this.ignoredEvents.splice( + this.ignoredEvents.findIndex(info => type === info.type && userId === info.userId), + 1, + ); } formatReasonWithAttachments(reason: string, attachments: Attachment[]) { diff --git a/backend/src/plugins/Reminders.ts b/backend/src/plugins/Reminders.ts index 3f15161a..dd1767e0 100644 --- a/backend/src/plugins/Reminders.ts +++ b/backend/src/plugins/Reminders.ts @@ -70,19 +70,18 @@ export class RemindersPlugin extends ZeppelinPlugin { const channel = this.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()){ + // 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 }); + 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}`), + 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 @@ -138,7 +137,13 @@ export class RemindersPlugin extends ZeppelinPlugin { } const reminderBody = args.reminder || `https://discordapp.com/channels/${this.guildId}/${msg.channel.id}/${msg.id}`; - await this.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")); + await this.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 }); @@ -163,7 +168,7 @@ export class RemindersPlugin extends ZeppelinPlugin { 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 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}`; diff --git a/backend/src/plugins/Utility.ts b/backend/src/plugins/Utility.ts index 3db9b28b..348cb90a 100644 --- a/backend/src/plugins/Utility.ts +++ b/backend/src/plugins/Utility.ts @@ -797,11 +797,11 @@ export class UtilityPlugin extends ZeppelinPlugin { name: "compact", shortcut: "c", isSwitch: true, - } - ] + }, + ], }) @d.permission("can_info") - async infoCmd(msg: Message, args: { user?: User | UnknownUser, compact?: boolean }) { + async infoCmd(msg: Message, args: { user?: User | UnknownUser; compact?: boolean }) { const user = args.user || msg.author; let member; @@ -823,22 +823,21 @@ export class UtilityPlugin extends ZeppelinPlugin { embed.title = `${user.username}#${user.discriminator}`; embed.thumbnail = { url: user.avatarURL }; - if(args.compact){ + if (args.compact) { embed.fields.push({ name: "User information", - value: - trimLines(` + value: trimLines(` Profile: <@!${user.id}> Created: **${accountAge} ago (${createdAt.format("YYYY-MM-DD[T]HH:mm:ss")})** `), - }); + }); if (member) { const joinedAt = moment(member.joinedAt); const joinAge = humanizeDuration(moment().valueOf() - member.joinedAt, { largest: 2, round: true, }); - embed.fields[0].value += `\nJoined: **${joinAge} ago (${joinedAt.format("YYYY-MM-DD[T]HH:mm:ss")})**` + embed.fields[0].value += `\nJoined: **${joinAge} ago (${joinedAt.format("YYYY-MM-DD[T]HH:mm:ss")})**`; } else { embed.fields.push({ name: "!! USER IS NOT ON THE SERVER !!", @@ -847,8 +846,7 @@ export class UtilityPlugin extends ZeppelinPlugin { } msg.channel.createMessage({ embed }); return; - } - else{ + } else { embed.fields.push({ name: "User information", value: @@ -857,7 +855,7 @@ export class UtilityPlugin extends ZeppelinPlugin { Profile: <@!${user.id}> Created: **${accountAge} ago (${createdAt.format("YYYY-MM-DD[T]HH:mm:ss")})** `) + embedPadding, - }); + }); } } else { embed.title = `Unknown user`; @@ -897,7 +895,6 @@ export class UtilityPlugin extends ZeppelinPlugin { name: "!! USER IS NOT ON THE SERVER !!", value: embedPadding, }); - } const cases = (await this.cases.getByUserId(user.id)).filter(c => !c.is_hidden); @@ -920,7 +917,7 @@ export class UtilityPlugin extends ZeppelinPlugin { `), }); } - + msg.channel.createMessage({ embed }); } diff --git a/backend/src/plugins/availablePlugins.ts b/backend/src/plugins/availablePlugins.ts index 8e6d3374..f30034ff 100644 --- a/backend/src/plugins/availablePlugins.ts +++ b/backend/src/plugins/availablePlugins.ts @@ -27,7 +27,7 @@ import { LocatePlugin } from "./LocateUser"; import { GuildConfigReloader } from "./GuildConfigReloader"; import { ChannelArchiverPlugin } from "./ChannelArchiver"; import { AutomodPlugin } from "./Automod"; -import { RolesPlugin} from "./Roles"; +import { RolesPlugin } from "./Roles"; /** * Plugins available to be loaded for individual guilds diff --git a/backend/src/utils.ts b/backend/src/utils.ts index f12a04e1..1cb5af74 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -956,25 +956,25 @@ export async function resolveMember(bot: Client, guild: Guild, value: string): P return null; } -export async function resolveRoleId(bot: Client, guildId: string, value: string){ - if(value == null){ +export async function resolveRoleId(bot: Client, guildId: string, value: string) { + if (value == null) { return null; } - //role mention + // Role mention const mentionMatch = value.match(/^<@&?(\d+)>$/); - if(mentionMatch){ + if (mentionMatch) { return mentionMatch[1]; } - //role name - let roleList = await bot.getRESTGuildRoles(guildId); - let role = roleList.filter(x => x.name.toLocaleLowerCase() == value.toLocaleLowerCase()); - if(role[0]){ + // Role name + const roleList = await bot.getRESTGuildRoles(guildId); + const role = roleList.filter(x => x.name.toLocaleLowerCase() === value.toLocaleLowerCase()); + if (role[0]) { return role[0].id; } - //role ID + // Role ID const idMatch = value.match(/^\d+$/); if (idMatch) { return value;