From 87d01e14a847358bf309e7c963951b974003fdcd Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:59:29 +0300 Subject: [PATCH 1/6] Update store.js --- src/store.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/store.js b/src/store.js index e94d173bc..224a39802 100644 --- a/src/store.js +++ b/src/store.js @@ -177,6 +177,9 @@ export function transformChannel(channel, data) { channel.is_blocked = !!data.blocklist[channel.id] channel.streams = channel._streams.length channel.guides = channel._guides.length + channel.blocklist_records = Array.isArray(data.blocklist[channel.id]) + ? data.blocklist[channel.id] + : [] const isChannelNameRepeated = data.nameIndex[channel.name.toLowerCase()].length > 1 channel.displayName = isChannelNameRepeated From 304e70313d25c2a5ef634362eb792815b8a182e9 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:59:51 +0300 Subject: [PATCH 2/6] Install sveltejs-tippy --- package-lock.json | 53 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 3 ++- yarn.lock | 19 +++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 472d05cd4..aed8d7757 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "svelte": "^3.44.0", "svelte-simple-modal": "^1.3.1", "svelte-sitemap": "^2.6.0", + "sveltejs-tippy": "^3.0.0", "tailwind-scrollbar-hide": "^1.1.7", "tailwindcss": "^3.2.7", "transliteration": "^2.2.0", @@ -518,6 +519,16 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@sveltejs/adapter-static": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.1.tgz", @@ -2022,6 +2033,15 @@ "node": ">= 14.17.0" } }, + "node_modules/sveltejs-tippy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/sveltejs-tippy/-/sveltejs-tippy-3.0.0.tgz", + "integrity": "sha512-LAfQikm61AeqZW1hCFWUsmGEMmhMHDvrPV0JhbT38Ell9SqBjmFaY//+YKUxaJvx6nLMxGQdlcHA1rDg2Ml8tQ==", + "dev": true, + "dependencies": { + "tippy.js": "~6.0.1" + } + }, "node_modules/tailwind-scrollbar-hide": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/tailwind-scrollbar-hide/-/tailwind-scrollbar-hide-1.1.7.tgz", @@ -2079,6 +2099,15 @@ "globrex": "^0.1.2" } }, + "node_modules/tippy.js": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.0.3.tgz", + "integrity": "sha512-buQF6HugTA4YeSA/s9xBhu0ferEAx7sRSn45G+Juh3p+Dz3vEKfxtqdg6JUnHIWDCV/r0u8Lrobs9AB4dtYcUQ==", + "dev": true, + "dependencies": { + "@popperjs/core": "^2.1.0" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2566,6 +2595,12 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "dev": true + }, "@sveltejs/adapter-static": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.1.tgz", @@ -3573,6 +3608,15 @@ "xmlbuilder2": "^3.0.2" } }, + "sveltejs-tippy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/sveltejs-tippy/-/sveltejs-tippy-3.0.0.tgz", + "integrity": "sha512-LAfQikm61AeqZW1hCFWUsmGEMmhMHDvrPV0JhbT38Ell9SqBjmFaY//+YKUxaJvx6nLMxGQdlcHA1rDg2Ml8tQ==", + "dev": true, + "requires": { + "tippy.js": "~6.0.1" + } + }, "tailwind-scrollbar-hide": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/tailwind-scrollbar-hide/-/tailwind-scrollbar-hide-1.1.7.tgz", @@ -3620,6 +3664,15 @@ "globrex": "^0.1.2" } }, + "tippy.js": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.0.3.tgz", + "integrity": "sha512-buQF6HugTA4YeSA/s9xBhu0ferEAx7sRSn45G+Juh3p+Dz3vEKfxtqdg6JUnHIWDCV/r0u8Lrobs9AB4dtYcUQ==", + "dev": true, + "requires": { + "@popperjs/core": "^2.1.0" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index d11fb5509..131fed68e 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "tailwind-scrollbar-hide": "^1.1.7", "tailwindcss": "^3.2.7", "transliteration": "^2.2.0", - "validator": "^13.11.0" + "validator": "^13.11.0", + "sveltejs-tippy": "^3.0.0" } } diff --git a/yarn.lock b/yarn.lock index a7acbf459..ff89fdba2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -79,6 +79,11 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== +"@popperjs/core@^2.1.0": + version "2.11.8" + resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@sveltejs/adapter-static@^2.0.1": version "2.0.1" resolved "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.1.tgz" @@ -897,6 +902,13 @@ svelte-sitemap@^2.6.0: resolved "https://registry.npmjs.org/svelte/-/svelte-3.55.1.tgz" integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ== +sveltejs-tippy@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/sveltejs-tippy/-/sveltejs-tippy-3.0.0.tgz" + integrity sha512-LAfQikm61AeqZW1hCFWUsmGEMmhMHDvrPV0JhbT38Ell9SqBjmFaY//+YKUxaJvx6nLMxGQdlcHA1rDg2Ml8tQ== + dependencies: + tippy.js "~6.0.1" + tailwind-scrollbar-hide@^1.1.7: version "1.1.7" resolved "https://registry.npmjs.org/tailwind-scrollbar-hide/-/tailwind-scrollbar-hide-1.1.7.tgz" @@ -939,6 +951,13 @@ tiny-glob@^0.2.9: globalyzer "0.1.0" globrex "^0.1.2" +tippy.js@~6.0.1: + version "6.0.3" + resolved "https://registry.npmjs.org/tippy.js/-/tippy.js-6.0.3.tgz" + integrity sha512-buQF6HugTA4YeSA/s9xBhu0ferEAx7sRSn45G+Juh3p+Dz3vEKfxtqdg6JUnHIWDCV/r0u8Lrobs9AB4dtYcUQ== + dependencies: + "@popperjs/core" "^2.1.0" + to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" From 8f33531cdbb86972f3223070ff3ffc54e60be3ba Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:59:57 +0300 Subject: [PATCH 3/6] Create BlockedBadge.svelte --- src/components/BlockedBadge.svelte | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/components/BlockedBadge.svelte diff --git a/src/components/BlockedBadge.svelte b/src/components/BlockedBadge.svelte new file mode 100644 index 000000000..03880c035 --- /dev/null +++ b/src/components/BlockedBadge.svelte @@ -0,0 +1,30 @@ + + +
+ Blocked +
From 5f9f599912bbca1fd29975994950500102e2fc13 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:00:00 +0300 Subject: [PATCH 4/6] Create ClosedBadge.svelte --- src/components/ClosedBadge.svelte | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/components/ClosedBadge.svelte diff --git a/src/components/ClosedBadge.svelte b/src/components/ClosedBadge.svelte new file mode 100644 index 000000000..dc804461a --- /dev/null +++ b/src/components/ClosedBadge.svelte @@ -0,0 +1,17 @@ + + +
+ Closed +
From 7594821e9e1cb9c348ddb1fb8d7f4fdb9565d167 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:00:05 +0300 Subject: [PATCH 5/6] Update ChannelItem.svelte --- src/components/ChannelItem.svelte | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/components/ChannelItem.svelte b/src/components/ChannelItem.svelte index a1361d633..6e56a23b8 100644 --- a/src/components/ChannelItem.svelte +++ b/src/components/ChannelItem.svelte @@ -4,6 +4,8 @@ import GuidesPopup from './GuidesPopup.svelte' import ChannelPopup from './ChannelPopup.svelte' import Checkbox from './Checkbox.svelte' + import BlockedBadge from './BlockedBadge.svelte' + import ClosedBadge from './ClosedBadge.svelte' import { downloadMode, selected, query } from '~/store' import { fade } from 'svelte/transition' @@ -107,20 +109,10 @@
{#if channel.is_closed} -
- Closed -
+ {/if} {#if channel.is_blocked} -
- Blocked -
+ {/if}
From 3c0dcea7f0c296a3d0f6e5b1a5c59fe62d09f23a Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:00:09 +0300 Subject: [PATCH 6/6] Update ChannelPopup.svelte --- src/components/ChannelPopup.svelte | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/components/ChannelPopup.svelte b/src/components/ChannelPopup.svelte index 8f4ea8006..cbdfd5c64 100644 --- a/src/components/ChannelPopup.svelte +++ b/src/components/ChannelPopup.svelte @@ -3,6 +3,8 @@ import EditButton from '~/components/EditButton.svelte' import Divider from '~/components/Divider.svelte' import CloseButton from '~/components/CloseButton.svelte' + import BlockedBadge from './BlockedBadge.svelte' + import ClosedBadge from './ClosedBadge.svelte' import { getContext } from 'svelte' export let channel @@ -26,20 +28,10 @@

{channel.displayName}

{#if channel.is_closed} -
- Closed -
+ {/if} {#if channel.is_blocked} -
- Blocked -
+ {/if}