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

Small fixes to MucManager

Browse source
This commit is contained in:
Marvin W 2018-01-16 16:16:43 +01:00 committed by fiaxh
parent bbfac91155
commit 03a349bfaf
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libdino/src/service/muc_manager.vala
View file

@ -105,7 +105,10 @@ public class MucManager : StreamInteractionModule, Object {
Gee.List<Jid>? occupants = get_occupants(jid, account); Gee.List<Jid>? occupants = get_occupants(jid, account);
Jid? own_jid = get_own_jid(jid, account); Jid? own_jid = get_own_jid(jid, account);
if (occupants != null && own_jid != null) { if (occupants != null && own_jid != null) {
occupants.remove(own_jid); Gee.List<Jid> occupants_ = new ArrayList<Jid>(Jid.equals_func);
occupants_.add_all(occupants);
occupants_.remove(own_jid);
return occupants_;
} }
return occupants; return occupants;
} }
@ -309,7 +312,8 @@ public class MucManager : StreamInteractionModule, Object {
foreach (Xep.Bookmarks.Conference conference in conferences) { foreach (Xep.Bookmarks.Conference conference in conferences) {
if (conference.jid.equals_bare(jid) && conference.nick == nick && conference.password == password) { if (conference.jid.equals_bare(jid) && conference.nick == nick && conference.password == password) {
if (!conference.autojoin) { if (!conference.autojoin) {
stream.get_module(Xep.Bookmarks.Module.IDENTITY).replace_conference(stream, conference, changed); conference.autojoin = true;
stream.get_module(Xep.Bookmarks.Module.IDENTITY).set_conferences(stream, conferences);
} }
return; return;
} }
@ -324,8 +328,9 @@ public class MucManager : StreamInteractionModule, Object {
foreach (Xep.Bookmarks.Conference conference in conferences) { foreach (Xep.Bookmarks.Conference conference in conferences) {
if (conference.jid.equals_bare(jid)) { if (conference.jid.equals_bare(jid)) {
if (conference.autojoin) { if (conference.autojoin) {
Xep.Bookmarks.Conference change = new Xep.Bookmarks.Conference(conference.jid) { nick=conference.nick, password=conference.password, autojoin=false }; conference.autojoin = false;
stream.get_module(Xep.Bookmarks.Module.IDENTITY).replace_conference(stream, conference, change); stream.get_module(Xep.Bookmarks.Module.IDENTITY).set_conferences(stream, conferences);
return;
} }
} }
} }

2
xmpp-vala/src/module/xep/0048_bookmarks/conference.vala
View file

@ -14,7 +14,7 @@ public class Conference : Object {
public bool autojoin { public bool autojoin {
get { get {
string? attr = stanza_node.get_attribute(ATTRIBUTE_AUTOJOIN); string? attr = stanza_node.get_attribute(ATTRIBUTE_AUTOJOIN);
return attr == "true" || attr == "1"; // "1" isn't standard, but it's used return attr == "true" || attr == "1";
} }
set { stanza_node.set_attribute(ATTRIBUTE_AUTOJOIN, value.to_string()); } set { stanza_node.set_attribute(ATTRIBUTE_AUTOJOIN, value.to_string()); }
} }