staging into master #69

Merged
corbz merged 38 commits from staging into master 2024-10-14 22:34:03 +00:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit bbaca1e648 - Show all commits

View File

@ -6,6 +6,8 @@
- Enhancement: Improved the offcanvas navbar on smaller screens, to be less ugly
- Fix: Select2 dropdown search bars always using light theme, regardless of user choice
- Enhancement: Clearer help label on the 'Add Server' modal/form
- Enhancement: Add wiki link button to footer
- Fix: "ordering=unknown" by only applying ordering if it's truthy
-
- TODO: fix areas marked `// FIX: potential xss attack`
-

View File

@ -28,7 +28,8 @@ function makeQuerystring(filters, sort) {
for (key in filters) {
querystring += `${key}=${filters[key]}&`;
}
return querystring += `ordering=${sort}`;
return sort ? querystring += `ordering=${sort}` : querystring;
}
// Saved Guilds
@ -64,8 +65,7 @@ async function loadChannels(guildId) {
async function getSubscriptions(filters, sort) {
let querystring = makeQuerystring(filters, sort);
url = `/api/subscription/${querystring}`;
return await ajaxRequest(url, "GET");
return await ajaxRequest(`/api/subscription/${querystring}`, "GET");
}
async function getSubscription(id) {
@ -116,8 +116,7 @@ async function deleteSubChannels(subscriptionId) {
async function getFilters(filters, sort) {
let querystring = makeQuerystring(filters, sort);
url = `/api/filter/${querystring}`;
return await ajaxRequest(url, "GET");
return await ajaxRequest(`/api/filter/${querystring}`, "GET");
}
async function getFilter(id) {