From 6c701bb0f0124002fb8e57c6a1cec8cfec1394ab Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Mon, 16 Jan 2017 18:22:53 -0800
Subject: [PATCH] remove ignored avatars from PAL when they disconnect

---
 interface/resources/qml/hifi/Pal.qml                 |  4 ++++
 interface/src/avatar/AvatarManager.cpp               |  5 +++++
 libraries/networking/src/NodeList.cpp                | 12 ++++++++++++
 libraries/networking/src/NodeList.h                  |  2 ++
 .../script-engine/src/UsersScriptingInterface.h      |  6 ++++++
 scripts/system/pal.js                                |  8 +++++++-
 6 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 3438baa217..a57e76f864 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -502,6 +502,10 @@ Rectangle {
             ignored = {};
             gainSliderValueDB = {};
             break;
+        case 'avatarDisconnected':
+            var sessionID = message.params[0];
+            delete ignored[sessionID];
+            break;
         default:
             console.log('Unrecognized message:', JSON.stringify(message));
         }
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 1f5726acba..848218a27e 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -261,6 +261,11 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
     if (removalReason == KillAvatarReason::TheirAvatarEnteredYourBubble || removalReason == YourAvatarEnteredTheirBubble) {
         DependencyManager::get<NodeList>()->radiusIgnoreNodeBySessionID(avatar->getSessionUUID(), true);
     }
+    if (removalReason == KillAvatarReason::AvatarDisconnected) {
+        // remove from node sets, if present
+        DependencyManager::get<NodeList>()->maintainIgnoreMuteSets(avatar->getSessionUUID());
+        DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
+    }
     _avatarFades.push_back(removedAvatar);
 }
 
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 98a563c4e5..0ad31b70fe 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -847,6 +847,18 @@ void NodeList::ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled) {
     }
 }
 
+// removes this UUID from ignore and mute lists.  
+void NodeList::maintainIgnoreMuteSets(const QUuid& nodeID) {
+    // don't remove yourself, or nobody
+    if (!nodeID.isNull() && _sessionUUID != nodeID) {
+        QWriteLocker ignoredSetLocker{ &_ignoredSetLock };
+        QWriteLocker personalMutedSetLocker{ &_personalMutedSetLock };
+        _ignoredNodeIDs.unsafe_erase(nodeID);
+        _personalMutedNodeIDs.unsafe_erase(nodeID);
+        qCDebug(networking) << "removed" << nodeID.toString() << "from ignore/mute sets (if present)";
+    }
+}
+
 bool NodeList::isIgnoringNode(const QUuid& nodeID) const {
     QReadLocker ignoredSetLocker{ &_ignoredSetLock };
     return _ignoredNodeIDs.find(nodeID) != _ignoredNodeIDs.cend();
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 5c477303e2..4cbe3b1c3b 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -90,6 +90,8 @@ public:
     bool getRequestsDomainListData() { return _requestsDomainListData; }
     void setRequestsDomainListData(bool isRequesting);
 
+    void maintainIgnoreMuteSets(const QUuid& nodeID);
+
 public slots:
     void reset();
     void sendDomainServerCheckIn();
diff --git a/libraries/script-engine/src/UsersScriptingInterface.h b/libraries/script-engine/src/UsersScriptingInterface.h
index 0b6b7855b5..2dcff02c77 100644
--- a/libraries/script-engine/src/UsersScriptingInterface.h
+++ b/libraries/script-engine/src/UsersScriptingInterface.h
@@ -139,6 +139,12 @@ signals:
     */
     void usernameFromIDReply(const QString& nodeID, const QString& username, const QString& machineFingerprint);
 
+    /**jsdoc
+     * Notifies scripts that a user has disconnected from the domain
+     * @function Users.avatar.avatarDisconnected
+     */
+    void avatarDisconnected(const QUuid& nodeID);
+
 private:
     bool getRequestsDomainListData();
     void setRequestsDomainListData(bool requests);
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index 5c5b84e3e8..ad7d2bd7b5 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -580,7 +580,11 @@ function onClicked() {
     }
     pal.setVisible(!pal.visible);
 }
-
+function avatarDisconnected(nodeID) {
+    // remove from the pal list
+    print("got avatarDisconnected for " + nodeID);
+    pal.sendToQml({method: 'avatarDisconnected', params: [nodeID]});
+}
 //
 // Button state.
 //
@@ -593,6 +597,8 @@ button.clicked.connect(onClicked);
 pal.visibleChanged.connect(onVisibleChanged);
 pal.closed.connect(off);
 Users.usernameFromIDReply.connect(usernameFromIDReply);
+Users.avatarDisconnected.connect(avatarDisconnected);
+
 function clearLocalQMLDataAndClosePAL() {
     pal.sendToQml({ method: 'clearLocalQMLData' });
     if (pal.visible) {