Browse Source

Merge pull request #1924 from jitsi/status-message-clear

Skips showing empty statuses. Updates poltergeist to report connected.
master
virtuacoplenny 8 years ago
parent
commit
1ca485f1a8
2 changed files with 7 additions and 0 deletions
  1. 4
    0
      modules/UI/UI.js
  2. 3
    0
      resources/prosody-plugins/mod_muc_poltergeist.lua

+ 4
- 0
modules/UI/UI.js View File

536
  * @param {string} status - The new status.
536
  * @param {string} status - The new status.
537
  */
537
  */
538
 UI.updateUserStatus = (user, status) => {
538
 UI.updateUserStatus = (user, status) => {
539
+    if (!status) {
540
+        return;
541
+    }
542
+
539
     let displayName = user.getDisplayName();
543
     let displayName = user.getDisplayName();
540
     messageHandler.participantNotification(
544
     messageHandler.participantNotification(
541
         displayName, '', 'connected', "dialOut.statusMessage",
545
         displayName, '', 'connected', "dialOut.statusMessage",

+ 3
- 0
resources/prosody-plugins/mod_muc_poltergeist.lua View File

181
         -- we will mark it with ignore tag
181
         -- we will mark it with ignore tag
182
         local nick = string.sub(username, 0, 8);
182
         local nick = string.sub(username, 0, 8);
183
         if (have_poltergeist_occupant(room, nick)) then
183
         if (have_poltergeist_occupant(room, nick)) then
184
+            -- notify that user connected using the poltergeist
185
+            update_poltergeist_occupant_status(
186
+                room, nick, "connected");
184
             remove_poltergeist_occupant(room, nick, true);
187
             remove_poltergeist_occupant(room, nick, true);
185
         end
188
         end
186
 
189
 

Loading…
Cancel
Save