Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/api/server/v1/chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ API.v1.addRoute('chat.getThreadsList', { authRequired: true }, {
const total = cursor.count();

const threads = cursor.fetch();

normalizeMessagesForUser(threads, user._id);
return API.v1.success({
threads,
count: threads.length,
Expand Down Expand Up @@ -543,7 +543,7 @@ API.v1.addRoute('chat.getThreadMessages', { authRequired: true }, {
const total = cursor.count();

const messages = cursor.fetch();

normalizeMessagesForUser(messages, user._id);
return API.v1.success({
messages,
count: messages.length,
Expand Down
1 change: 0 additions & 1 deletion app/lib/server/functions/saveUserIdentity.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export function saveUserIdentity(userId, { _id, name: rawName, username: rawUser
fileStore.model.updateFileNameById(file._id, username);
}
}

// update other references if either the name or username has changed
if (usernameChanged || nameChanged) {
// update name and fname of 1-on-1 direct messages
Expand Down
6 changes: 5 additions & 1 deletion app/threads/server/methods/getThreadMessages.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Messages, Rooms } from '../../../models/server';
import { canAccessRoom } from '../../../authorization/server';
import { settings } from '../../../settings/server';
import { readThread } from '../functions';
import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';

const MAX_LIMIT = 100;

Expand Down Expand Up @@ -32,7 +33,10 @@ Meteor.methods({
readThread({ userId: user._id, rid: thread.rid, tmid });

const result = Messages.findVisibleThreadByThreadId(tmid, { ...skip && { skip }, ...limit && { limit }, sort: { ts: -1 } }).fetch();
const combinedMessages = [thread, ...result];

return [thread, ...result];
normalizeMessagesForUser(combinedMessages, user._id);

return combinedMessages;
},
});