From 55f40d5a5141120343dbc0b786648897f44261e8 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Fri, 14 Dec 2018 00:04:41 -0800
Subject: [PATCH] Cleanup command code.

---
 src/Main.elm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Main.elm b/src/Main.elm
index f089df7..22fb8b2 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -119,7 +119,7 @@ updateSyncResponse model r notify =
             <| Result.map .nextBatch r
         syncCmd = sync nextBatch model.apiUrl token
         newUsers sr = List.filter (\s -> not <| Dict.member s model.userData) <| roomsUsers sr
-        newUserCommands sr = Cmd.batch
+        newUserCmd sr = Cmd.batch
             <| List.map (userData model.apiUrl
             <| Maybe.withDefault "" model.token)
             <| newUsers sr
@@ -127,13 +127,14 @@ updateSyncResponse model r notify =
             (\(s, e) -> e.originServerTs)
             (\(s, e) -> e.sender /= model.loginUsername)
             <| notificationEvents sr
-        notificationCommand sr = Maybe.withDefault Cmd.none
-            <| Maybe.map (\(s, e) -> sendNotificationPort
-                { name = displayName model e.sender
-                , text = notificationText e
-                , room = s
-                })
-            <| notification sr
+        notificationCmd sr = if notify
+            then Maybe.withDefault Cmd.none
+                    <| Maybe.map (\(s, e) -> sendNotificationPort
+                    { name = displayName model e.sender
+                    , text = notificationText e
+                    , room = s
+                    }) <| notification sr
+            else Cmd.none
         roomMessages sr = case currentRoomId model of
             Just rid -> List.filter (((==) "m.room.message") << .type_)
                 <| Maybe.withDefault []
@@ -143,14 +144,17 @@ updateSyncResponse model r notify =
                 <| Maybe.andThen .join
                 <| sr.rooms
             Nothing -> []
-        setScrollCommand sr = if List.isEmpty <| roomMessages sr then Cmd.none else Task.attempt ViewportAfterMessage (Browser.Dom.getViewportOf "events-wrapper")
+        setScrollCmd sr = if List.isEmpty 
+            <| roomMessages sr
+                then Cmd.none
+                else Task.attempt ViewportAfterMessage (Browser.Dom.getViewportOf "events-wrapper")
     in
         case r of
             Ok sr -> ({ model | sync = mergeSyncResponse model.sync sr }, Cmd.batch
                 [ syncCmd
-                , newUserCommands sr
-                , if notify then notificationCommand sr else Cmd.none
-                , setScrollCommand sr
+                , newUserCmd sr
+                , notificationCmd sr
+                , setScrollCmd sr
                 ])
             _ -> (model, syncCmd)