From 4ae3042caba4fbe5f8f257f1e093481c950531b8 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Thu, 11 Sep 2014 12:42:06 +0400 Subject: [PATCH] Improved notification text for service messages User left the group, user returned to group Closes #448 --- app/js/services.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/js/services.js b/app/js/services.js index fea60bfe..28381f99 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -1915,8 +1915,12 @@ angular.module('myApp.services', []) case 'messageActionChatEditTitle': notificationMessage = 'changed group name'; break; case 'messageActionChatEditPhoto': notificationMessage = 'changed group photo'; break; case 'messageActionChatDeletePhoto': notificationMessage = 'removed group photo'; break; - case 'messageActionChatAddUser': notificationMessage = 'invited user'; break; - case 'messageActionChatDeleteUser': notificationMessage = 'kicked user'; break; + case 'messageActionChatAddUser': + notificationMessage = message.action.user_id == message.from_id ? 'returned to group' : 'invited user'; + break; + case 'messageActionChatDeleteUser': + notificationMessage = message.action.user_id == message.from_id ? 'left group' : 'kicked user'; + break; } }