Bumping version to 1.5.10

forki · Aug 20, 2019 · 6e32a9b · 6e32a9b
1 parent c2751bc
commit 6e32a9b
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 9 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 # Release Notes
 
-## 1.5.8 - 2019-08-20
+## 1.5.10 - 2019-08-20
 * Sonos support
 
 ## 1.4.22 - 2019-08-20

diff --git a/src/Client/ReleaseNotes.fs b/src/Client/ReleaseNotes.fs
@@ -1,13 +1,13 @@
 module internal ReleaseNotes
 
-let Version = "1.5.8"
+let Version = "1.5.10"
 
 let IsPrerelease = false
 
 let Notes = """
 # Release Notes
 
-## 1.5.8 - 2019-08-20
+## 1.5.10 - 2019-08-20
 * Sonos support
 
 ## 1.4.22 - 2019-08-20

diff --git a/src/Server/Server.fs b/src/Server/Server.fs
@@ -217,7 +217,6 @@ let nextFileEndpoint (userID,token) =
                         Description = tag.Description
                         Action = TagActionForBox.GetFromTagAction(tag.Action,position) }
 
-
                     let txt = TagForBox.Encoder tag |> Encode.toString 0
                     return! setBodyFromString txt next ctx
                 | SpeakerType.Sonos ->
@@ -251,9 +250,27 @@ let volumeUpEndpoint userID =
     pipeline {
         set_header "Content-Type" "application/json"
         plug (fun next ctx -> task {
-            let! tags = AzureTable.getAllTagsForUser userID
-            let txt = TagList.Encoder { Tags = tags } |> Encode.toString 0
-            return! setBodyFromString txt next ctx
+            match! AzureTable.getUser userID with
+            | None ->
+                return! Response.notFound ctx userID
+            | Some user ->
+                let logger = ctx.GetLogger "VolumeUp"
+                do! Sonos.volumeUp logger user.SonosAccessToken Sonos.group
+                return! Response.ok ctx userID
+        })
+    }
+
+let volumeDownEndpoint userID =
+    pipeline {
+        set_header "Content-Type" "application/json"
+        plug (fun next ctx -> task {
+            match! AzureTable.getUser userID with
+            | None ->
+                return! Response.notFound ctx userID
+            | Some user ->
+                let logger = ctx.GetLogger "VolumeDown"
+                do! Sonos.volumeDown logger user.SonosAccessToken Sonos.group
+                return! Response.ok ctx userID
         })
     }
 
@@ -348,7 +365,7 @@ let webApp =
         getf "/api/previousfile/%s/%s" previousFileEndpoint
         getf "/api/usertags/%s" userTagsEndPoint
         postf "/api/volumeup/%s" volumeUpEndpoint
-        postf "/api/volumedown/%s" volumeUpEndpoint
+        postf "/api/volumedown/%s" volumeDownEndpoint
         postf "/api/upload/%s" uploadEndpoint
         getf "/api/history/%s" historyEndPoint
         get "/api/startup" startupEndpoint

diff --git a/src/Server/Sonos.fs b/src/Server/Sonos.fs
@@ -51,7 +51,7 @@ type Session =
 
 let createOrJoinSession (log:ILogger) accessToken group = task {
     let headers = ["Authorization", "Bearer " + accessToken]
-    let url = sprintf "https://api.ws.sonos.com/control/api/v1/groups/%s/playbackSession/create" group
+    let url = sprintf "https://api.ws.sonos.com/control/api/v1/groups/%s/playbackSession" group
     let body = """{
     "appId": "com.Forkmann.AudioHub",
     "appContext": "1a2b3c",
@@ -65,6 +65,31 @@ let createOrJoinSession (log:ILogger) accessToken group = task {
     | Ok session -> return session
 }
 
+let volumeUp (log:ILogger) accessToken group = task {
+    let headers = ["Authorization", "Bearer " + accessToken]
+    let url = sprintf "https://api.ws.sonos.com/control/api/v1/groups/%s/groupVolume/relative" group
+    let body = """{
+  "volumeDelta": 10
+}"""
+
+    let! _result = post log url headers body
+
+    ()
+}
+
+let volumeDown (log:ILogger) accessToken group = task {
+    let headers = ["Authorization", "Bearer " + accessToken]
+    let url = sprintf "https://api.ws.sonos.com/control/api/v1/groups/%s/groupVolume/relative" group
+    let body = """{
+  "volumeDelta": -10
+}"""
+
+    let! _result = post log url headers body
+
+    ()
+}
+
+
 
 let playStream (log:ILogger) accessToken (session:Session) (tag:Tag) = task {
     let headers = ["Authorization", "Bearer " + accessToken]