From b5ce6797ed9dace020c29ba8ed050750746fecc2 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Thu, 19 Sep 2024 14:12:40 -0700
Subject: [PATCH] Fix mutes again

---
 android/app/capacitor.build.gradle     |   2 +-
 android/capacitor.settings.gradle      |   3 +++
 package-lock.json                      | Bin 586980 -> 587355 bytes
 package.json                           |   3 ++-
 src/app/shared/Note.svelte             |  14 ++++++++------
 src/app/shared/NoteActions.svelte      |   4 ++--
 src/app/shared/NoteContentQuote.svelte |   6 +++---
 src/engine/state.ts                    |   3 +--
 src/main.js                            |  10 ++++++++++
 9 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
index fdb4970c..151fee42 100644
--- a/android/app/capacitor.build.gradle
+++ b/android/app/capacitor.build.gradle
@@ -9,7 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-
+    implementation project(':capacitor-app')
 
 }
 
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
index 9a5fa872..2085c863 100644
--- a/android/capacitor.settings.gradle
+++ b/android/capacitor.settings.gradle
@@ -1,3 +1,6 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+
+include ':capacitor-app'
+project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
diff --git a/package-lock.json b/package-lock.json
index 2ad02fa407a675656ae5315022ba4d07d30ce9b1..c00559152a339bb314ad4fb325072333b68cf2ef 100644
GIT binary patch
delta 454
zcmaFzQu+29<qfio%!vgB(;pTwiA|SwV&vH@$JoZiXxzM%dHYgk#$a2<g6V~<>=M)O
zb1<1rFNkF1<_0R)*VPA-x@OZ2eHhgu4YDJW{Bz8G0s?&9!jc^`GmT62%>#-JT*@MH
zip*0=JVGqZi!8ki(-K{B(o+I`0z=D6+zU)BO0vq_a!oAK3q3py68!^$yz)YvicGyC
z!cAO5BGYYcl_neNYE18oXB3?-JeyH{`hsvqf%d-+jNAV@Fs+(6U67H<c-kH&&gt?8
znFJ>{#wdrTgqE0jm^oz{CzogVlopt~oB0-}MOEgON0>P4ySkU<nnmbadY2{Uhqy;&
zR9aS<ndKDZCmQ;uCi%Ggha?8NRQeWM<P~`)XGi!JSf)B=>L(kTPEX8WQ=fkRAX7~H
z`^!u~%nZaVK+FonY}?;oX3t+Zz34ED(ew$W90HS@<ds7`Q+-U+Ed2dV^D1+S)2mV}
zOA1X2U5o+?Jq@yroCAH_i^5$Dik$rnTm!wL3Y@%6%e)*b3_P{nU9x@sBPs$T^!?M^
rJbX)iJS)snQXDJXBlNSiCkuYEn$8)_!aY5<j6;RdczaVBM^YUCA?BPF

