From 8dc6a4d59abe1821f59dfbf62a4643ede43b1cb7 Mon Sep 17 00:00:00 2001 From: Infi Date: Fri, 8 Sep 2023 04:07:17 +0200 Subject: [PATCH] fix: "unknown" name in DMs Signed-off-by: Infi --- app/src/main/java/chat/revolt/components/chat/Message.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/chat/revolt/components/chat/Message.kt b/app/src/main/java/chat/revolt/components/chat/Message.kt index 8002e3e5..39a889d4 100644 --- a/app/src/main/java/chat/revolt/components/chat/Message.kt +++ b/app/src/main/java/chat/revolt/components/chat/Message.kt @@ -85,10 +85,12 @@ fun authorName(message: MessageSchema): String { } val serverId = - RevoltAPI.channelCache[message.channel]?.server ?: return stringResource(R.string.unknown) + RevoltAPI.channelCache[message.channel]?.server + ?: return RevoltAPI.userCache[message.author]?.let { User.resolveDefaultName(it) } + ?: stringResource(R.string.unknown) + val member = message.author?.let { RevoltAPI.members.getMember(serverId, it) } ?: return stringResource(R.string.unknown) - return member.nickname ?: RevoltAPI.userCache[message.author]?.let { User.resolveDefaultName(it) } ?: stringResource(R.string.unknown)