Adds support for Harassment reports.

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Report.kt

@@ -63,6 +63,7 @@ fun RenderReport(
                     ReportType.MALWARE -> stringRes(R.string.malware)
                     ReportType.MOD -> stringRes(R.string.mod)
                     ReportType.OTHER -> stringRes(R.string.other)
+                    ReportType.HARASSMENT -> stringRes(R.string.harassment)
                     null -> stringRes(R.string.other)
                 }
             }.toSet()

amethyst/src/main/res/values/strings.xml

@@ -21,6 +21,7 @@
     <string name="impersonation">Impersonation</string>
     <string name="illegal_behavior">Illegal Behavior</string>
     <string name="other">Other</string>
+    <string name="harassment">Harassment</string>
     <string name="unknown">Unknown</string>
     <string name="relay_icon">Relay Icon</string>
     <string name="unknown_author">Unknown Author</string>

quartz/src/main/java/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt

@@ -52,14 +52,15 @@ class ReportEvent(
     private fun defaultReportType(): ReportType {
         defaultType?.let { return it }
 
-        // Works with old and new structures for report.
+        // search for any type in any tag.
-        var reportType = defaultReportTypes().firstOrNull()
+        val reportType =
-        if (reportType == null) {
+            defaultReportTypes().firstOrNull()
-            reportType = tags.mapNotNull { it.getOrNull(2) }.map { ReportType.parseOrNull(it, emptyArray()) }.firstOrNull()
+                ?: tags.firstNotNullOfOrNull {
-        }
+                    ReportedAuthorTag.parse(it)?.type
-        if (reportType == null) {
+                        ?: ReportedEventTag.parse(it)?.type
-            reportType = ReportType.SPAM
+                        ?: ReportedAddressTag.parse(it)?.type
-        }
+                } ?: ReportType.SPAM
+
         defaultType = reportType
         return reportType
     }

quartz/src/main/java/com/vitorpamplona/quartz/nip56Reports/ReportType.kt

@@ -33,6 +33,7 @@ enum class ReportType(
     PROFANITY("profanity"),
     MALWARE("malware"),
     MOD("mod"),
+    HARASSMENT("Harrassment"),
     OTHER("other"),
     ;
 
@@ -51,6 +52,7 @@ enum class ReportType(
                 MALWARE.code -> MALWARE
                 MOD.code -> MOD
                 "MOD" -> MOD
+                HARASSMENT.code -> HARASSMENT
                 OTHER.code -> OTHER
                 else -> {
                     Log.w("ReportedEventTag", "Report type not supported: $code ${tag.joinToString(", ")}")

quartz/src/main/java/com/vitorpamplona/quartz/nip56Reports/tags/DefaultReportTag.kt

@@ -27,6 +27,7 @@ import com.vitorpamplona.quartz.utils.arrayOfNotNull
 import com.vitorpamplona.quartz.utils.ensure
 
 @Immutable
+@Deprecated("Old version had [`report`, `<reason>`] tags")
 class DefaultReportTag {
     companion object {
         const val TAG_NAME = "report"