Fix #121: Refactor Mastodon.Http (#122)

* Drop use of Server args in ApiUrl.
* Generalize use of fetch to other Http functions.
* Leverage HttpBuilder.withQueryParams where applicable.
* Distinguish between request and authRequest.

src/Mastodon/ApiUrl.elm

@@ -26,13 +26,14 @@ module Mastodon.ApiUrl
         )
 
 
-type alias Server =
-    String
+apiPrefix : String
+apiPrefix =
+    "/api/v1/"
 
 
 apps : String
 apps =
-    "/api/v1/apps"
+    apiPrefix ++ "/apps"
 
 
 oauthAuthorize : String
@@ -47,7 +48,7 @@ oauthToken =
 
 accounts : String
 accounts =
-    "/api/v1/accounts/"
+    apiPrefix ++ "/accounts/"
 
 
 account : Int -> String
@@ -92,12 +93,12 @@ following id =
 
 homeTimeline : String
 homeTimeline =
-    "/api/v1/timelines/home"
+    apiPrefix ++ "/timelines/home"
 
 
 publicTimeline : String
 publicTimeline =
-    "/api/v1/timelines/public"
+    apiPrefix ++ "/timelines/public"
 
 
 accountTimeline : Int -> String
@@ -107,12 +108,12 @@ accountTimeline id =
 
 notifications : String
 notifications =
-    "/api/v1/notifications"
+    apiPrefix ++ "/notifications"
 
 
 statuses : String
 statuses =
-    "/api/v1/statuses"
+    apiPrefix ++ "/statuses"
 
 
 context : Int -> String
@@ -147,4 +148,4 @@ unfavourite id =
 
 streaming : String
 streaming =
-    "/api/v1/streaming/"
+    apiPrefix ++ "/streaming/"

src/Mastodon/Http.elm

@@ -36,6 +36,12 @@ import Mastodon.Encoder exposing (..)
 import Mastodon.Model exposing (..)
 
 
+type Method
+    = GET
+    | POST
+    | DELETE
+
+
 type alias Request a =
     Build.RequestBuilder a
 
@@ -74,16 +80,10 @@ toResponse result =
     Result.mapError extractError result
 
 
-type Method
-    = GET
-    | POST
-    | DELETE
-
-
-fetch : Client -> Method -> String -> Decode.Decoder a -> Request a
-fetch client method endpoint decoder =
+request : String -> Method -> String -> Decode.Decoder a -> Request a
+request server method endpoint decoder =
     let
-        request =
+        httpMethod =
             case method of
                 GET ->
                     Build.get
@@ -94,22 +94,25 @@ fetch client method endpoint decoder =
                 DELETE ->
                     Build.delete
     in
-        request (client.server ++ endpoint)
-            |> Build.withHeader "Authorization" ("Bearer " ++ client.token)
+        httpMethod (server ++ endpoint)
             |> Build.withExpect (Http.expectJson decoder)
 
 
+authRequest : Client -> Method -> String -> Decode.Decoder a -> Request a
+authRequest client method endpoint decoder =
+    request client.server method endpoint decoder
+        |> Build.withHeader "Authorization" ("Bearer " ++ client.token)
+
+
 register : String -> String -> String -> String -> String -> Request AppRegistration
 register server clientName redirectUri scope website =
-    Build.post (server ++ ApiUrl.apps)
-        |> Build.withExpect (Http.expectJson (appRegistrationDecoder server scope))
+    request server POST ApiUrl.apps (appRegistrationDecoder server scope)
         |> Build.withJsonBody (appRegistrationEncoder clientName redirectUri scope website)
 
 
 getAccessToken : AppRegistration -> String -> Request AccessTokenResult
 getAccessToken registration authCode =
-    Build.post (registration.server ++ ApiUrl.oauthToken)
-        |> Build.withExpect (Http.expectJson (accessTokenDecoder registration))
+    request registration.server POST ApiUrl.oauthToken (accessTokenDecoder registration)
         |> Build.withJsonBody (authorizationCodeEncoder registration authCode)
 
 
@@ -130,54 +133,54 @@ send tagger builder =
 
 fetchAccount : Client -> Int -> Request Account
 fetchAccount client accountId =
-    fetch client GET (ApiUrl.account accountId) accountDecoder
+    authRequest client GET (ApiUrl.account accountId) accountDecoder
 
 
 fetchUserTimeline : Client -> Request (List Status)
 fetchUserTimeline client =
-    fetch client GET ApiUrl.homeTimeline <| Decode.list statusDecoder
+    authRequest client GET ApiUrl.homeTimeline <| Decode.list statusDecoder
 
 
 fetchRelationships : Client -> List Int -> Request (List Relationship)
 fetchRelationships client ids =
