Compare commits

..

No commits in common. "969b21a8e8181ffcef63ba401d98cd4beb3aa62d" and "95999b421d0f992f5a6f5a095a41164d4808c23b" have entirely different histories.

1 changed files with 8 additions and 1 deletions

View File

@ -147,10 +147,17 @@ useMutationObserver(timelineEl, {
}); });
function normalizeMessage(message: Misskey.entities.ChatMessageLite | Misskey.entities.ChatMessage): NormalizedChatMessage { function normalizeMessage(message: Misskey.entities.ChatMessageLite | Misskey.entities.ChatMessage): NormalizedChatMessage {
const reactions = [...message.reactions];
for (const record of reactions) {
if (room.value == null && record.user == null) { // 1on1user
record.user = message.fromUserId === $i.id ? user.value : $i;
}
}
return { return {
...message, ...message,
fromUser: message.fromUser ?? (message.fromUserId === $i.id ? $i : user.value!), fromUser: message.fromUser ?? (message.fromUserId === $i.id ? $i : user.value!),
reactions: message.reactions.map(record => ({ reactions: reactions.map(record => ({
...record, ...record,
user: record.user ?? (message.fromUserId === $i.id ? user.value! : $i), user: record.user ?? (message.fromUserId === $i.id ? user.value! : $i),
})), })),