TakeV/dino
1
0
Fork 0
mirror of https://github.com/TakeV-Lambda/dino.git synced 2024-11-22 06:54:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix reading reactions in private groups w/o occupant ids

Browse source
This commit is contained in:
fiaxh 2023-01-31 10:42:37 +01:00
parent e3c833bce0
commit 1e23b7bbd2
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libdino/src/service/reactions.vala
View file

@ -136,12 +136,19 @@ public class Dino.Reactions : StreamInteractionModule, Object {
return ret; return ret;
} }
private ReactionsTime get_muc_user_reactions(Account account, int content_item_id, string? occupantid, Jid? real_jid) { private ReactionsTime get_muc_user_reactions(Account account, int content_item_id, string? occupant_id, Jid? real_jid) {
if (occupant_id == null && real_jid == null) critical("Need occupant id or real jid of a reaction");
QueryBuilder query = db.reaction.select() QueryBuilder query = db.reaction.select()
.with(db.reaction.account_id, "=", account.id) .with(db.reaction.account_id, "=", account.id)
.with(db.reaction.content_item_id, "=", content_item_id) .with(db.reaction.content_item_id, "=", content_item_id)
.join_with(db.occupantid, db.occupantid.id, db.reaction.occupant_id) .outer_join_with(db.occupantid, db.occupantid.id, db.reaction.occupant_id);
.with(db.occupantid.occupant_id, "=", occupantid);
if (occupant_id != null) {
query.with(db.occupantid.occupant_id, "=", occupant_id);
} else if (real_jid != null) {
query.with(db.reaction.jid_id, "=", db.get_jid_id(real_jid));
}
RowOption row = query.single().row(); RowOption row = query.single().row();
ReactionsTime ret = new ReactionsTime(); ReactionsTime ret = new ReactionsTime();
@ -191,7 +198,7 @@ public class Dino.Reactions : StreamInteractionModule, Object {
QueryBuilder select = db.reaction.select() QueryBuilder select = db.reaction.select()
.with(db.reaction.account_id, "=", account.id) .with(db.reaction.account_id, "=", account.id)
.with(db.reaction.content_item_id, "=", content_item.id) .with(db.reaction.content_item_id, "=", content_item.id)
.join_with(db.occupantid, db.occupantid.id, db.reaction.occupant_id) .outer_join_with(db.occupantid, db.occupantid.id, db.reaction.occupant_id)
.order_by(db.reaction.time, "DESC"); .order_by(db.reaction.time, "DESC");
string? own_occupant_id = stream_interactor.get_module(MucManager.IDENTITY).get_own_occupant_id(account, content_item.jid); string? own_occupant_id = stream_interactor.get_module(MucManager.IDENTITY).get_own_occupant_id(account, content_item.jid);