From 88898c38c3d5cbd252a3ecd7ed9cafe7ea36a439 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Thu, 3 Oct 2024 22:46:32 -0500
Subject: [PATCH] Don't put reply-reactions in reaction data model

That data model isn't well suited for allowing retractions to pull
things back out of it, so we'll rely on the aggregation approach for
these instead.
---
 .../conversations/entities/Reaction.java      | 15 ---------
 .../conversations/parser/MessageParser.java   | 32 +------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Reaction.java b/src/main/java/eu/siacs/conversations/entities/Reaction.java
index ff9d5a1a88aaa40f349d668381bdb1575fa767b1..a4db43d27bcb62cbbe2b665519b44904b5398415 100644
--- a/src/main/java/eu/siacs/conversations/entities/Reaction.java
+++ b/src/main/java/eu/siacs/conversations/entities/Reaction.java
@@ -91,21 +91,6 @@ public class Reaction {
         }
     }
 
-    public static Collection<Reaction> append(
-            final Collection<Reaction> existing,
-            final Collection<String> reactions,
-            final boolean received,
-            final Jid from,
-            final Jid trueJid,
-            final String occupantId) {
-        final ImmutableSet.Builder<Reaction> builder = new ImmutableSet.Builder<>();
-        builder.addAll(existing);
-        builder.addAll(
-                Collections2.transform(
-                        reactions, r -> new Reaction(r, null, received, from, trueJid, occupantId)));
-        return builder.build();
-    }
-
     public static Collection<Reaction> withOccupantId(
             final Collection<Reaction> existing,
             final Collection<String> reactions,
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 2be039fb11399a4af81bfdf05e3fe25255c5c12e..a13ac294361c8c3549c1743a98e93b86ee8bcd71 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -502,35 +502,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
         }
         LocalizedContent body = packet.getBody();
 
-        var appendReactions = false;
-        var reactions = packet.getExtension(Reactions.class);
-        final var reply = packet.findChild("reply", "urn:xmpp:reply:0");
-        if (reactions == null && reply != null && reply.getAttribute("id") != null && body != null) {
-            StringBuilder bodyB = new StringBuilder(body.content);
-
-            for (Element el : packet.getChildren()) {
-                if ("fallback".equals(el.getName()) && "urn:xmpp:fallback:0".equals(el.getNamespace()) && "urn:xmpp:reply:0".equals(el.getAttribute("for"))) {
-                    for (final var span : el.getChildren()) {
-                        if (!span.getName().equals("body") && !span.getNamespace().equals("urn:xmpp:fallback:0")) continue;
-                        if (span.getAttribute("start") == null || span.getAttribute("end") == null) {
-                            bodyB.setLength(0);
-                        } else {
-                            try {
-                                bodyB.delete(bodyB.offsetByCodePoints(0, parseInt(span.getAttribute("start"))), bodyB.offsetByCodePoints(0, parseInt(span.getAttribute("end"))));
-                            } catch (final IndexOutOfBoundsException e) { /* bad span */ }
-                        }
-                    }
-                }
-            }
-
-            final var emojiMaybe = bodyB.toString().replaceAll("\\s", "");
-            if (Emoticons.isEmoji(emojiMaybe)) {
-                appendReactions = true;
-                reactions = im.conversations.android.xmpp.model.reactions.Reactions.to(reply.getAttribute("id"));
-                reactions.addExtension(new im.conversations.android.xmpp.model.reactions.Reaction(emojiMaybe));
-            }
-        }
-
+        final var reactions = packet.getExtension(Reactions.class);
         final Element axolotlEncrypted = packet.findChildEnsureSingle(XmppAxolotlMessage.CONTAINERTAG, AxolotlService.PEP_PREFIX);
         int status;
         final Jid counterpart;
@@ -1328,7 +1300,6 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                     final boolean isReceived = !mucOptions.isSelf(counterpart);
                     if (occupantId != null && message != null) {
                         final var combinedReactions =
-                            appendReactions ? Reaction.append(message.getReactions(), reactions.getReactions(), isReceived, counterpart, null, occupantId) :
                                 Reaction.withOccupantId(
                                         message.getReactions(),
                                         reactions.getReactions(),
@@ -1355,7 +1326,6 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                     packet.fromAccount(account);
                     if (message != null) {
                         final var combinedReactions =
-                            appendReactions ? Reaction.append(message.getReactions(), reactions.getReactions(), isReceived, reactionFrom, null, null) :
                                 Reaction.withFrom(
                                         message.getReactions(),
                                         reactions.getReactions(),