Skip to content

Use NightscoutUtils.constructURL for the Nightscout web viewer URL #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marionbarker merged 1 commit into from
Jul 19, 2026
Merged

Use NightscoutUtils.constructURL for the Nightscout web viewer URL #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion LoopFollow/Helpers/NightscoutUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,10 @@ class NightscoutUtils {
queryItems.append(URLQueryItem(name: key, value: value))
}

components?.queryItems = queryItems
// Assigning an empty array would still append a bare "?" to the URL.
if !queryItems.isEmpty {
components?.queryItems = queryItems
}

return components?.url
}
Expand Down
14 changes: 6 additions & 8 deletions LoopFollow/ViewControllers/NightScoutViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ class NightscoutViewController: UIViewController {
}
.store(in: &cancellables)

var url = Storage.shared.url.value
let token = Storage.shared.token.value

if token != "" {
url = url + "?token=" + token
}

guard let myUrl = URL(string: url) else { return }
guard let myUrl = NightscoutUtils.constructURL(
baseURL: Storage.shared.url.value,
token: Storage.shared.token.value,
endpoint: "",
parameters: [:]
) else { return }

let webpagePreferences = WKWebpagePreferences()
webpagePreferences.allowsContentJavaScript = true
Expand Down
Loading