Merge branch 'develop' into 4-transfer-api

README.md

@@ -18,8 +18,9 @@ supported for which spec versions.
 - ✅ **One way to do things** instead of having multiple functions that are
 considered deprecated.
 
-Follow us on [Mastodon](https://social.noordstar.me/@elm_matrix_sdk) at
-@elm_matrix_sdk@social.noordstar.me to stay up-to-date on the latest changes.
+Follow us on [Mastodon](https://social.noordstar.me/@elm_matrix_sdk) or join the
+conversation on [Matrix](https://matrix.to/#/#elm-sdk:matrix.org) to stay
+up-to-date on the latest changes.
 
 ## How to install
 

elm.json

@@ -3,7 +3,7 @@
     "name": "noordstar/elm-matrix-sdk-beta",
     "summary": "Matrix SDK for instant communication. Unstable beta version for testing only.",
     "license": "EUPL-1.1",
-    "version": "3.2.0",
+    "version": "3.3.1",
     "exposed-modules": [
         "Matrix",
         "Matrix.Event",

src/Internal/Api/Task.elm

@@ -36,9 +36,10 @@ import Internal.Api.SendMessageEvent.Api
 import Internal.Api.Sync.Api
 import Internal.Api.Versions.Api
 import Internal.Config.Log exposing (Log, log)
+import Internal.Config.Text as Text
 import Internal.Tools.Json as Json
 import Internal.Values.Context as Context exposing (APIContext)
-import Internal.Values.Envelope exposing (EnvelopeUpdate(..))
+import Internal.Values.Envelope as E exposing (EnvelopeUpdate(..))
 import Internal.Values.Room exposing (RoomUpdate(..))
 import Internal.Values.Vault exposing (VaultUpdate(..))
 import Task
@@ -112,7 +113,20 @@ getBaseUrl c =
         Nothing ->
             Internal.Api.BaseUrl.Api.baseUrl
                 { url = Context.fromApiFormat c |> .serverName }
-                c
+                |> C.catchWith
+                    (\_ ->
+                        let
+                            url : String
+                            url =
+                                Context.fromApiFormat c
+                                    |> .serverName
+                        in
+                        { contextChange = Context.setBaseUrl url
+                        , logs = [ log.warn (Text.logs.baseUrlFailed url) ]
+                        , messages = [ E.SetBaseUrl url ]
+                        }
+                    )
+                |> (|>) c
 
 
 {-| Get the current timestamp

src/Internal/Config/Default.elm

@@ -29,7 +29,7 @@ will assume until overriden by the user.
 -}
 currentVersion : String
 currentVersion =
-    "beta 3.2.0"
+    "beta 3.3.1"
 
 
 {-| The default device name that is being communicated with the Matrix API.

src/Internal/Config/Text.elm

@@ -636,7 +636,8 @@ happened. Most of these unexpected results, are taken account of by the Elm SDK,
 but logged so that the programmer can do something about it.
 -}
 logs :
-    { baseUrlFound : String -> String -> String
+    { baseUrlFailed : String -> String
+    , baseUrlFound : String -> String -> String
     , getEventId : String -> String
     , getNow : Int -> String
     , httpRequest : String -> String -> String
@@ -649,7 +650,9 @@ logs :
     , syncAccountDataFound : Int -> String
     }
 logs =
-    { baseUrlFound =
+    { baseUrlFailed =
+        (++) "Failed to find .well-known, using default server address: "
+    , baseUrlFound =
         \url baseUrl ->
             String.concat [ "Found baseURL of ", url, " at address ", baseUrl ]
     , getEventId = (++) "Received event with id = "

tests/Test/Values/Context.elm

@@ -142,22 +142,16 @@ apiContext =
         ]
 
 
-json : Test
-json =
-    describe "JSON encode + JSON decode"
-        [ test "Empty is {}"
-            (Context.init ""
-                |> Context.encode
-                |> E.encode 0
-                |> Expect.equal "{}"
-                |> always
-            )
-        , fuzz fuzzer
-            "JSON recode"
-            (\context ->
-                context
-                    |> Context.encode
-                    |> D.decodeValue Context.decoder
-                    |> Expect.equal (Ok ( context, [] ))
-            )
-        ]
+
+-- json : Test
+-- json =
+--     describe "JSON encode + JSON decode"
+--         [ fuzz fuzzer
+--             "JSON recode"
+--             (\context ->
+--                 context
+--                     |> Context.encode
+--                     |> D.decodeValue Context.decoder
+--                     |> Expect.equal (Ok ( context, [] ))
+--             )
+--         ]

tests/Test/Values/Envelope.elm

@@ -51,16 +51,17 @@ suite =
                     )
                 ]
             ]
-        , describe "JSON"
-            [ fuzz2 (fuzzer Fuzz.string)
-                Fuzz.int
-                "JSON encode -> JSON decode"
-                (\envelope indent ->
-                    envelope
-                        |> Envelope.encode Json.string
-                        |> E.encode indent
-                        |> D.decodeString (Envelope.decoder Json.string)
-                        |> Expect.equal (Ok ( envelope, [] ))
-                )
-            ]
+
+        -- , describe "JSON"
+        --     [ fuzz2 (fuzzer Fuzz.string)
+        --         Fuzz.int
+        --         "JSON encode -> JSON decode"
+        --         (\envelope indent ->
+        --             envelope
+        --                 |> Envelope.encode Json.string
+        --                 |> E.encode indent
+        --                 |> D.decodeString (Envelope.decoder Json.string)
+        --                 |> Expect.equal (Ok ( envelope, [] ))
+        --         )
+        --     ]
         ]

tests/Test/Values/Room.elm

@@ -18,23 +18,26 @@ fuzzer =
     Fuzz.string
         |> Fuzz.map Room.init
         |> addAFewTimes Fuzz.string (\key -> Room.setAccountData key placeholderValue)
-        |> addAFewTimes (Fuzz.list TestEvent.fuzzer) Room.addEvents
-        |> add4AFewTimes (Fuzz.list TestEvent.fuzzer)
-            TestFilter.fuzzer
-            (Fuzz.maybe Fuzz.string)
-            Fuzz.string
-            (\a b c d ->
-                Room.Batch a b c d
-                    |> Room.addBatch
-            )
-        |> add4AFewTimes (Fuzz.list TestEvent.fuzzer)
-            TestFilter.fuzzer
-            (Fuzz.maybe Fuzz.string)
-            Fuzz.string
-            (\a b c d ->
-                Room.Batch a b c d
-                    |> Room.addSync
-            )
+
+
+
+-- |> addAFewTimes (Fuzz.list TestEvent.fuzzer) Room.addEvents
+-- |> add4AFewTimes (Fuzz.list TestEvent.fuzzer)
+--     TestFilter.fuzzer
+--     (Fuzz.maybe Fuzz.string)
+--     Fuzz.string
+--     (\a b c d ->
+--         Room.Batch a b c d
+--             |> Room.addBatch
+--     )
+-- |> add4AFewTimes (Fuzz.list TestEvent.fuzzer)
+--     TestFilter.fuzzer
+--     (Fuzz.maybe Fuzz.string)
+--     Fuzz.string
+--     (\a b c d ->
+--         Room.Batch a b c d
+--             |> Room.addSync
+--     )
 
 
 addAFewTimes : Fuzzer a -> (a -> Room -> Room) -> Fuzzer Room -> Fuzzer Room

tests/Test/Values/Settings.elm

@@ -11,7 +11,7 @@ import Test exposing (..)
 
 fuzzer : Fuzzer Settings
 fuzzer =
-    Fuzz.map3 Settings
+    Fuzz.map4 Settings
         (Fuzz.oneOf
             [ Fuzz.constant Default.currentVersion
             , Fuzz.string
@@ -22,6 +22,11 @@ fuzzer =
             , Fuzz.string
             ]
         )
+        (Fuzz.oneOf
+            [ Fuzz.constant Default.removePasswordOnLogin
+            , Fuzz.bool
+            ]
+        )
         (Fuzz.oneOf
             [ Fuzz.constant Default.syncTime
             , Fuzz.int
@@ -45,6 +50,12 @@ suite =
                     |> Expect.equal Default.deviceName
                     |> always
                 )
+            , test "Remove password on login"
+                (Settings.init
+                    |> .removePasswordOnLogin
+                    |> Expect.equal Default.removePasswordOnLogin
+                    |> always
+                )
             , test "Sync time"
                 (Settings.init
                     |> .syncTime