Add from constructors from #18

MightyAlex200 · Oct 1, 2018 · a8ce506 · a8ce506
1 parent bdd01ba
commit a8ce506
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 16 deletions.
diff --git a/ui/src/PostSummary.elm b/ui/src/PostSummary.elm
@@ -1,4 +1,11 @@
-module PostSummary exposing (..)
+module PostSummary exposing
+    ( Model
+    , Msg
+    , fromHash
+    , fromPost
+    , update
+    , view
+    )
 
 import Html.Attributes as Attributes
 import Loadable exposing (Loadable)
@@ -27,20 +34,44 @@ type Msg
     | VoteViewMsg VoteView.Msg
     | NoOp
 
+uninitialized : VoteView.Model -> KarmaMap -> String -> Maybe (List Tag) -> Model
+uninitialized voteViewModel karmaMap hash inTermsOf =
+    Model
+        Loadable.Unloaded
+        voteViewModel
+        karmaMap
+        inTermsOf
+        hash
+
+fromPost : Post -> KarmaMap -> String -> Maybe (List Tag) -> ( Model, Cmd Msg )
+fromPost post karmaMap hash inTermsOf =
+    let
+        ( voteViewModel, voteViewCmd ) =
+            VoteView.fromHash karmaMap hash inTermsOf
+    in
+        uninitialized voteViewModel karmaMap hash inTermsOf
+            |> update (ReceivePost post)
+            |> Tuple.mapSecond (\cmd ->
+                    Cmd.batch
+                        [ cmd
+                        , Cmd.map VoteViewMsg voteViewCmd
+                        ]
+                )
+
 fromHash : KarmaMap -> String -> Maybe (List Tag) -> ( Model, Cmd Msg )
 fromHash karmaMap hash inTermsOf =
     let
         ( voteViewModel, voteViewCmd ) =
             VoteView.fromHash karmaMap hash inTermsOf
-        uninitialized =
-            Model
-                Loadable.Unloaded
-                voteViewModel
-                karmaMap
-                inTermsOf
-                hash
     in
-        update (RequestPost hash) uninitialized
+        uninitialized voteViewModel karmaMap hash inTermsOf
+            |> update (RequestPost hash)
+            |> Tuple.mapSecond (\cmd ->
+                    Cmd.batch
+                        [ cmd
+                        , Cmd.map VoteViewMsg voteViewCmd
+                        ]
+                )
 
 -- Update
 

diff --git a/ui/src/PostView.elm b/ui/src/PostView.elm
@@ -1,4 +1,12 @@
-module PostView exposing (..)
+module PostView exposing
+    ( Model
+    , Msg
+    , fromHash
+    , fromPost
+    , update
+    , documentTitle
+    , view
+    )
 
 import Tuple exposing (first, second)
 import Html.Attributes as Attributes
@@ -42,10 +50,8 @@ type Msg
     | ReceiveInTermsOf (List Tag)
     -- TODO: UpdateKarmaMap Msg
 
-fromHash : KarmaMap -> String -> Maybe (List Tag) -> ( Model, Cmd Msg )
-fromHash karmaMap hash inTermsOf =
-    let
-        uninitialized =
+uninitialized : KarmaMap -> String -> Maybe (List Tag) -> Model
+uninitialized karmaMap hash inTermsOf =
             Model
                 Loadable.Unloaded
                 (first (CommentsView.fromHash karmaMap hash inTermsOf))
@@ -55,8 +61,16 @@ fromHash karmaMap hash inTermsOf =
                 MarkdownCompose.init
                 False
                 inTermsOf
-    in
-        update (RequestPost hash) uninitialized
+
+fromHash : KarmaMap -> String -> Maybe (List Tag) -> ( Model, Cmd Msg )
+fromHash karmaMap hash inTermsOf =
+    uninitialized karmaMap hash inTermsOf
+        |> update (RequestPost hash)
+
+fromPost : Post -> KarmaMap -> String -> Maybe (List Tag) -> ( Model, Cmd Msg )
+fromPost post karmaMap hash inTermsOf =
+    uninitialized karmaMap hash inTermsOf
+        |> update (ReceivePost post)
 
 -- Update