From de9d6877e1393a069396869a556d6a7927a1ef54 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Fri, 11 Aug 2023 06:27:37 -0300
Subject: [PATCH] fix merge

---
 .../com/vitorpamplona/amethyst/model/Account.kt     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index 818d6773f..93377915a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -238,7 +238,7 @@ class Account(
                         broadcastPrivately(giftWraps)
                     }
 
-                    return
+                    return null
                 }
             }
 
@@ -252,21 +252,30 @@ class Account(
 
                 broadcastPrivately(giftWraps)
             }
+            return null
         } else {
             if (reaction.startsWith(":")) {
                 val emojiUrl = EmojiUrl.decode(reaction)
                 if (emojiUrl != null) {
                     note.event?.let {
+                        if (!signEvent) {
+                            return ReactionEvent.create(emojiUrl, it, keyPair.pubKey.toHexKey())
+                        }
+
                         val event = ReactionEvent.create(emojiUrl, it, keyPair.privKey!!)
                         Client.send(event)
                         LocalCache.consume(event)
                     }
 
-                    return
+                    return null
                 }
             }
 
             note.event?.let {
+                if (!signEvent) {
+                    return ReactionEvent.create(reaction, it, keyPair.pubKey.toHexKey())
+                }
+
                 val event = ReactionEvent.create(reaction, it, keyPair.privKey!!)
                 Client.send(event)
                 LocalCache.consume(event)