nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Caches logged user in Note compose

Browse Source
This commit is contained in:
Vitor Pamplona
2023-04-07 17:21:21 -04:00
parent 03b76357ff
commit 49ed594f53
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+13 -12
View File
@@ -116,6 +116,7 @@ fun NoteComposeInner(
) { ) {
val accountState by accountViewModel.accountLiveData.observeAsState() val accountState by accountViewModel.accountLiveData.observeAsState()
val account = accountState?.account ?: return val account = accountState?.account ?: return
val loggedIn = account.userProfile()
val noteState by baseNote.live().metadata.observeAsState() val noteState by baseNote.live().metadata.observeAsState()
val note = noteState?.note val note = noteState?.note
@@ -135,8 +136,8 @@ fun NoteComposeInner(
LaunchedEffect(key1 = noteReportsState) { LaunchedEffect(key1 = noteReportsState) {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
canPreview = note?.author === account.userProfile() || canPreview = note?.author === loggedIn ||
(note?.author?.let { account.userProfile().isFollowingCached(it) } ?: true) || (note?.author?.let { loggedIn.isFollowingCached(it) } ?: true) ||
!noteForReports.hasAnyReports() !noteForReports.hasAnyReports()
isAcceptable = account.isAcceptable(noteForReports) isAcceptable = account.isAcceptable(noteForReports)
@@ -158,7 +159,7 @@ fun NoteComposeInner(
if (!account.isHidden(noteForReports.author!!)) { if (!account.isHidden(noteForReports.author!!)) {
HiddenNote( HiddenNote(
account.getRelevantReports(noteForReports), account.getRelevantReports(noteForReports),
account.userProfile(), loggedIn,
modifier, modifier,
isBoostedNote, isBoostedNote,
navController, navController,
@@ -231,7 +232,7 @@ fun NoteComposeInner(
.width(55.dp) .width(55.dp)
.padding(0.dp) .padding(0.dp)
) { ) {
NoteAuthorPicture(note, navController, account.userProfile(), 55.dp) NoteAuthorPicture(note, navController, loggedIn, 55.dp)
if (noteEvent is RepostEvent) { if (noteEvent is RepostEvent) {
note.replyTo?.lastOrNull()?.let { note.replyTo?.lastOrNull()?.let {
@@ -244,7 +245,7 @@ fun NoteComposeInner(
NoteAuthorPicture( NoteAuthorPicture(
it, it,
navController, navController,
account.userProfile(), loggedIn,
35.dp, 35.dp,
pictureModifier = Modifier.border(2.dp, MaterialTheme.colors.background, CircleShape) pictureModifier = Modifier.border(2.dp, MaterialTheme.colors.background, CircleShape)
) )
@@ -299,7 +300,7 @@ fun NoteComposeInner(
) { ) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
if (isQuotedNote) { if (isQuotedNote) {
NoteAuthorPicture(note, navController, account.userProfile(), 25.dp) NoteAuthorPicture(note, navController, loggedIn, 25.dp)
Spacer(Modifier.padding(horizontal = 5.dp)) Spacer(Modifier.padding(horizontal = 5.dp))
NoteUsernameDisplay(note, Modifier.weight(1f)) NoteUsernameDisplay(note, Modifier.weight(1f))
} else { } else {
@@ -384,7 +385,7 @@ fun NoteComposeInner(
val sortedMentions = noteEvent.mentions() val sortedMentions = noteEvent.mentions()
.mapNotNull { LocalCache.checkGetOrCreateUser(it) } .mapNotNull { LocalCache.checkGetOrCreateUser(it) }
.toSet() .toSet()
.sortedBy { account.userProfile().isFollowingCached(it) } .sortedBy { loggedIn.isFollowingCached(it) }
note.channel()?.let { note.channel()?.let {
ReplyInformationChannel(note.replyTo, sortedMentions, it, navController) ReplyInformationChannel(note.replyTo, sortedMentions, it, navController)
@@ -435,7 +436,7 @@ fun NoteComposeInner(
thickness = 0.25.dp thickness = 0.25.dp
) )
} else if (noteEvent is LongTextNoteEvent) { } else if (noteEvent is LongTextNoteEvent) {
LongFormHeader(noteEvent, note, account.userProfile()) LongFormHeader(noteEvent, note, loggedIn)
ReactionsRow(note, accountViewModel) ReactionsRow(note, accountViewModel)
@@ -453,7 +454,7 @@ fun NoteComposeInner(
UserPicture( UserPicture(
user = it, user = it,
navController = navController, navController = navController,
userAccount = account.userProfile(), userAccount = loggedIn,
size = 35.dp size = 35.dp
) )
} }
@@ -479,8 +480,8 @@ fun NoteComposeInner(
thickness = 0.25.dp thickness = 0.25.dp
) )
} else if (noteEvent is PrivateDmEvent && } else if (noteEvent is PrivateDmEvent &&
noteEvent.recipientPubKey() != account.userProfile().pubkeyHex && noteEvent.recipientPubKey() != loggedIn.pubkeyHex &&
note.author != account.userProfile() note.author !== loggedIn
) { ) {
val recepient = noteEvent.recipientPubKey()?.let { LocalCache.checkGetOrCreateUser(it) } val recepient = noteEvent.recipientPubKey()?.let { LocalCache.checkGetOrCreateUser(it) }
@@ -510,7 +511,7 @@ fun NoteComposeInner(
val eventContent = accountViewModel.decrypt(note) val eventContent = accountViewModel.decrypt(note)
if (eventContent != null) { if (eventContent != null) {
if (makeItShort && note.author == account.userProfile()) { if (makeItShort && note.author == loggedIn) {
Text( Text(
text = eventContent, text = eventContent,
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f), color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),