RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: treat null presence as online 

i have no idea why this is correct but ive been told it is

Signed-off-by: Infi <wingit@geist.ga>
This commit is contained in:
Infi 2023-08-30 03:22:35 +05:00
parent 56ba789ca4
commit a45b07f9de
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/chat/revolt/components/generic/UserAvatar.kt
View File

@ -33,11 +33,11 @@ enum class Presence {
Offline Offline
} }
fun presenceFromStatus(status: String, online: Boolean = true): Presence { fun presenceFromStatus(status: String?, online: Boolean = true): Presence {
if (!online) return Presence.Offline if (!online) return Presence.Offline
return when (status) { return when (status) {
"Online" -> Presence.Online "Online", null -> Presence.Online
"Idle" -> Presence.Idle "Idle" -> Presence.Idle
"Busy" -> Presence.Dnd "Busy" -> Presence.Dnd
"Focus" -> Presence.Focus "Focus" -> Presence.Focus

2
app/src/main/java/chat/revolt/components/screens/chat/drawer/channel/ChannelList.kt
View File

@ -243,7 +243,7 @@ fun RowScope.ChannelList(
dmPartnerId = partner?.id, dmPartnerId = partner?.id,
dmPartnerName = partner?.let { p -> User.resolveDefaultName(p) }, dmPartnerName = partner?.let { p -> User.resolveDefaultName(p) },
dmPartnerStatus = presenceFromStatus( dmPartnerStatus = presenceFromStatus(
status = partner?.status?.presence ?: "Offline", status = partner?.status?.presence,
online = partner?.online ?: false online = partner?.online ?: false
), ),
onClick = { onClick = {

2
app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
View File

@ -138,7 +138,7 @@ fun RawUserOverview(user: User, profile: Profile? = null) {
userId = user.id ?: ULID.makeSpecial(0), userId = user.id ?: ULID.makeSpecial(0),
avatar = user.avatar, avatar = user.avatar,
size = 48.dp, size = 48.dp,
presence = presenceFromStatus(user.status?.presence ?: "Offline"), presence = presenceFromStatus(user.status?.presence),
) )
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))

3
app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
View File

@ -541,7 +541,6 @@ fun Sidebar(
?: "", ?: "",
presence = presenceFromStatus( presence = presenceFromStatus(
RevoltAPI.userCache[RevoltAPI.selfId]?.status?.presence RevoltAPI.userCache[RevoltAPI.selfId]?.status?.presence
?: ""
), ),
userId = RevoltAPI.selfId ?: "", userId = RevoltAPI.selfId ?: "",
avatar = RevoltAPI.userCache[RevoltAPI.selfId]?.avatar, avatar = RevoltAPI.userCache[RevoltAPI.selfId]?.avatar,
@ -592,7 +591,7 @@ fun Sidebar(
) )
} ?: it.name ?: "?", } ?: it.name ?: "?",
presence = presenceFromStatus( presence = presenceFromStatus(
partner?.status?.presence ?: "" partner?.status?.presence
), ),
userId = partner?.id ?: it.id ?: "", userId = partner?.id ?: it.id ?: "",
avatar = partner?.avatar ?: it.icon, avatar = partner?.avatar ?: it.icon,

2
app/src/main/java/chat/revolt/sheets/MemberListSheet.kt
View File

@ -246,7 +246,7 @@ fun MemberListMember(
avatar = user.avatar, avatar = user.avatar,
userId = user.id!!, userId = user.id!!,
presence = presenceFromStatus( presence = presenceFromStatus(
user.status?.presence ?: "", user.status?.presence,
user.online ?: false user.online ?: false
) )
) )

2
app/src/main/java/chat/revolt/sheets/StatusSheet.kt
View File

@ -47,7 +47,7 @@ fun StatusSheet(
userId = selfUser.id ?: ULID.makeSpecial(0), userId = selfUser.id ?: ULID.makeSpecial(0),
avatar = selfUser.avatar, avatar = selfUser.avatar,
size = 48.dp, size = 48.dp,
presence = presenceFromStatus(selfUser.status?.presence ?: "offline"), presence = presenceFromStatus(selfUser.status?.presence),
) )
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))