Moves reports to common

Adds support for additional information

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -33,6 +33,7 @@ import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatChann
 import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatListDecryptionCache
 import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatListState
 import com.vitorpamplona.amethyst.commons.model.nip38UserStatuses.UserStatusAction
+import com.vitorpamplona.amethyst.commons.model.nip56Reports.ReportAction
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.logTime
 import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListDecryptionCache
@@ -77,7 +78,6 @@ import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListD
 import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListState
 import com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays.TrustedRelayListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays.TrustedRelayListState
-import com.vitorpamplona.amethyst.model.nip56Reports.ReportAction
 import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
 import com.vitorpamplona.amethyst.model.nip72Communities.CommunityListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip72Communities.CommunityListState
@@ -571,7 +571,8 @@ class Account(
     suspend fun report(
         user: User,
         type: ReportType,
-    ) = sendMyPublicAndPrivateOutbox(ReportAction.report(user, type, userProfile(), signer))
+        content: String = "",
+    ) = sendMyPublicAndPrivateOutbox(ReportAction.report(user, type, content, userProfile(), signer))
 
     suspend fun delete(note: Note) = delete(listOf(note))
 

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip56Reports/ReportAction.kt

@@ -1,64 +0,0 @@
-/**
- * Copyright (c) 2025 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst.model.nip56Reports
-
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
-import com.vitorpamplona.quartz.nip56Reports.ReportEvent
-import com.vitorpamplona.quartz.nip56Reports.ReportType
-
-class ReportAction {
-    companion object {
-        suspend fun report(
-            user: User,
-            type: ReportType,
-            by: User,
-            signer: NostrSigner,
-        ): ReportEvent? {
-            if (user.reports().hasReport(by, type)) {
-                // has already reported this note
-                return null
-            }
-
-            val template = ReportEvent.build(user.pubkeyHex, type)
-
-            return signer.sign(template)
-        }
-
-        suspend fun report(
-            note: Note,
-            type: ReportType,
-            content: String = "",
-            by: User,
-            signer: NostrSigner,
-        ): ReportEvent? {
-            if (note.hasReport(by, type)) {
-                // has already reported this note
-                return null
-            }
-
-            return note.event?.let {
-                signer.sign(ReportEvent.build(it, type))
-            }
-        }
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt

@@ -701,9 +701,10 @@ class AccountViewModel(
     fun report(
         user: User,
         type: ReportType,
+        content: String = "",
     ) {
         launchSigner {
-            account.report(user, type)
+            account.report(user, type, content)
             account.hideUser(user.pubkeyHex)
         }
     }