highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-11 00:54:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finishing the prune clean up to make sure we don't delete post from other accounts logged in.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-08-22 16:01:59 -04:00
parent a63b383425
commit 2d30f3e9d2
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
View File

@@ -1365,8 +1365,8 @@ object LocalCache {
// Doesn't need to clean up the replies and mentions.. Too small to matter. // Doesn't need to clean up the replies and mentions.. Too small to matter.
// Counts the replies // Counts the replies
it.replyTo?.forEach { _ -> it.replyTo?.forEach { parent ->
it.removeReply(it) parent.removeReply(it)
} }
childrenToBeRemoved.addAll(it.removeAllChildNotes()) childrenToBeRemoved.addAll(it.removeAllChildNotes())
@@ -1389,8 +1389,8 @@ object LocalCache {
notes.remove(it.idHex) notes.remove(it.idHex)
// Counts the replies // Counts the replies
it.replyTo?.forEach { _ -> it.replyTo?.forEach { parent ->
it.removeReply(it) parent.removeReply(it)
} }
childrenToBeRemoved.addAll(it.removeAllChildNotes()) childrenToBeRemoved.addAll(it.removeAllChildNotes())
@@ -1405,9 +1405,8 @@ object LocalCache {
} }
} }
fun pruneRepliesAndReactions(account: Account) { fun pruneRepliesAndReactions(accounts: Set<HexKey>) {
checkNotInMainThread() checkNotInMainThread()
val user = account.userProfile()
val toBeRemoved = notes.filter { val toBeRemoved = notes.filter {
( (
@@ -1416,8 +1415,8 @@ object LocalCache {
it.value.event is ReportEvent || it.value.event is GenericRepostEvent it.value.event is ReportEvent || it.value.event is GenericRepostEvent
) && ) &&
it.value.liveSet?.isInUse() != true && // don't delete if observing. it.value.liveSet?.isInUse() != true && // don't delete if observing.
it.value.author != user && // don't delete if it is the logged in account it.value.author?.pubkeyHex !in accounts && // don't delete if it is the logged in account
it.value.event?.isTaggedUser(user.pubkeyHex) != true // don't delete if it's a notification to the logged in user it.value.event?.isTaggedUsers(accounts) != true // don't delete if it's a notification to the logged in user
}.values }.values
val childrenToBeRemoved = mutableListOf<Note>() val childrenToBeRemoved = mutableListOf<Note>()
@@ -1491,12 +1490,15 @@ object LocalCache {
} }
} }
fun pruneContactLists(userAccount: Account) { fun pruneContactLists(loggedIn: Set<HexKey>) {
checkNotInMainThread() checkNotInMainThread()
var removingContactList = 0 var removingContactList = 0
users.values.forEach { users.values.forEach {
if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) { if (it.pubkeyHex !in loggedIn &&
(it.liveSet == null || it.liveSet?.isInUse() == false) &&
it.latestContactList != null
) {
it.latestContactList = null it.latestContactList = null
removingContactList++ removingContactList++
} }