mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 15:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor URL arguments, localStorage and sessionStorage entries, and IndexedDB/PersistentStorage entries to snake_case.

Browse source
This commit is contained in:
schlagmichdoch 2023-11-24 17:32:40 +01:00
parent da8178d72e
commit a8242cecf7
6 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
public/scripts/browser-tabs-connector.js
View file

@ -19,42 +19,42 @@ class BrowserTabsConnector {
} }
static peerIsSameBrowser(peerId) { static peerIsSameBrowser(peerId) {
let peerIdsBrowser = JSON.parse(localStorage.getItem("peer_ids_browser")); let peerIdsBrowser = JSON.parse(localStorage.getItem('peer_ids_browser'));
return peerIdsBrowser return peerIdsBrowser
? peerIdsBrowser.indexOf(peerId) !== -1 ? peerIdsBrowser.indexOf(peerId) !== -1
: false; : false;
} }
static async addPeerIdToLocalStorage() { static async addPeerIdToLocalStorage() {
const peerId = sessionStorage.getItem("peer_id"); const peerId = sessionStorage.getItem('peer_id');
if (!peerId) return false; if (!peerId) return false;
let peerIdsBrowser = []; let peerIdsBrowser = [];
let peerIdsBrowserOld = JSON.parse(localStorage.getItem("peer_ids_browser")); let peerIdsBrowserOld = JSON.parse(localStorage.getItem('peer_ids_browser'));
if (peerIdsBrowserOld) peerIdsBrowser.push(...peerIdsBrowserOld); if (peerIdsBrowserOld) peerIdsBrowser.push(...peerIdsBrowserOld);
peerIdsBrowser.push(peerId); peerIdsBrowser.push(peerId);
peerIdsBrowser = peerIdsBrowser.filter(onlyUnique); peerIdsBrowser = peerIdsBrowser.filter(onlyUnique);
localStorage.setItem("peer_ids_browser", JSON.stringify(peerIdsBrowser)); localStorage.setItem('peer_ids_browser', JSON.stringify(peerIdsBrowser));
return peerIdsBrowser; return peerIdsBrowser;
} }
static async removePeerIdFromLocalStorage(peerId) { static async removePeerIdFromLocalStorage(peerId) {
let peerIdsBrowser = JSON.parse(localStorage.getItem("peer_ids_browser")); let peerIdsBrowser = JSON.parse(localStorage.getItem('peer_ids_browser'));
const index = peerIdsBrowser.indexOf(peerId); const index = peerIdsBrowser.indexOf(peerId);
peerIdsBrowser.splice(index, 1); peerIdsBrowser.splice(index, 1);
localStorage.setItem("peer_ids_browser", JSON.stringify(peerIdsBrowser)); localStorage.setItem('peer_ids_browser', JSON.stringify(peerIdsBrowser));
return peerId; return peerId;
} }
static async removeOtherPeerIdsFromLocalStorage() { static async removeOtherPeerIdsFromLocalStorage() {
const peerId = sessionStorage.getItem("peer_id"); const peerId = sessionStorage.getItem('peer_id');
if (!peerId) return false; if (!peerId) return false;
let peerIdsBrowser = [peerId]; let peerIdsBrowser = [peerId];
localStorage.setItem("peer_ids_browser", JSON.stringify(peerIdsBrowser)); localStorage.setItem('peer_ids_browser', JSON.stringify(peerIdsBrowser));
return peerIdsBrowser; return peerIdsBrowser;
} }
} }

4
public/scripts/localization.js
View file

@ -9,7 +9,7 @@ class Localization {
Localization.systemLocale = Localization.getSupportedOrDefault(navigator.languages); Localization.systemLocale = Localization.getSupportedOrDefault(navigator.languages);
let storedLanguageCode = localStorage.getItem("language-code"); let storedLanguageCode = localStorage.getItem('language_code');
Localization.initialLocale = storedLanguageCode && Localization.isSupported(storedLanguageCode) Localization.initialLocale = storedLanguageCode && Localization.isSupported(storedLanguageCode)
? storedLanguageCode ? storedLanguageCode
@ -82,7 +82,7 @@ class Localization {
} }
static isSystemLocale() { static isSystemLocale() {
return !localStorage.getItem('language-code'); return !localStorage.getItem('language_code');
} }
static async fetchTranslationsFor(newLocale) { static async fetchTranslationsFor(newLocale) {

12
public/scripts/persistent-storage.js
View file

@ -4,7 +4,7 @@ class PersistentStorage {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
return; return;
} }
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 4); const DBOpenRequest = window.indexedDB.open('pairdrop_store', 5);
DBOpenRequest.onerror = e => { DBOpenRequest.onerror = e => {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
console.log('Error initializing database: '); console.log('Error initializing database: ');
@ -13,7 +13,7 @@ class PersistentStorage {
DBOpenRequest.onsuccess = _ => { DBOpenRequest.onsuccess = _ => {
console.log('Database initialised.'); console.log('Database initialised.');
}; };
DBOpenRequest.onupgradeneeded = e => { DBOpenRequest.onupgradeneeded = async e => {
const db = e.target.result; const db = e.target.result;
const txn = e.target.transaction; const txn = e.target.transaction;
@ -42,6 +42,14 @@ class PersistentStorage {
roomSecretsObjectStore4.createIndex('display_name', 'display_name'); roomSecretsObjectStore4.createIndex('display_name', 'display_name');
roomSecretsObjectStore4.createIndex('auto_accept', 'auto_accept'); roomSecretsObjectStore4.createIndex('auto_accept', 'auto_accept');
} }
if (e.oldVersion <= 4) {
// migrate to v5
const editedDisplayNameOld = await PersistentStorage.get('editedDisplayName');
if (editedDisplayNameOld) {
await PersistentStorage.set('edited_display_name', editedDisplayNameOld);
await PersistentStorage.delete('editedDisplayName');
}
}
} }
} }

