Skip to content

fix: prevent null fields in Slack import breaking message history #37805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sanki92 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: prevent null fields in Slack import breaking message history #37805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions apps/meteor/app/importer/server/classes/converters/MessageConverter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,11 @@ export class MessageConverter extends RecordConverter<IImportMessageRecord> {

protected async buildMessageObject(data: IImportMessage, rid: string, creator: UserIdentification): Promise<MessageObject> {
// Convert the mentions and channels first because these conversions can also modify the msg in the message object
const mentions = data.mentions && (await this.convertMessageMentions(data));
const channels = data.channels && (await this.convertMessageChannels(data));
const mentions = (data.mentions && (await this.convertMessageMentions(data))) ?? [];
const channels = (data.channels && (await this.convertMessageChannels(data))) ?? [];
const replies = data.replies ? await this.convertMessageReplies(data.replies) : undefined;
const editedBy = data.editedBy ? await this._cache.findImportedUser(data.editedBy) : undefined;
const reactions = data.reactions ? await this.convertMessageReactions(data.reactions) : undefined;

return {
rid,
Expand All @@ -94,24 +97,24 @@ export class MessageConverter extends RecordConverter<IImportMessageRecord> {
},
msg: data.msg,
ts: data.ts,
t: data.t || undefined,
groupable: data.groupable,
tmid: data.tmid,
tlm: data.tlm,
tcount: data.tcount,
replies: data.replies && (await this.convertMessageReplies(data.replies)),
editedAt: data.editedAt,
editedBy: data.editedBy && ((await this._cache.findImportedUser(data.editedBy)) || undefined),
...(data.t != null && { t: data.t }),
...(data.groupable != null && { groupable: data.groupable }),
...(data.tmid != null && { tmid: data.tmid }),
...(data.tlm != null && { tlm: data.tlm }),
...(data.tcount != null && { tcount: data.tcount }),
...(replies && replies.length > 0 && { replies }),
...(data.editedAt && { editedAt: data.editedAt }),
...(editedBy && { editedBy }),
mentions,
channels,
_importFile: data._importFile,
url: data.url,
attachments: data.attachments,
bot: data.bot,
emoji: data.emoji,
alias: data.alias,
...(data._id ? { _id: data._id } : {}),
...(data.reactions ? { reactions: await this.convertMessageReactions(data.reactions) } : {}),
...(data._importFile && { _importFile: data._importFile }),
...(data.url && { url: data.url }),
...(data.attachments && { attachments: data.attachments }),
...(data.bot != null && { bot: data.bot }),
...(data.emoji && { emoji: data.emoji }),
...(data.alias && { alias: data.alias }),
...(data._id && { _id: data._id }),
...(reactions && { reactions }),
};
}

Expand Down