From 3f1300543d95f6d31d598d1157bebf632c232318 Mon Sep 17 00:00:00 2001
From: Thomas Rupprecht <rupprecht.thomas@gmail.com>
Date: Wed, 6 Sep 2023 21:29:10 +0200
Subject: [PATCH] refactor(background): inline `fetch` and use
 `URLSearchParams`

---
 CHANGELOG.md      |  6 ++++++
 src/background.js | 24 +++++++++---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e978569..b87a525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## \[unreleased]
 
+### 🚜 Refactor
+
+- Inline `fetch` and use `URLSearchParams`
+
+## \[[0.9.3](https://gitea.usrspace.at/XimeX/usrspace-browser-addon/releases/tag/v0.9.3)] - 2023-09-06
+
 ### ⛰️ Features
 
 - Add commitlint to enforce commit message format
diff --git a/src/background.js b/src/background.js
index 48a8049..f9163e6 100644
--- a/src/background.js
+++ b/src/background.js
@@ -15,32 +15,26 @@ browser.alarms.onAlarm.addListener((alarm) => {
 	}
 });
 
-/**
- * @param {string} url
- * @returns {Promise<any>}
- */
-async function fetchJson(url) {
-	const response = await fetch(url);
-	return response.json();
-}
-
 /**
  * @param {number} days
  * @returns {Promise<import("../types").Calendar>}
  */
-function fetchCalendar(days = 28) {
-	let url = `${API_URLS.calender}?o=json`;
+async function fetchCalendar(days = 28) {
+	const params = new URLSearchParams();
+	params.set('o', 'json');
 	if (days) {
-		url += `&r=${days}`;
+		params.set('r', `${days}`);
 	}
-	return fetchJson(url);
+	const response = await fetch(`${API_URLS.calender}?${params.toString()}`);
+	return response.json();
 }
 
 /**
  * @returns {Promise<import("../types").SpaceApi>}
  */
-function fetchSpaceApi() {
-	return fetchJson(API_URLS.spaceApi);
+async function fetchSpaceApi() {
+	const response = await fetch(API_URLS.spaceApi);
+	return response.json();
 }
 
 async function fetchNewData() {