fix: recent chats string generation to handle remote users #12834

This commit is contained in:
Julian Lam
2024-10-08 15:27:53 -04:00
parent fc1d064dfb
commit 0a17a0b948

View File

@@ -9,6 +9,7 @@ const groups = require('../groups');
const privileges = require('../privileges'); const privileges = require('../privileges');
const plugins = require('../plugins'); const plugins = require('../plugins');
const meta = require('../meta'); const meta = require('../meta');
const activitypub = require('../activitypub');
const utils = require('../utils'); const utils = require('../utils');
const translator = require('../translator'); const translator = require('../translator');
const cache = require('../cache'); const cache = require('../cache');
@@ -214,7 +215,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
userData.status = user.getStatus(userData); userData.status = user.getStatus(userData);
} }
}); });
room.users = room.users.filter(user => user && parseInt(user.uid, 10)); room.users = room.users.filter(user => user && (parseInt(user.uid, 10) || activitypub.helpers.isUri(user.uid)));
room.lastUser = room.users[0]; room.lastUser = room.users[0];
room.usernames = Messaging.generateUsernames(room, uid); room.usernames = Messaging.generateUsernames(room, uid);
room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid, results.settings.userLang); room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid, results.settings.userLang);