delta 312
zcmccpM)}E0<qfio)9*Vl@^1EHtYVsOUC6}Se3g0oRc1za+vyDfjI8Y?PK?`2oS0Tk
zoWAKEhtc$aD@@YUzu)6f4oxu+D{+d5icHQ+^mfT{Dh)F*bImO&56JTfGWT<|^mlhL
zw}|v|Nepr;sq{9f%JRu6j`WWx4bQ6xwJ6NYb9KrwiZToeGtw_k@ee7?b}Yy+HPD`3
zc#_F$`hz`8mhEX*nShuXh*^M`6^Plkr(I>wUpV<mgwgZ^H5@F{xyw0treD!#2Rg>3
zC@>_*qrlYJFfGKbDmggOw<0UstSqI#yDUW8NI%yz#nr&vz1*lWJ2fN3#M0lON<Yja
z*tjanA~Q_iJ;TDu%gfs%+&|ScC@aygDBQFnP2YX;!ADlpPnL7&Ga63Mo68}-U7&))
GyAA+(xp3hC

diff --git a/package.json b/package.json
index dfa35bc0..1ded56a0 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
   "dependencies": {
     "@bugsnag/js": "^8.0.0",
     "@capacitor/android": "^6.1.2",
+    "@capacitor/app": "^6.0.1",
     "@capacitor/core": "^6.1.2",
     "@capacitor/ios": "^6.1.2",
     "@event-calendar/core": "^3.4.0",
@@ -59,7 +60,7 @@
     "@welshman/net": "^0.0.22",
     "@welshman/signer": "^0.0.5",
     "@welshman/store": "^0.0.7",
-    "@welshman/util": "^0.0.32",
+    "@welshman/util": "^0.0.33",
     "bowser": "^2.11.0",
     "classnames": "^2.5.1",
     "compressorjs": "^1.2.1",
diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index df396f6e..57944479 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -37,6 +37,7 @@
     loadEvent,
     ensureUnwrapped,
     isEventMuted,
+    userMutes,
     getSetting,
     sortEventsDesc,
   } from "src/engine"
@@ -50,7 +51,7 @@
   export let isLastReply = false
   export let showParent = true
   export let showLoading = false
-  export let showMuted = false
+  export let showHidden = false
   export let showGroup = false
   export let showMedia = getSetting("show_media")
   export let contextAddress = null
@@ -113,7 +114,8 @@
   $: root = tags.root()
   $: lnurl = getLnUrl(event.tags?.find(nthEq(0, "zap"))?.[1] || "")
   $: zapper = lnurl ? deriveZapper(lnurl) : deriveZapperForPubkey(event.pubkey)
-  $: muted = $isEventMuted(event, true)
+  $: muted = $userMutes.has(event.id)
+  $: hidden = $isEventMuted(event, true)
 
   // Find children in our context
   $: children = context.filter(e => isChildOf(e, event))
@@ -271,13 +273,13 @@
                   </small>
                 {/if}
               </div>
-              {#if muted && !showMuted}
+              {#if hidden && !showHidden}
                 <p class="border-l-2 border-solid border-neutral-600 pl-4 text-neutral-100">
                   You have hidden this note.
                   <Anchor
                     underline
                     on:click={() => {
-                      showMuted = true
+                      showHidden = true
                     }}>Show</Anchor>
                 </p>
               {:else}
@@ -292,7 +294,7 @@
                 {contextAddress}
                 {addToContext}
                 {replyCtrl}
-                {showMuted}
+                {showHidden}
                 {replies}
                 {likes}
                 {zaps}
@@ -370,7 +372,7 @@
                   <svelte:self
                     isLastReply={i === visibleReplies.length - 1}
                     showParent={false}
-                    showMuted
+                    showHidden
                     note={r}
                     depth={depth - 1}
                     {filters}
diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index d7d7b0fc..8ee84939 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -63,7 +63,7 @@
   export let note: TrustedEvent
   export let muted
   export let replyCtrl
-  export let showMuted
+  export let showHidden
   export let addToContext
   export let contextAddress
   export let removeFromContext
@@ -212,7 +212,7 @@
   let handlersShown = false
 
   $: disableActions =
-    !$signer || (muted && !showMuted) || (note.wrap && address && !$userIsGroupMember(address))
+    !$signer || (muted && !showHidden) || (note.wrap && address && !$userIsGroupMember(address))
   $: like = likes.find(e => e.pubkey === $sessionWithMeta?.pubkey)
   $: $likesCount = likes.length
   $: zap = zaps.find(e => e.request.pubkey === $sessionWithMeta?.pubkey)
diff --git a/src/app/shared/NoteContentQuote.svelte b/src/app/shared/NoteContentQuote.svelte
index 1e56a561..21962346 100644
--- a/src/app/shared/NoteContentQuote.svelte
+++ b/src/app/shared/NoteContentQuote.svelte
@@ -13,7 +13,7 @@
   export let value
   export let depth = 0
 
-  let showMuted = false
+  let showHidden = false
 
   const {id, identifier, kind, pubkey, relays: relayHints = []} = value
   const idOrAddress = id || new Address(kind, pubkey, identifier).toString()
@@ -43,7 +43,7 @@
   }
 
   const unmute = e => {
-    showMuted = true
+    showHidden = true
   }
 
   $: address = $quote ? getAddress($quote) : ""
@@ -54,7 +54,7 @@
 
 <div class="py-2" on:click|stopPropagation>
   <Card interactive stopPropagation class="my-2" on:click={openQuote}>
-    {#if muted && !showMuted}
+    {#if muted && !showHidden}
       <p class="mb-1 py-24 text-center text-neutral-600">
         You have hidden this note.
         <Anchor underline stopPropagation on:click={unmute}>Show</Anchor>
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 6cfb466e..9107a877 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -3,7 +3,6 @@ import crypto from "crypto"
 import {get, derived, writable} from "svelte/store"
 import {doPipe, batch, seconds, sleep} from "hurdak"
 import {
-  find,
   defaultTo,
   equals,
   assoc,
@@ -745,7 +744,7 @@ export const isEventMuted = withGetter(
         if (strict || $userFollows.has(e.pubkey)) return false
 
         const addresses = getAddressTagValues(e.tags || []).filter(isContextAddress)
-        const wotAdjustment = addresses.some($userIsGroupMember) ? 1 : 0
+        const wotAdjustment = addresses.some(a => $userIsGroupMember(a)) ? 1 : 0
         const wotScore = getWotScore($pubkey, e.pubkey)
 
         return wotScore < minWot - wotAdjustment
diff --git a/src/main.js b/src/main.js
index 1f1a74bc..dde670a6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,6 @@
 import "src/app.css"
 import Bugsnag from "@bugsnag/js"
+import {App as CapacitorApp} from "@capacitor/app"
 import App from "src/app/App.svelte"
 import {installPrompt} from "src/partials/state"
 
@@ -25,6 +26,15 @@ window.addEventListener("beforeinstallprompt", e => {
   installPrompt.set(e)
 })
 
+// Handle back button on android
+CapacitorApp.addListener("backButton", ({canGoBack}) => {
+  if (!canGoBack) {
+    CapacitorApp.exitApp()
+  } else {
+    window.history.back()
+  }
+})
+
 export default new App({
   target: document.getElementById("app"),
 })