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

resolve leftover conflict

Browse source
This commit is contained in:
almeidx 2021-10-20 21:00:23 +01:00
parent 80b96ba2c7
commit 12c8d68992
No known key found for this signature in database
GPG key ID: F403F80B79353CB4
1 changed files with 0 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,38 +140,10 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
return data;
}
<<<<<<< HEAD
protected async _processEntityFromDB(entity: SavedMessage | undefined) {
if (entity == null) {
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);
return entity;
@ -251,16 +223,8 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
await this.insertBulk(items);
}
<<<<<<< HEAD
<<<<<<< HEAD
protected async msgToInsertReadyEntity(msg: Message): Promise<Partial<SavedMessage>> {
const savedMessageData = this.msgToSavedMessageData(msg);
=======
const savedMessageData = GuildSavedMessages.msgToSavedMessageData(msg);
>>>>>>> 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");
return {
@ -360,15 +324,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 = this.msgToSavedMessageData(msg);
return this.saveEdit(msg.id, newData);
>>>>>>> 95a0ce8c (clean up)
}
async setPermanent(id: string): Promise<void> {