From 1e37bab4d9c5487d7a446a13f19a233ed19916c2 Mon Sep 17 00:00:00 2001 From: rawrower <6372741+rowrawer@users.noreply.github.com> Date: Wed, 6 Oct 2021 20:22:45 +0200 Subject: [PATCH] support for %timestamp% --- _locales/de/messages.json | 2 +- _locales/en/messages.json | 2 +- _locales/ko/messages.json | 2 +- _locales/pl/messages.json | 2 +- _locales/ru/messages.json | 2 +- _locales/sk/messages.json | 2 +- background.js | 12 ++++++------ content/popup.js | 7 +++---- manifest.json | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 6994d0f..fc6b484 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -63,7 +63,7 @@ "message": "benutzerdefiniertes Kommando" }, "userCommandTip": { - "message": "Verfügbare Felder:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%" + "message": "Verfügbare Felder:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%\n%timestamp%" }, "headersPref": { "message": "Füge Header hinzu" diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 0cc4fb8..ddea487 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -69,7 +69,7 @@ "message": "User-defined command" }, "userCommandTip": { - "message": "Available fields:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%" + "message": "Available fields:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%\n%timestamp%" }, "headersPref": { "message": "Include additional headers" diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 78d0352..6640f52 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -69,7 +69,7 @@ "message": "사용자 정의 명령어" }, "userCommandTip": { - "message": "이용 가능한 옵션:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%" + "message": "이용 가능한 옵션:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%\n%timestamp%" }, "headersPref": { "message": "헤더 추가" diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 2892cc2..8a473fa 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -69,7 +69,7 @@ "message": "Komenda własna" }, "userCommandTip": { - "message": "Dostępne pola:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%" + "message": "Dostępne pola:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%\n%timestamp%" }, "headersPref": { "message": "Dołącz dodatkowe nagłówki" diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index cfaddb3..33e6990 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -69,7 +69,7 @@ "message": "Пользовательская команда" }, "userCommandTip": { - "message": "Доступные переменные:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%" + "message": "Доступные переменные:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%\n%timestamp%" }, "headersPref": { "message": "Включать дополнительные заголовки" diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json index bab0708..e6521d0 100644 --- a/_locales/sk/messages.json +++ b/_locales/sk/messages.json @@ -66,7 +66,7 @@ "message": "Používateľom definovaný príkaz" }, "userCommandTip": { - "message": "Dostupné kľúčové slová:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%" + "message": "Dostupné kľúčové slová:\n%url%\n%filename%\n%useragent%\n%referer%\n%cookie%\n%proxy%\n%origin%\n%tabtitle%\n%timestamp%" }, "headersPref": { "message": "Pridať dodatočné hlavičky" diff --git a/background.js b/background.js index 6087dfc..9e30bb4 100644 --- a/background.js +++ b/background.js @@ -92,9 +92,11 @@ const urlFilter = (requestDetails) => { blacklistEntries?.filter( (entry) => requestDetails.url?.includes(entry) || - (requestDetails.documentUrl || requestDetails.originUrl)?.includes( - entry - ) + ( + requestDetails.documentUrl || + requestDetails.originUrl || + requestDetails.initiator + )?.includes(entry) ).length === 0)) ) { queue.push(requestDetails.requestId); @@ -314,9 +316,7 @@ chrome.storage.local.get((options) => { if (urlStorageRestore.length) { if (cleanupPref) urlStorageRestore = urlStorageRestore.filter( - (url) => - new Date().getTime() - (url.timeStamp || url.timestamp) < - 604800000 + (url) => new Date().getTime() - url.timeStamp < 604800000 ); chrome.storage.local.set({ diff --git a/content/popup.js b/content/popup.js index b2b152c..11dc377 100644 --- a/content/popup.js +++ b/content/popup.js @@ -298,7 +298,7 @@ const copyURL = (info) => { // sanitize tab title and timestamp outFilename = outFilename.replace(/[/\\?%*:|"<>]/g, "_"); const outExtension = options.fileExtension || "ts"; - const outTimestamp = getTimestamp(e.timeStamp || e.timestamp).replace( + const outTimestamp = getTimestamp(e.timeStamp).replace( /[/\\?%*:|"<>]/g, "_" ); @@ -347,6 +347,7 @@ const copyURL = (info) => { case "user": code = code.replace(new RegExp("%url%", "g"), streamURL); code = code.replace(new RegExp("%filename%", "g"), filename); + code = code.replace(new RegExp("%timestamp%", "g"), outTimestamp); break; default: break; @@ -475,9 +476,7 @@ const createList = () => { requestDetails.tabData.url; const timestampCell = document.createElement("td"); - timestampCell.textContent = getTimestamp( - requestDetails.timeStamp || requestDetails.timestamp - ); + timestampCell.textContent = getTimestamp(requestDetails.timeStamp); const deleteCell = document.createElement("td"); const deleteX = document.createElement("a"); diff --git a/manifest.json b/manifest.json index 21822f3..24883ca 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "manifest_version": 2, "name": "The Stream Detector", "default_locale": "en", - "version": "2.8.1", + "version": "2.8.3", "permissions": [ "", "tabs",