do not merge messages w/ reactions

Daniel Gultsch created 1 year ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java | 6 ++++++
1 file changed, 6 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -659,6 +659,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                         message.getEncryption() != Message.ENCRYPTION_PGP &&
                         message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED &&
                         this.getType() == message.getType() &&
+                        this.isReactionsEmpty() &&
+                        message.isReactionsEmpty() &&
                         isStatusMergeable(this.getStatus(), message.getStatus()) &&
                         isEncryptionMergeable(this.getEncryption(),message.getEncryption()) &&
                         this.getCounterpart() != null &&
@@ -737,6 +739,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         return this.reactions;
     }
 
+    public boolean isReactionsEmpty() {
+        return this.reactions.isEmpty();
+    }
+
     public Reaction.Aggregated getAggregatedReactions() {
         return Reaction.aggregated(this.reactions);
     }