From a37b5ac823cc5daefac6ab33a16d6f44c747ba9c Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Tue, 11 Apr 2017 18:06:01 +0200
Subject: MUC improvements

---
 xmpp-vala/src/module/xep/0045_muc/flag.vala | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'xmpp-vala/src/module/xep/0045_muc/flag.vala')

diff --git a/xmpp-vala/src/module/xep/0045_muc/flag.vala b/xmpp-vala/src/module/xep/0045_muc/flag.vala
index f6340a5c..e5e0af6e 100644
--- a/xmpp-vala/src/module/xep/0045_muc/flag.vala
+++ b/xmpp-vala/src/module/xep/0045_muc/flag.vala
@@ -7,7 +7,6 @@ namespace Xmpp.Xep.Muc {
 public class Flag : XmppStreamFlag {
     public static FlagIdentity<Flag> IDENTITY = new FlagIdentity<Flag>(NS_URI, "muc");
 
-    private HashMap<string, ListenerHolder> enter_listeners = new HashMap<string, ListenerHolder>();
     private HashMap<string, string> enter_ids = new HashMap<string, string>();
     private HashMap<string, string> own_nicks = new HashMap<string, string>();
     private HashMap<string, string> subjects = new HashMap<string, string>();
@@ -32,8 +31,6 @@ public class Flag : XmppStreamFlag {
 
     public string? get_enter_id(string bare_jid) { return enter_ids[bare_jid]; }
 
-    public ListenerHolder? get_enter_listener(string bare_jid) { return enter_listeners[bare_jid]; }
-
     public bool is_muc(string jid) { return own_nicks[jid] != null; }
 
     public bool is_occupant(string jid) {
@@ -45,23 +42,33 @@ public class Flag : XmppStreamFlag {
 
     public string? get_muc_subject(string bare_jid) { return subjects[bare_jid]; }
 
-    public void set_muc_subject(string full_jid, string subject) {
+    public void set_muc_subject(string full_jid, string? subject) {
         string bare_jid = get_bare_jid(full_jid);
         subjects[bare_jid] = subject;
         subjects_by[bare_jid] = full_jid;
     }
 
-    public void start_muc_enter(string bare_jid, string presence_id, ListenerHolder listener) {
-        enter_listeners[bare_jid] = listener;
+    public void start_muc_enter(string bare_jid, string presence_id) {
         enter_ids[bare_jid] = presence_id;
     }
 
     public void finish_muc_enter(string bare_jid, string? nick = null) {
         if (nick != null) own_nicks[bare_jid] = nick;
-        enter_listeners.unset(bare_jid);
         enter_ids.unset(bare_jid);
     }
 
+    public void left_muc(XmppStream stream, string muc) {
+        own_nicks.unset(muc);
+        subjects.unset(muc);
+        subjects_by.unset(muc);
+        Gee.List<string>? occupants = stream.get_flag(Presence.Flag.IDENTITY).get_resources(muc);
+        if (occupants != null) {
+            foreach (string occupant in occupants) {
+                remove_occupant_info(occupant);
+            }
+        }
+    }
+
     public void remove_occupant_info(string full_jid) {
         occupant_real_jids.unset(full_jid);
         occupant_affiliation.unset(full_jid);
-- 
cgit v1.3