Kaynağa Gözat

fix nightscout fetch

Ivan Valkou 5 yıl önce
ebeveyn
işleme
2e80053085

+ 20 - 5
FreeAPS/Sources/Services/Network/NightscoutAPI.swift

@@ -91,8 +91,14 @@ extension NightscoutAPI {
         components.path = Config.treatmentsPath
         components.queryItems = [
             URLQueryItem(name: "find[carbs][$exists]", value: "true"),
-            URLQueryItem(name: "find[enteredBy][$ne]", value: CarbsEntry.manual),
-            URLQueryItem(name: "find[enteredBy][$ne]", value: NigtscoutTreatment.local)
+            URLQueryItem(
+                name: "find[enteredBy][$ne]",
+                value: CarbsEntry.manual.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+            ),
+            URLQueryItem(
+                name: "find[enteredBy][$ne]",
+                value: NigtscoutTreatment.local.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+            )
         ]
         if let date = sinceDate {
             let dateItem = URLQueryItem(
@@ -124,8 +130,14 @@ extension NightscoutAPI {
         components.path = Config.treatmentsPath
         components.queryItems = [
             URLQueryItem(name: "find[eventType]", value: "Temporary+Target"),
-            URLQueryItem(name: "find[enteredBy][$ne]", value: TempTarget.manual),
-            URLQueryItem(name: "find[enteredBy][$ne]", value: NigtscoutTreatment.local)
+            URLQueryItem(
+                name: "find[enteredBy][$ne]",
+                value: TempTarget.manual.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+            ),
+            URLQueryItem(
+                name: "find[enteredBy][$ne]",
+                value: NigtscoutTreatment.local.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+            )
         ]
         if let date = sinceDate {
             let dateItem = URLQueryItem(
@@ -157,7 +169,10 @@ extension NightscoutAPI {
         components.path = Config.treatmentsPath
         components.queryItems = [
             URLQueryItem(name: "find[eventType]", value: "Announcement"),
-            URLQueryItem(name: "find[enteredBy]", value: Announcement.remote)
+            URLQueryItem(
+                name: "find[enteredBy]",
+                value: Announcement.remote.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+            )
         ]
         if let date = sinceDate {
             let dateItem = URLQueryItem(