highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-25 20:47:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modifies the Notification processor to use full accounts and their cached structrues again.

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-08 13:29:02 -04:00
parent 360f71c79a
commit 93a639fea5
1 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
View File

@@ -27,14 +27,16 @@ import androidx.core.content.ContextCompat
import com.vitorpamplona.amethyst.Amethyst import com.vitorpamplona.amethyst.Amethyst
import com.vitorpamplona.amethyst.LocalPreferences import com.vitorpamplona.amethyst.LocalPreferences
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.model.AccountSettings import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.LocalCache.chatroomList
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
import com.vitorpamplona.amethyst.ui.note.showAmount import com.vitorpamplona.amethyst.ui.note.showAmount
import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Event
import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
import com.vitorpamplona.quartz.nip01Core.tags.people.isTaggedUser import com.vitorpamplona.quartz.nip01Core.tags.people.isTaggedUser
import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUserIds import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUserIds
@@ -69,7 +71,8 @@ class EventNotificationConsumer(
LocalPreferences.loadAccountConfigFromEncryptedStorage(it.npub)?.let { acc -> LocalPreferences.loadAccountConfigFromEncryptedStorage(it.npub)?.let { acc ->
Log.d(TAG, "New Notification Testing if for ${it.npub}") Log.d(TAG, "New Notification Testing if for ${it.npub}")
try { try {
consumeIfMatchesAccount(event, acc) val account = Amethyst.instance.loadAccount(acc)
consumeIfMatchesAccount(event, account)
matchAccount = true matchAccount = true
} catch (e: Exception) { } catch (e: Exception) {
if (e is CancellationException) throw e if (e is CancellationException) throw e
@@ -82,33 +85,31 @@ class EventNotificationConsumer(
private suspend fun consumeIfMatchesAccount( private suspend fun consumeIfMatchesAccount(
pushWrappedEvent: GiftWrapEvent, pushWrappedEvent: GiftWrapEvent,
accountSettings: AccountSettings, account: Account,
) { ) {
val account = Amethyst.instance.loadAccount(accountSettings)
val notificationEvent = pushWrappedEvent.unwrapThrowing(account.signer) val notificationEvent = pushWrappedEvent.unwrapThrowing(account.signer)
consumeNotificationEvent(notificationEvent, account.signer, accountSettings) consumeNotificationEvent(notificationEvent, account)
} }
suspend fun consumeNotificationEvent( suspend fun consumeNotificationEvent(
notificationEvent: Event, notificationEvent: Event,
signer: NostrSigner, account: Account,
account: AccountSettings,
) { ) {
val consumed = LocalCache.hasConsumed(notificationEvent) val consumed = LocalCache.hasConsumed(notificationEvent)
Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${signer.pubKey} consumed= $consumed") Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${account.signer.pubKey} consumed= $consumed")
if (!consumed) { if (!consumed) {
Log.d(TAG, "New Notification was verified") Log.d(TAG, "New Notification was verified")
if (!notificationManager().areNotificationsEnabled()) return if (!notificationManager().areNotificationsEnabled()) return
Log.d(TAG, "Notifications are enabled") Log.d(TAG, "Notifications are enabled")
unwrapAndConsume(notificationEvent, signer)?.let { innerEvent -> unwrapAndConsume(notificationEvent, account.signer)?.let { innerEvent ->
Log.d(TAG, "Unwrapped consume ${innerEvent.javaClass.simpleName}") Log.d(TAG, "Unwrapped consume ${innerEvent.javaClass.simpleName}")
when (innerEvent) { when (innerEvent) {
is PrivateDmEvent -> notify(innerEvent, signer, account) is PrivateDmEvent -> notify(innerEvent, account)
is LnZapEvent -> notify(innerEvent, signer, account) is LnZapEvent -> notify(innerEvent, account)
is ChatMessageEvent -> notify(innerEvent, signer, account) is ChatMessageEvent -> notify(innerEvent, account)
is ChatMessageEncryptedFileHeaderEvent -> notify(innerEvent, signer, account) is ChatMessageEncryptedFileHeaderEvent -> notify(innerEvent, account)
} }
} }
} }
@@ -128,7 +129,7 @@ class EventNotificationConsumer(
Log.d(TAG, "New Notification Testing if for ${it.npub}") Log.d(TAG, "New Notification Testing if for ${it.npub}")
try { try {
val account = Amethyst.instance.loadAccount(accountSettings) val account = Amethyst.instance.loadAccount(accountSettings)
consumeNotificationEvent(event, account.signer, accountSettings) consumeNotificationEvent(event, account)
matchAccount = true matchAccount = true
} catch (e: Exception) { } catch (e: Exception) {
if (e is CancellationException) throw e if (e is CancellationException) throw e
@@ -184,22 +185,21 @@ class EventNotificationConsumer(
private fun notify( private fun notify(
event: ChatMessageEncryptedFileHeaderEvent, event: ChatMessageEncryptedFileHeaderEvent,
signer: NostrSigner, account: Account,
acc: AccountSettings,
) { ) {
Log.d(TAG, "New ChatMessage File to Notify") Log.d(TAG, "New ChatMessage File to Notify")
if ( if (
// old event being re-broadcasted // old event being re-broadcasted
event.createdAt > TimeUtils.fifteenMinutesAgo() && event.createdAt > TimeUtils.fifteenMinutesAgo() &&
// don't display if it comes from me. // don't display if it comes from me.
event.pubKey != signer.pubKey event.pubKey != account.signer.pubKey
) { // from the user ) { // from the user
Log.d(TAG, "Notifying") Log.d(TAG, "Notifying")
val chatroomList = LocalCache.getOrCreateChatroomList(signer.pubKey) val chatroomList = LocalCache.getOrCreateChatroomList(account.signer.pubKey)
val chatNote = LocalCache.getNoteIfExists(event.id) ?: return val chatNote = LocalCache.getNoteIfExists(event.id) ?: return
val chatRoom = event.chatroomKey(signer.pubKey) val chatRoom = event.chatroomKey(account.signer.pubKey)
val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return val followingKeySet = account.followingKeySet()
val isKnownRoom = val isKnownRoom =
( (
@@ -210,7 +210,11 @@ class EventNotificationConsumer(
val content = chatNote.event?.content ?: "" val content = chatNote.event?.content ?: ""
val user = chatNote.author?.toBestDisplayName() ?: "" val user = chatNote.author?.toBestDisplayName() ?: ""
val userPicture = chatNote.author?.profilePicture() val userPicture = chatNote.author?.profilePicture()
val noteUri = chatNote.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub() val noteUri =
chatNote.toNEvent() + "?account=" +
account.signer.pubKey
.hexToByteArray()
.toNpub()
// TODO: Show Image on notification // TODO: Show Image on notification
notificationManager() notificationManager()
@@ -229,22 +233,21 @@ class EventNotificationConsumer(
private fun notify( private fun notify(
event: ChatMessageEvent, event: ChatMessageEvent,
signer: NostrSigner, account: Account,
acc: AccountSettings,
) { ) {
Log.d(TAG, "New ChatMessage to Notify") Log.d(TAG, "New ChatMessage to Notify")
if ( if (
// old event being re-broadcasted // old event being re-broadcasted
event.createdAt > TimeUtils.fifteenMinutesAgo() && event.createdAt > TimeUtils.fifteenMinutesAgo() &&
// don't display if it comes from me. // don't display if it comes from me.
event.pubKey != signer.pubKey event.pubKey != account.signer.pubKey
) { // from the user ) { // from the user
Log.d(TAG, "Notifying") Log.d(TAG, "Notifying")
val chatroomList = LocalCache.getOrCreateChatroomList(signer.pubKey) val chatroomList = LocalCache.getOrCreateChatroomList(account.signer.pubKey)
val chatNote = LocalCache.getNoteIfExists(event.id) ?: return val chatNote = LocalCache.getNoteIfExists(event.id) ?: return
val chatRoom = event.chatroomKey(signer.pubKey) val chatRoom = event.chatroomKey(account.signer.pubKey)
val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return val followingKeySet = account.followingKeySet()
val isKnownRoom = chatroomList.rooms.get(chatRoom)?.senderIntersects(followingKeySet) == true || chatroomList.hasSentMessagesTo(chatRoom) val isKnownRoom = chatroomList.rooms.get(chatRoom)?.senderIntersects(followingKeySet) == true || chatroomList.hasSentMessagesTo(chatRoom)
@@ -252,7 +255,11 @@ class EventNotificationConsumer(
val content = chatNote.event?.content ?: "" val content = chatNote.event?.content ?: ""
val user = chatNote.author?.toBestDisplayName() ?: "" val user = chatNote.author?.toBestDisplayName() ?: ""
val userPicture = chatNote.author?.profilePicture() val userPicture = chatNote.author?.profilePicture()
val noteUri = chatNote.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub() val noteUri =
chatNote.toNEvent() + "?account=" +
account.signer.pubKey
.hexToByteArray()
.toNpub()
notificationManager() notificationManager()
.sendDMNotification( .sendDMNotification(
event.id, event.id,
@@ -269,29 +276,32 @@ class EventNotificationConsumer(
private suspend fun notify( private suspend fun notify(
event: PrivateDmEvent, event: PrivateDmEvent,
signer: NostrSigner, account: Account,
acc: AccountSettings,
) { ) {
Log.d(TAG, "New Nip-04 DM to Notify") Log.d(TAG, "New Nip-04 DM to Notify")
val note = LocalCache.getNoteIfExists(event.id) ?: return
val chatroomList = LocalCache.getOrCreateChatroomList(signer.pubKey)
// old event being re-broadcast // old event being re-broadcast
if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
if (signer.pubKey == event.verifiedRecipientPubKey()) { if (account.signer.pubKey == event.verifiedRecipientPubKey()) {
val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return val note = LocalCache.getNoteIfExists(event.id) ?: return
val chatroomList = LocalCache.getOrCreateChatroomList(account.signer.pubKey)
val chatRoom = event.chatroomKey(signer.pubKey) val followingKeySet = account.followingKeySet()
val chatRoom = event.chatroomKey(account.signer.pubKey)
val isKnownRoom = chatroomList.rooms.get(chatRoom)?.senderIntersects(followingKeySet) == true || chatroomList.hasSentMessagesTo(chatRoom) val isKnownRoom = chatroomList.rooms.get(chatRoom)?.senderIntersects(followingKeySet) == true || chatroomList.hasSentMessagesTo(chatRoom)
if (isKnownRoom) { if (isKnownRoom) {
note.author?.let { note.author?.let {
decryptContent(note, signer)?.let { content -> decryptContent(note, account.signer)?.let { content ->
val user = note.author?.toBestDisplayName() ?: "" val user = note.author?.toBestDisplayName() ?: ""
val userPicture = note.author?.profilePicture() val userPicture = note.author?.profilePicture()
val noteUri = note.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub() val noteUri =
note.toNEvent() + "?account=" +
account.signer.pubKey
.hexToByteArray()
.toNpub()
notificationManager() notificationManager()
.sendDMNotification(event.id, content, user, event.createdAt, userPicture, noteUri, applicationContext) .sendDMNotification(event.id, content, user, event.createdAt, userPicture, noteUri, applicationContext)
} }
@@ -332,8 +342,7 @@ class EventNotificationConsumer(
private suspend fun notify( private suspend fun notify(
event: LnZapEvent, event: LnZapEvent,
signer: NostrSigner, account: Account,
acc: AccountSettings,
) { ) {
Log.d(TAG, "New Zap to Notify") Log.d(TAG, "New Zap to Notify")
Log.d(TAG, "Notify Start ${event.toNostrUri()}") Log.d(TAG, "Notify Start ${event.toNostrUri()}")
@@ -355,20 +364,20 @@ class EventNotificationConsumer(
Log.d(TAG, "Notify Amount Bigger than 10") Log.d(TAG, "Notify Amount Bigger than 10")
if (event.isTaggedUser(signer.pubKey)) { if (event.isTaggedUser(account.signer.pubKey)) {
val amount = showAmount(event.amount) val amount = showAmount(event.amount)
Log.d(TAG, "Notify Amount $amount") Log.d(TAG, "Notify Amount $amount")
(noteZapRequest.event as? LnZapRequestEvent)?.let { event -> (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
decryptZapContentAuthor(event, signer)?.let { decryptedEvent -> decryptZapContentAuthor(event, account.signer)?.let { decryptedEvent ->
Log.d(TAG, "Notify Decrypted if Private Zap ${event.id}") Log.d(TAG, "Notify Decrypted if Private Zap ${event.id}")
val author = LocalCache.getOrCreateUser(decryptedEvent.pubKey) val author = LocalCache.getOrCreateUser(decryptedEvent.pubKey)
val senderInfo = Pair(author, decryptedEvent.content.ifBlank { null }) val senderInfo = Pair(author, decryptedEvent.content.ifBlank { null })
if (noteZapped.event?.content != null) { if (noteZapped.event?.content != null) {
decryptContent(noteZapped, signer)?.let { decrypted -> decryptContent(noteZapped, account.signer)?.let { decrypted ->
Log.d(TAG, "Notify Decrypted if Private Note") Log.d(TAG, "Notify Decrypted if Private Note")
val zappedContent = decrypted.split("\n")[0] val zappedContent = decrypted.split("\n")[0]
@@ -393,7 +402,11 @@ class EventNotificationConsumer(
) )
} }
val userPicture = senderInfo.first.profilePicture() val userPicture = senderInfo.first.profilePicture()
val noteUri = "notifications?account=" + acc.keyPair.pubKey.toNpub() val noteUri =
"notifications?account=" +
account.signer.pubKey
.hexToByteArray()
.toNpub()
Log.d(TAG, "Notify ${event.id} $content $title $noteUri") Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
@@ -424,7 +437,11 @@ class EventNotificationConsumer(
) )
val userPicture = senderInfo.first.profilePicture() val userPicture = senderInfo.first.profilePicture()
val noteUri = "notifications?account=" + acc.keyPair.pubKey.toNpub() val noteUri =
"notifications?account=" +
account.signer.pubKey
.hexToByteArray()
.toNpub()
Log.d(TAG, "Notify ${event.id} $title $noteUri") Log.d(TAG, "Notify ${event.id} $title $noteUri")