-    fetch client GET ApiUrl.relationships (Decode.list relationshipDecoder)
+    authRequest client GET ApiUrl.relationships (Decode.list relationshipDecoder)
         |> Build.withQueryParams (List.map (\id -> ( "id[]", toString id )) ids)
 
 
 fetchLocalTimeline : Client -> Request (List Status)
 fetchLocalTimeline client =
-    fetch client GET ApiUrl.publicTimeline (Decode.list statusDecoder)
+    authRequest client GET ApiUrl.publicTimeline (Decode.list statusDecoder)
         |> Build.withQueryParams [ ( "local", "true" ) ]
 
 
 fetchGlobalTimeline : Client -> Request (List Status)
 fetchGlobalTimeline client =
-    fetch client GET ApiUrl.publicTimeline <| Decode.list statusDecoder
+    authRequest client GET ApiUrl.publicTimeline <| Decode.list statusDecoder
 
 
 fetchAccountTimeline : Client -> Int -> Request (List Status)
 fetchAccountTimeline client id =
-    fetch client GET (ApiUrl.accountTimeline id) <| Decode.list statusDecoder
+    authRequest client GET (ApiUrl.accountTimeline id) <| Decode.list statusDecoder
 
 
 fetchNotifications : Client -> Request (List Notification)
 fetchNotifications client =
-    fetch client GET (ApiUrl.notifications) <| Decode.list notificationDecoder
+    authRequest client GET (ApiUrl.notifications) <| Decode.list notificationDecoder
 
 
 fetchAccountFollowers : Client -> Int -> Request (List Account)
 fetchAccountFollowers client accountId =
-    fetch client GET (ApiUrl.followers accountId) <| Decode.list accountDecoder
+    authRequest client GET (ApiUrl.followers accountId) <| Decode.list accountDecoder
 
 
 fetchAccountFollowing : Client -> Int -> Request (List Account)
 fetchAccountFollowing client accountId =
-    fetch client GET (ApiUrl.following accountId) <| Decode.list accountDecoder
+    authRequest client GET (ApiUrl.following accountId) <| Decode.list accountDecoder
 
 
 searchAccounts : Client -> String -> Int -> Bool -> Request (List Account)
 searchAccounts client query limit resolve =
-    fetch client GET ApiUrl.searchAccount (Decode.list accountDecoder)
+    authRequest client GET ApiUrl.searchAccount (Decode.list accountDecoder)
         |> Build.withQueryParams
             [ ( "q", query )
             , ( "limit", toString limit )
@@ -192,50 +195,50 @@ searchAccounts client query limit resolve =
 
 userAccount : Client -> Request Account
 userAccount client =
-    fetch client GET ApiUrl.userAccount accountDecoder
+    authRequest client GET ApiUrl.userAccount accountDecoder
 
 
 postStatus : Client -> StatusRequestBody -> Request Status
 postStatus client statusRequestBody =
-    fetch client POST ApiUrl.statuses statusDecoder
+    authRequest client POST ApiUrl.statuses statusDecoder
         |> Build.withJsonBody (statusRequestBodyEncoder statusRequestBody)
 
 
 deleteStatus : Client -> Int -> Request Int
 deleteStatus client id =
-    fetch client DELETE (ApiUrl.status id) <| Decode.succeed id
+    authRequest client DELETE (ApiUrl.status id) <| Decode.succeed id
 
 
 context : Client -> Int -> Request Context
 context client id =
-    fetch client GET (ApiUrl.context id) contextDecoder
+    authRequest client GET (ApiUrl.context id) contextDecoder
 
 
 reblog : Client -> Int -> Request Status
 reblog client id =
-    fetch client POST (ApiUrl.reblog id) statusDecoder
+    authRequest client POST (ApiUrl.reblog id) statusDecoder
 
 
 unreblog : Client -> Int -> Request Status
 unreblog client id =
-    fetch client POST (ApiUrl.unreblog id) statusDecoder
+    authRequest client POST (ApiUrl.unreblog id) statusDecoder
 
 
 favourite : Client -> Int -> Request Status
 favourite client id =
-    fetch client POST (ApiUrl.favourite id) statusDecoder
+    authRequest client POST (ApiUrl.favourite id) statusDecoder
 
 
 unfavourite : Client -> Int -> Request Status
 unfavourite client id =
-    fetch client POST (ApiUrl.unfavourite id) statusDecoder
+    authRequest client POST (ApiUrl.unfavourite id) statusDecoder
 
 
 follow : Client -> Int -> Request Relationship
 follow client id =
-    fetch client POST (ApiUrl.follow id) relationshipDecoder
+    authRequest client POST (ApiUrl.follow id) relationshipDecoder
 
 
 unfollow : Client -> Int -> Request Relationship
 unfollow client id =
-    fetch client POST (ApiUrl.unfollow id) relationshipDecoder
+    authRequest client POST (ApiUrl.unfollow id) relationshipDecoder