StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-23 17:45: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 3d31612754
commit 6c01bb6200
No known key found for this signature in database
GPG key ID: F403F80B79353CB4
2 changed files with 1 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,28 +25,7 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
this.toBePermanent = new Set();
}
<<<<<<< HEAD
protected msgToSavedMessageData(msg: Message): ISavedMessageData {
=======
public static msgToSavedMessage(message: Message): SavedMessage {
const postedAt = moment.utc(message.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
return {
data: GuildSavedMessages.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,
};
}
public static msgToSavedMessageData(msg: Message): ISavedMessageData {
>>>>>>> clean up
const data: ISavedMessageData = {
author: {
username: msg.author.username,
@ -227,12 +206,8 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
await this.insertBulk(items);
}
<<<<<<< HEAD
protected async msgToInsertReadyEntity(msg: Message): Promise<Partial<SavedMessage>> {
const savedMessageData = this.msgToSavedMessageData(msg);
=======
const savedMessageData = GuildSavedMessages.msgToSavedMessageData(msg);
>>>>>>> clean up
const postedAt = moment.utc(msg.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
return {
@ -332,15 +307,9 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
this.events.emit(`update:${id}`, [newMessage, oldMessage]);
}
<<<<<<< HEAD
async saveEditFromMsg(msg: Message): Promise<void> {
const newData = this.msgToSavedMessageData(msg);
await this.saveEdit(msg.id, newData);
=======
async saveEditFromMsg(msg: Message) {
const newData = GuildSavedMessages.msgToSavedMessageData(msg);
return this.saveEdit(msg.id, newData);
>>>>>>> clean up
}
async setPermanent(id: string): Promise<void> {

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

@ -27,7 +27,7 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
(m) => m.thread?.id === thread.id || m.reference?.channelId === thread.id,
);
if (sourceMessage) {
const savedMessage = GuildSavedMessages.msgToSavedMessage(sourceMessage);
const savedMessage = pluginData.state.savedMessages.msgToSavedMessage(sourceMessage);
savedMessage.channel_id = thread.id;
context.message = savedMessage;
}