From ee6df7e98cc6701c6ca16dbd91cacba84a3a315f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 28 Jul 2017 15:32:40 -0300
Subject: [PATCH] Code improvements

---
 .../server/lib/sendNotificationsOnMessage.js          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index 9986a642221..7f4479d86c7 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -197,22 +197,17 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room, userId) {
 		}
 	});
 
-	let push_message;
+	let push_message = ' ';
 	//Set variables depending on Push Notification settings
 	if (RocketChat.settings.get('Push_show_message')) {
 		push_message = parseMessageText(message, userId);
-	} else {
-		push_message = ' ';
 	}
 
-	let push_username;
-	let push_room;
+	let push_username = '';
+	let push_room = '';
 	if (RocketChat.settings.get('Push_show_username_room')) {
 		push_username = user.username;
 		push_room = `#${ room.name }`;
-	} else {
-		push_username = '';
-		push_room = '';
 	}
 
 	if (room.t == null || room.t === 'd') {