aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2023-01-31 14:43:17 +0100
committerMarvin W <git@larma.de>2023-01-31 15:14:55 +0100
commit921f28c84bbda56ec93df7dcde7c828eaabb0b58 (patch)
tree78c9276d47d6d939e242e072032b9196b5a8c6c6 /libdino/src/service
parent9e11bef219880b5bdc5d299c31ec6249596a86ba (diff)
downloaddino-921f28c84bbda56ec93df7dcde7c828eaabb0b58.tar.gz
dino-921f28c84bbda56ec93df7dcde7c828eaabb0b58.zip
Fix reaction display in private MUCs
Diffstat (limited to 'libdino/src/service')
-rw-r--r--libdino/src/service/muc_manager.vala8
-rw-r--r--libdino/src/service/reactions.vala15
2 files changed, 19 insertions, 4 deletions
diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala
index 36a5599f..ff6ac941 100644
--- a/libdino/src/service/muc_manager.vala
+++ b/libdino/src/service/muc_manager.vala
@@ -323,6 +323,14 @@ public class MucManager : StreamInteractionModule, Object {
return null;
}
+ public Jid? get_occupant_jid(Account account, Jid room, Jid occupant_real_jid) {
+ Xep.Muc.Flag? flag = get_muc_flag(account);
+ if (flag != null) {
+ return flag.get_occupant_jid(occupant_real_jid, room);
+ }
+ return null;
+ }
+
public Xep.Muc.Role? get_role(Jid jid, Account account) {
Xep.Muc.Flag? flag = get_muc_flag(account);
if (flag != null) {
diff --git a/libdino/src/service/reactions.vala b/libdino/src/service/reactions.vala
index 6e8b166c..7cd7c146 100644
--- a/libdino/src/service/reactions.vala
+++ b/libdino/src/service/reactions.vala
@@ -199,6 +199,7 @@ public class Dino.Reactions : StreamInteractionModule, Object {
.with(db.reaction.account_id, "=", account.id)
.with(db.reaction.content_item_id, "=", content_item.id)
.outer_join_with(db.occupantid, db.occupantid.id, db.reaction.occupant_id)
+ .outer_join_with(db.jid, db.jid.id, db.reaction.jid_id)
.order_by(db.reaction.time, "DESC");
string? own_occupant_id = stream_interactor.get_module(MucManager.IDENTITY).get_own_occupant_id(account, content_item.jid);
@@ -209,11 +210,17 @@ public class Dino.Reactions : StreamInteractionModule, Object {
string emoji_str = row[db.reaction.emojis];
Jid jid = null;
- if (row[db.occupantid.occupant_id] == own_occupant_id) {
- jid = account.bare_jid;
+ if (!db.jid.bare_jid.is_null(row)) {
+ jid = new Jid(row[db.jid.bare_jid]);
+ } else if (!db.occupantid.occupant_id.is_null(row)) {
+ if (row[db.occupantid.occupant_id] == own_occupant_id) {
+ jid = account.bare_jid;
+ } else {
+ string nick = row[db.occupantid.last_nick];
+ jid = content_item.jid.with_resource(nick);
+ }
} else {
- string nick = row[db.occupantid.last_nick];
- jid = content_item.jid.with_resource(nick);
+ warning("Reaction with neither JID nor occupant id");
}
foreach (string emoji in emoji_str.split(",")) {