StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-24 10:05:03 +00:00
Code Releases Activity

use savedmessages state instead of static method

Browse source
This commit is contained in:
almeidx 2021-09-04 22:44:02 +01:00
parent 7e6dce23d5
commit 80b96ba2c7
No known key found for this signature in database
GPG key ID: F403F80B79353CB4
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

34
backend/src/data/GuildSavedMessages.ts
View file

@ -140,10 +140,38 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
return data; return data;
} }
<<<<<<< HEAD
protected async _processEntityFromDB(entity: SavedMessage | undefined) { protected async _processEntityFromDB(entity: SavedMessage | undefined) {
if (entity == null) { if (entity == null) {
return entity; return entity;
} }
=======
public msgToSavedMessage(message: Message): SavedMessage {
const postedAt = moment.utc(message.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
return {
data: this.msgToSavedMessageData(message),
id: message.id,
guild_id: (message.channel as GuildChannel).guildId,
channel_id: message.channelId,
user_id: message.author.id,
is_bot: message.author.bot,
posted_at: postedAt,
// @ts-expect-error
deleted_at: null,
is_permanent: false,
};
}
find(id) {
return this.messages
.createQueryBuilder()
.where("guild_id = :guild_id", { guild_id: this.guildId })
.andWhere("id = :id", { id })
.andWhere("deleted_at IS NULL")
.getOne();
}
>>>>>>> 14aceada (use savedmessages state instead of static method)
entity.data = await decryptJson(entity.data as unknown as string); entity.data = await decryptJson(entity.data as unknown as string);
return entity; return entity;
@ -223,12 +251,16 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
await this.insertBulk(items); await this.insertBulk(items);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
protected async msgToInsertReadyEntity(msg: Message): Promise<Partial<SavedMessage>> { protected async msgToInsertReadyEntity(msg: Message): Promise<Partial<SavedMessage>> {
const savedMessageData = this.msgToSavedMessageData(msg); const savedMessageData = this.msgToSavedMessageData(msg);
======= =======
const savedMessageData = GuildSavedMessages.msgToSavedMessageData(msg); const savedMessageData = GuildSavedMessages.msgToSavedMessageData(msg);
>>>>>>> 95a0ce8c (clean up) >>>>>>> 95a0ce8c (clean up)
=======
const savedMessageData = this.msgToSavedMessageData(msg);
>>>>>>> 14aceada (use savedmessages state instead of static method)
const postedAt = moment.utc(msg.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss"); const postedAt = moment.utc(msg.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
return { return {
@ -334,7 +366,7 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
await this.saveEdit(msg.id, newData); await this.saveEdit(msg.id, newData);
======= =======
async saveEditFromMsg(msg: Message) { async saveEditFromMsg(msg: Message) {
const newData = GuildSavedMessages.msgToSavedMessageData(msg); const newData = this.msgToSavedMessageData(msg);
return this.saveEdit(msg.id, newData); return this.saveEdit(msg.id, newData);
>>>>>>> 95a0ce8c (clean up) >>>>>>> 95a0ce8c (clean up)
} }

1
backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
View file

@ -1,5 +1,4 @@
import { typedGuildEventListener } from "knub"; import { typedGuildEventListener } from "knub";
import { GuildSavedMessages } from "../../../data/GuildSavedMessages";
import { runAutomod } from "../functions/runAutomod"; import { runAutomod } from "../functions/runAutomod";
import { AutomodContext, AutomodPluginType } from "../types"; import { AutomodContext, AutomodPluginType } from "../types";