Don't set empty reactions for deleted messages

It can never be anything other than `{}` because we don't actually fetch
them from the database, but also isn't useful at all.

Author: jagerman

sogs/model/room.py

@@ -713,13 +713,14 @@ def get_messages_for(
             reacts = self.get_reactions(
                 # Fetch reactions for messages, but skip deleted messages (that have data set to an
                 # explicit None) since we already know they don't have reactions.
-                [x['id'] for x in msgs if not ('data' in x and x['data'] is None)],
+                [x['id'] for x in msgs if 'data' not in x or x['data'] is not None],
                 user,
                 reactor_limit=reactor_limit,
                 session_ids=True,
             )
             for msg in msgs:
-                msg['reactions'] = reacts.get(msg['id'], {})
+                if 'data' not in msg or msg['data'] is not None:
+                    msg['reactions'] = reacts.get(msg['id'], {})
 
         return msgs
 

tests/test_reactions.py

@@ -259,7 +259,6 @@ def test_reactions(client, room, room2, user, user2, mod, admin, global_mod, glo
         'deleted': True,
         'seqno': seqno,
         'session_id': user.session_id,
-        'reactions': {},
     }