12
public/scripts/ui-main.js
View file

@ -184,13 +184,13 @@ class FooterUI {
if (newDisplayName === savedDisplayName) return; if (newDisplayName === savedDisplayName) return;
if (newDisplayName) { if (newDisplayName) {
PersistentStorage.set('editedDisplayName', newDisplayName) PersistentStorage.set('edited_display_name', newDisplayName)
.then(_ => { .then(_ => {
Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-permanently")); Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-permanently"));
}) })
.catch(_ => { .catch(_ => {
console.log("This browser does not support IndexedDB. Use localStorage instead."); console.log("This browser does not support IndexedDB. Use localStorage instead.");
localStorage.setItem('editedDisplayName', newDisplayName); localStorage.setItem('edited_display_name', newDisplayName);
Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-temporarily")); Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-temporarily"));
}) })
.finally(() => { .finally(() => {
@ -199,10 +199,10 @@ class FooterUI {
}); });
} }
else { else {
PersistentStorage.delete('editedDisplayName') PersistentStorage.delete('edited_display_name')
.catch(_ => { .catch(_ => {
console.log("This browser does not support IndexedDB. Use localStorage instead.") console.log("This browser does not support IndexedDB. Use localStorage instead.")
localStorage.removeItem('editedDisplayName'); localStorage.removeItem('edited_display_name');
}) })
.finally(() => { .finally(() => {
Events.fire('notify-user', Localization.getTranslation("notifications.display-name-random-again")); Events.fire('notify-user', Localization.getTranslation("notifications.display-name-random-again"));
@ -214,13 +214,13 @@ class FooterUI {
_getSavedDisplayName() { _getSavedDisplayName() {
return new Promise((resolve) => { return new Promise((resolve) => {
PersistentStorage.get('editedDisplayName') PersistentStorage.get('edited_display_name')
.then(displayName => { .then(displayName => {
if (!displayName) displayName = ""; if (!displayName) displayName = "";
resolve(displayName); resolve(displayName);
}) })
.catch(_ => { .catch(_ => {
let displayName = localStorage.getItem('editedDisplayName'); let displayName = localStorage.getItem('edited_display_name');
if (!displayName) displayName = ""; if (!displayName) displayName = "";
resolve(displayName); resolve(displayName);
}) })

10
public/scripts/ui.js
View file

@ -782,10 +782,10 @@ class LanguageSelectDialog extends Dialog {
let languageCode = e.target.value; let languageCode = e.target.value;
if (languageCode) { if (languageCode) {
localStorage.setItem('language-code', languageCode); localStorage.setItem('language_code', languageCode);
} }
else { else {
localStorage.removeItem('language-code'); localStorage.removeItem('language_code');
} }
Localization.setTranslation(languageCode) Localization.setTranslation(languageCode)
@ -2052,7 +2052,7 @@ class ShareTextDialog extends Dialog {
this.$approveMsgBtn.addEventListener('click', _ => this._approveShareText()); this.$approveMsgBtn.addEventListener('click', _ => this._approveShareText());
// Only show this per default if user sets checkmark // Only show this per default if user sets checkmark
this.$checkbox.checked = localStorage.getItem("approve_share_text") this.$checkbox.checked = localStorage.getItem('approve-share-text')
? ShareTextDialog.isApproveShareTextSet() ? ShareTextDialog.isApproveShareTextSet()
: false; : false;
@ -2065,11 +2065,11 @@ class ShareTextDialog extends Dialog {
} }
static isApproveShareTextSet() { static isApproveShareTextSet() {
return localStorage.getItem("approve_share_text") === "true"; return localStorage.getItem('approve-share-text') === "true";
} }
_setCheckboxValueToLocalStorage() { _setCheckboxValueToLocalStorage() {
localStorage.setItem("approve_share_text", this.$checkbox.checked ? "true" : "false"); localStorage.setItem('approve-share-text', this.$checkbox.checked ? "true" : "false");
} }
_onKeyDown(e) { _onKeyDown(e) {

6
server/peer.js
View file

@ -124,8 +124,8 @@ export default class Peer {
_setPeerId(request) { _setPeerId(request) {
const searchParams = new URL(request.url, "http://server").searchParams; const searchParams = new URL(request.url, "http://server").searchParams;
let peerId = searchParams.get("peer_id"); let peerId = searchParams.get('peer_id');
let peerIdHash = searchParams.get("peer_id_hash"); let peerIdHash = searchParams.get('peer_id_hash');
if (peerId && Peer.isValidUuid(peerId) && this.isPeerIdHashValid(peerId, peerIdHash)) { if (peerId && Peer.isValidUuid(peerId) && this.isPeerIdHashValid(peerId, peerIdHash)) {
this.id = peerId; this.id = peerId;
} else { } else {
@ -135,7 +135,7 @@ export default class Peer {
_setRtcSupported(request) { _setRtcSupported(request) {
const searchParams = new URL(request.url, "http://server").searchParams; const searchParams = new URL(request.url, "http://server").searchParams;
this.rtcSupported = searchParams.get("webrtc_supported") === "true"; this.rtcSupported = searchParams.get('webrtc_supported') === "true";
} }
_setName(req) { _setName(req) {