From 16bf960e3c372a83834777ce32c22f5c42090789 Mon Sep 17 00:00:00 2001
From: michaelr <michaelr524@gmail.com>
Date: Mon, 11 Apr 2016 19:44:02 +0300
Subject: [PATCH] participant removed from chat

Former-commit-id: 2da99899ccadb85c3ce237fef3deb1dda2e54093
---
 images/trash.png                           | Bin 0 -> 1923 bytes
 src/syng_im/handlers.cljs                  |  15 +++++++++++++++
 src/syng_im/protocol/protocol_handler.cljs |   5 ++---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 images/trash.png

diff --git a/images/trash.png b/images/trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d83bb9685f406964f478a24185b9bf19043d3e6
GIT binary patch
literal 1923
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
JPDHLkV1lAHswe;e

literal 0
HcmV?d00001

diff --git a/src/syng_im/handlers.cljs b/src/syng_im/handlers.cljs
index a30f0bc35a..882653c19f 100644
--- a/src/syng_im/handlers.cljs
+++ b/src/syng_im/handlers.cljs
@@ -136,6 +136,14 @@
                            :content      (str (or inviter-name from) " invited " (or invitee-name identity))
                            :content-type text-content-type})))
 
+(defn participant-removed-from-group-msg [chat-id identity from msg-id]
+  (let [remover-name (:name (contacts/contact-by-identity from))
+        removed-name (:name (contacts/contact-by-identity identity))]
+    (save-message chat-id {:from         "system"
+                           :msg-id       msg-id
+                           :content      (str (or remover-name from) " removed " (or removed-name identity))
+                           :content-type text-content-type})))
+
 (defn removed-participant-msg [chat-id identity]
   (let [contact-name (:name (contacts/contact-by-identity identity))]
     (save-message chat-id {:from         "system"
@@ -149,6 +157,13 @@
     (joined-chat-msg group-id from ack-msg-id)
     (signal-chat-updated db group-id)))
 
+(register-handler :participant-removed-from-group
+  (fn [db [action from group-id identity msg-id]]
+    (log/debug action msg-id from group-id identity)
+    (chat-remove-participants group-id [identity])
+    (participant-removed-from-group-msg group-id identity from msg-id)
+    (signal-chat-updated db group-id)))
+
 (register-handler :participant-invited-to-group
   (fn [db [action from group-id identity msg-id]]
     (log/debug action msg-id from group-id identity)
diff --git a/src/syng_im/protocol/protocol_handler.cljs b/src/syng_im/protocol/protocol_handler.cljs
index 24f8a564af..2eacd6f4a7 100644
--- a/src/syng_im/protocol/protocol_handler.cljs
+++ b/src/syng_im/protocol/protocol_handler.cljs
@@ -34,9 +34,8 @@
                                                     (dispatch [:group-chat-invite-acked from group-id ack-msg-id]))
                          :group-new-participant (let [{:keys [group-id identity from msg-id]} event]
                                                   (dispatch [:participant-invited-to-group from group-id identity msg-id]))
-                         ;:group-removed-participant (let [{:keys [group-id identity from]} event]
-                         ;                             (add-to-chat "group-chat" ":" (str (shorten from) " removed " (shorten identity) " from group chat"))
-                         ;                             (remove-identity-from-group-list identity))
+                         :group-removed-participant (let [{:keys [group-id identity from msg-id]} event]
+                                                      (dispatch [:participant-removed-from-group from group-id identity msg-id]))
                          ;:removed-from-group (let [{:keys [group-id from]} event]
                          ;                      (add-to-chat "group-chat" ":" (str (shorten from) " removed you from group chat")))
                          ;:participant-left-group (let [{:keys [group-id from]} event]