From ae24104223164fdee29a756e0a50ebc2793e822b Mon Sep 17 00:00:00 2001 From: Infi Date: Mon, 28 Oct 2024 02:24:44 +0100 Subject: [PATCH] fix: issue in which reaction sheets may crash Signed-off-by: Infi --- app/src/main/java/chat/revolt/api/routes/user/User.kt | 2 +- app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/chat/revolt/api/routes/user/User.kt b/app/src/main/java/chat/revolt/api/routes/user/User.kt index 5d79e3d8..7dc8750a 100644 --- a/app/src/main/java/chat/revolt/api/routes/user/User.kt +++ b/app/src/main/java/chat/revolt/api/routes/user/User.kt @@ -122,7 +122,7 @@ suspend fun fetchUser(id: String): User { try { val error = RevoltJson.decodeFromString(RevoltError.serializer(), response) - throw Error(error.type) + throw Exception(error.type) } catch (e: SerializationException) { // Not an error } diff --git a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt index 041334f8..120a42c4 100644 --- a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt @@ -310,7 +310,11 @@ fun ReactionInfoSheet(messageId: String, emoji: String, onDismiss: () -> Unit) { LaunchedEffect(reaction) { if (reaction !in RevoltAPI.userCache) { - RevoltAPI.userCache[reaction] = fetchUser(reaction) + try { + RevoltAPI.userCache[reaction] = fetchUser(reaction) + } catch (e: Exception) { + // too bad! + } } }