anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into omemo-muc

Browse source
This commit is contained in:
Samuel Hand 2018-07-30 18:58:04 +01:00
parent e6069fa183 2e5977df96
commit 3edc72cf6b
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdino/src/service/presence_manager.vala
View file

@ -10,6 +10,7 @@ public class PresenceManager : StreamInteractionModule, Object {
public signal void show_received(Show show, Jid jid, Account account); public signal void show_received(Show show, Jid jid, Account account);
public signal void received_subscription_request(Jid jid, Account account); public signal void received_subscription_request(Jid jid, Account account);
public signal void received_subscription_approval(Jid jid, Account account);
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
private HashMap<Jid, HashMap<Jid, ArrayList<Show>>> shows = new HashMap<Jid, HashMap<Jid, ArrayList<Show>>>(Jid.hash_bare_func, Jid.equals_bare_func); private HashMap<Jid, HashMap<Jid, ArrayList<Show>>> shows = new HashMap<Jid, HashMap<Jid, ArrayList<Show>>>(Jid.hash_bare_func, Jid.equals_bare_func);
@ -94,6 +95,9 @@ public class PresenceManager : StreamInteractionModule, Object {
} }
received_subscription_request(jid, account); received_subscription_request(jid, account);
}); });
stream_interactor.module_manager.get_module(account, Presence.Module.IDENTITY).received_subscription_approval.connect((stream, jid) => {
received_subscription_approval(jid, account);
});
} }
private void on_received_available_show(Account account, Jid jid, string show) { private void on_received_available_show(Account account, Jid jid, string show) {

11
qlite/src/query_builder.vala
View file

@ -20,8 +20,9 @@ public class QueryBuilder : StatementBuilder {
// ORDER BY [...] // ORDER BY [...]
private OrderingTerm[]? order_by_terms = {}; private OrderingTerm[]? order_by_terms = {};
// LIMIT [...] // LIMIT [...] OFFSET [...]
private int limit_val; private int limit_val;
private int offset_val;
internal QueryBuilder(Database db) { internal QueryBuilder(Database db) {
base(db); base(db);
@ -103,6 +104,12 @@ public class QueryBuilder : StatementBuilder {
return this; return this;
} }
public QueryBuilder offset(int offset) {
if (this.limit_val == 0) error("limit required before offset");
this.offset_val = offset;
return this;
}
public QueryBuilder single() { public QueryBuilder single() {
this.single_result = true; this.single_result = true;
return limit(1); return limit(1);
@ -128,7 +135,7 @@ public class QueryBuilder : StatementBuilder {
} }
internal override Statement prepare() { internal override Statement prepare() {
Statement stmt = db.prepare(@"SELECT $column_selector $(table_name == null ? "" : @"FROM $((!) table_name)") WHERE $selection $(OrderingTerm.all_to_string(order_by_terms)) $(limit_val > 0 ? @" LIMIT $limit_val" : "")"); Statement stmt = db.prepare(@"SELECT $column_selector $(table_name == null ? "" : @"FROM $((!) table_name)") WHERE $selection $(OrderingTerm.all_to_string(order_by_terms)) $(limit_val > 0 ? @" LIMIT $limit_val OFFSET $offset_val" : "")");
for (int i = 0; i < selection_args.length; i++) { for (int i = 0; i < selection_args.length; i++) {
selection_args[i].bind(stmt, i+1); selection_args[i].bind(stmt, i+1);
} }

4
xmpp-vala/src/module/presence/module.vala
View file

@ -11,6 +11,7 @@ namespace Xmpp.Presence {
public signal void received_available_show(XmppStream stream, Jid jid, string show); public signal void received_available_show(XmppStream stream, Jid jid, string show);
public signal void received_unavailable(XmppStream stream, Presence.Stanza presence); public signal void received_unavailable(XmppStream stream, Presence.Stanza presence);
public signal void received_subscription_request(XmppStream stream, Jid jid); public signal void received_subscription_request(XmppStream stream, Jid jid);
public signal void received_subscription_approval(XmppStream stream, Jid jid);
public signal void received_unsubscription(XmppStream stream, Jid jid); public signal void received_unsubscription(XmppStream stream, Jid jid);
public bool available_resource = true; public bool available_resource = true;
@ -79,6 +80,9 @@ namespace Xmpp.Presence {
case Presence.Stanza.TYPE_SUBSCRIBE: case Presence.Stanza.TYPE_SUBSCRIBE:
received_subscription_request(stream, presence.from); received_subscription_request(stream, presence.from);
break; break;
case Presence.Stanza.TYPE_SUBSCRIBED:
received_subscription_approval(stream, presence.from);
break;
case Presence.Stanza.TYPE_UNSUBSCRIBE: case Presence.Stanza.TYPE_UNSUBSCRIBE:
stream.get_flag(Flag.IDENTITY).remove_presence(presence.from); stream.get_flag(Flag.IDENTITY).remove_presence(presence.from);
received_unsubscription(stream, presence.from); received_unsubscription(stream, presence.from);