From 105f7e6012c2ac97f48d541ba01d2bfd580fbce3 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Thu, 12 Sep 2019 16:00:23 -0700 Subject: [PATCH] Add missing changes from previous commit --- src/Main.elm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Main.elm b/src/Main.elm index fd7df16..6ace704 100644 --- a/src/Main.elm +++ b/src/Main.elm @@ -114,7 +114,7 @@ requestScrollCmd = Task.attempt ViewportAfterMessage (Browser.Dom.getViewportOf newUsersCmd : Model -> List Username -> Cmd Msg newUsersCmd m us = m.token - |> Maybe.map (\t -> List.map (userData m.apiUrl t) us) + |> Maybe.map (\t -> List.map (getUserData m.apiUrl t) us) |> Maybe.withDefault [] |> Cmd.batch @@ -317,12 +317,12 @@ updateSyncResponse model r notify = notification sr = findFirstBy (\(s, e) -> e.originServerTs) (\(s, e) -> e.sender /= model.loginUsername) - <| joinedRoomNotificationEvents sr + <| getNotificationEvents sr notificationCmd sr = if notify then Maybe.withDefault Cmd.none <| Maybe.map (\(s, e) -> sendNotificationPort { name = getDisplayName model.userData e.sender - , text = notificationText e + , text = getText e , room = s }) <| notification sr else Cmd.none