emit a signal when allowed MUC actions change

2 files changed, 38 insertions, 17 deletions

diff --git a/src/QXmppMucManager.cpp b/src/QXmppMucManager.cpp
index 60cf6ebd..f2a8933b 100644
--- a/src/QXmppMucManager.cpp
+++ b/src/QXmppMucManager.cpp
@@ -511,6 +511,12 @@ void QXmppMucRoom::_q_disconnected()
     foreach (const QString &jid, removed)
         emit participantRemoved(jid);
 
+    // update available actions
+    if (d->allowedActions != NoAction) {
+        d->allowedActions = NoAction;
+        emit allowedActionsChanged(d->allowedActions);
+    }
+
     // emit "left" signal if we had joined the room
     if (wasJoined)
         emit left();
@@ -548,28 +554,33 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
     if (presence.type() == QXmppPresence::Available) {
         const bool added = !d->participants.contains(jid);
         d->participants.insert(jid, presence);
-        if (added) {
-            emit participantAdded(jid);
-            if (jid == d->ownJid()) {
 
-                // check whether we own the room
-                QXmppMucItem mucItem = presence.mucItem();
-                if (mucItem.jid() == d->client->configuration().jid()) {
-                    d->allowedActions = NoAction;
+        // refresh allowed actions
+        if (jid == d->ownJid()) {
 
-                    // role
-                    if (mucItem.role() == QXmppMucItem::ModeratorRole)
-                        d->allowedActions |= (KickAction | SubjectAction);
+            QXmppMucItem mucItem = presence.mucItem();
+            Actions newActions = NoAction;
 
-                    // affiliation
-                    if (mucItem.affiliation() == QXmppMucItem::OwnerAffiliation)
-                        d->allowedActions |= (ConfigurationAction | PermissionsAction | SubjectAction);
-                    else if (mucItem.affiliation() == QXmppMucItem::AdminAffiliation)
-                        d->allowedActions |= (PermissionsAction | SubjectAction);
-                }
+            // role
+            if (mucItem.role() == QXmppMucItem::ModeratorRole)
+                newActions |= (KickAction | SubjectAction);
 
-                emit joined();
+            // affiliation
+            if (mucItem.affiliation() == QXmppMucItem::OwnerAffiliation)
+                newActions |= (ConfigurationAction | PermissionsAction | SubjectAction);
+            else if (mucItem.affiliation() == QXmppMucItem::AdminAffiliation)
+                newActions |= (PermissionsAction | SubjectAction);
+
+            if (newActions != d->allowedActions) {
+                d->allowedActions = newActions;
+                emit allowedActionsChanged(d->allowedActions);
             }
+        }
+
+        if (added) {
+            emit participantAdded(jid);
+            if (jid == d->ownJid())
+                emit joined();
         } else {
             emit participantChanged(jid);
         }
@@ -594,6 +605,12 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
                 foreach (const QString &jid, removed)
                     emit participantRemoved(jid);
 
+                // update available actions
+                if (d->allowedActions != NoAction) {
+                    d->allowedActions = NoAction;
+                    emit allowedActionsChanged(d->allowedActions);
+                }
+
                 // notify user we left the room
                 emit left();
             }
diff --git a/src/QXmppMucManager.h b/src/QXmppMucManager.h
index 889364ca..cbf9e5ce 100644
--- a/src/QXmppMucManager.h
+++ b/src/QXmppMucManager.h
@@ -95,6 +95,7 @@ private:
 class QXmppMucRoom : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QXmppMucRoom::Actions allowedActions READ allowedActions NOTIFY allowedActionsChanged)
     Q_PROPERTY(QString jid READ jid)
     Q_PROPERTY(QString nickName READ nickName WRITE setNickName)
     Q_PROPERTY(QStringList participants READ participants)
@@ -132,6 +133,9 @@ public:
     void setSubject(const QString &subject);
 
 signals:
+    /// This signal is emitted when the allowed actions change.
+    void allowedActionsChanged(QXmppMucRoom::Actions actions) const;
+
     /// This signal is emitted when the configuration form for the room is received.
     void configurationReceived(const QXmppDataForm &configuration);