From 0a17a0b94844af494c8c6be65bd5e33552d8b277 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 8 Oct 2024 15:27:53 -0400 Subject: [PATCH] fix: recent chats string generation to handle remote users #12834 --- src/messaging/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/messaging/index.js b/src/messaging/index.js index eda2bd4ac0..1eaf5255d1 100644 --- a/src/messaging/index.js +++ b/src/messaging/index.js @@ -9,6 +9,7 @@ const groups = require('../groups'); const privileges = require('../privileges'); const plugins = require('../plugins'); const meta = require('../meta'); +const activitypub = require('../activitypub'); const utils = require('../utils'); const translator = require('../translator'); const cache = require('../cache'); @@ -214,7 +215,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => { 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.usernames = Messaging.generateUsernames(room, uid); room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid, results.settings.userLang);