From cedf5503bb884ab7c7681156ad6128e9bdf0af93 Mon Sep 17 00:00:00 2001 From: Jamah Akbary Date: Mon, 15 Nov 2021 11:04:17 +0100 Subject: [PATCH 1/6] hiding sub gift button on viewerCard --- .../twitch-twilight/modules/chat/viewer_card.jsx | 11 +++++++++++ .../css_tweaks/styles/hide-gift-subscribe-button.scss | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss diff --git a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx index 724da3fb..f022ae37 100644 --- a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx +++ b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx @@ -17,6 +17,16 @@ export default class ViewerCards extends Module { this.last_login = null; + this.settings.add('chat.viewer-cards.hide-gift-subscribe-button', { + default: '', + ui: { + path: 'Chat > Viewer Cards >> Appearance', + title: 'Hide the gift-subscribe-button on the viewer card', + component: 'setting-check-box' + }, + changed: val => this.css_tweaks.toggle('hide-gift-subscribe-button', val) + }); + this.settings.add('chat.viewer-cards.highlight-chat', { default: false, ui: { @@ -52,6 +62,7 @@ export default class ViewerCards extends Module { onEnable() { this.chat.context.on('changed:chat.viewer-cards.highlight-chat', this.refreshStyle, this); this.chat.context.on('changed:chat.viewer-cards.color', this.refreshStyle, this); + this.toggle('hide-gift-subscribe-button', this.settings.get('chat.viewer-cards.hide-gift-subscribe-button')); this.on('..:update-colors', this.refreshStyle, this); this.ViewerCard.on('mount', this.updateCard, this); diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss new file mode 100644 index 00000000..88562edc --- /dev/null +++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss @@ -0,0 +1,3 @@ +button[data-test-selector="gift-subscribe-button"] { + display: none !important; +} \ No newline at end of file From 3a4171cabe8f39d4f4ae427e0c4ee9da705ae074 Mon Sep 17 00:00:00 2001 From: Jamah Akbary Date: Mon, 15 Nov 2021 12:26:14 +0100 Subject: [PATCH 2/6] smal fix --- src/sites/twitch-twilight/modules/chat/viewer_card.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx index f022ae37..c45470c0 100644 --- a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx +++ b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx @@ -62,7 +62,7 @@ export default class ViewerCards extends Module { onEnable() { this.chat.context.on('changed:chat.viewer-cards.highlight-chat', this.refreshStyle, this); this.chat.context.on('changed:chat.viewer-cards.color', this.refreshStyle, this); - this.toggle('hide-gift-subscribe-button', this.settings.get('chat.viewer-cards.hide-gift-subscribe-button')); + this.css_tweaks.toggle('hide-gift-subscribe-button', this.settings.get('chat.viewer-cards.hide-gift-subscribe-button')); this.on('..:update-colors', this.refreshStyle, this); this.ViewerCard.on('mount', this.updateCard, this); From d60ee47e1a0ab15e8dddffaf39a17a23ea4c1d5a Mon Sep 17 00:00:00 2001 From: Jamah Akbary Date: Mon, 15 Nov 2021 21:17:26 +0100 Subject: [PATCH 3/6] requested changes done --- src/sites/twitch-twilight/modules/chat/viewer_card.jsx | 9 +++++---- src/sites/twitch-twilight/modules/css_tweaks/index.js | 4 +++- .../css_tweaks/styles/hide-gift-subscribe-button.scss | 3 --- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss diff --git a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx index c45470c0..89b7fc41 100644 --- a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx +++ b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx @@ -18,13 +18,12 @@ export default class ViewerCards extends Module { this.last_login = null; this.settings.add('chat.viewer-cards.hide-gift-subscribe-button', { - default: '', + default: false, ui: { path: 'Chat > Viewer Cards >> Appearance', - title: 'Hide the gift-subscribe-button on the viewer card', + title: 'Hide "Gift a Sub" button on viewer cards', component: 'setting-check-box' }, - changed: val => this.css_tweaks.toggle('hide-gift-subscribe-button', val) }); this.settings.add('chat.viewer-cards.highlight-chat', { @@ -62,7 +61,9 @@ export default class ViewerCards extends Module { onEnable() { this.chat.context.on('changed:chat.viewer-cards.highlight-chat', this.refreshStyle, this); this.chat.context.on('changed:chat.viewer-cards.color', this.refreshStyle, this); - this.css_tweaks.toggle('hide-gift-subscribe-button', this.settings.get('chat.viewer-cards.hide-gift-subscribe-button')); + this.chat.context.getChanges('chat.viewer-cards.hide-gift-subscribe-button', val => + this.css_tweaks.toggleHide('hide-gift-subscribe-button', val) + ); this.on('..:update-colors', this.refreshStyle, this); this.ViewerCard.on('mount', this.updateCard, this); diff --git a/src/sites/twitch-twilight/modules/css_tweaks/index.js b/src/sites/twitch-twilight/modules/css_tweaks/index.js index 80bc8b3c..bbdef722 100644 --- a/src/sites/twitch-twilight/modules/css_tweaks/index.js +++ b/src/sites/twitch-twilight/modules/css_tweaks/index.js @@ -46,7 +46,9 @@ const CLASSES = { 'not-live-bar': 'div[data-test-selector="non-live-video-banner-layout"]', 'channel-live-ind': '.channel-header__user .tw-channel-status-text-indicator,.channel-info-content .tw-halo__indicator', 'celebration': 'body .celebration__overlay', - 'mod-view': '.chat-input__buttons-container a[href*="/moderator"]' + 'mod-view': '.chat-input__buttons-container a[href*="/moderator"]', + + 'hide-gift-subscribe-button': 'button[data-test-selector="gift-subscribe-button"]' }; diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss deleted file mode 100644 index 88562edc..00000000 --- a/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-gift-subscribe-button.scss +++ /dev/null @@ -1,3 +0,0 @@ -button[data-test-selector="gift-subscribe-button"] { - display: none !important; -} \ No newline at end of file From 28928e5278d1a0c5184d11fd69532724e1d128b6 Mon Sep 17 00:00:00 2001 From: Jamah Akbary Date: Sat, 20 Nov 2021 19:20:23 +0100 Subject: [PATCH 4/6] more specific selection for gift sub button --- src/sites/twitch-twilight/modules/chat/viewer_card.jsx | 6 +++--- src/sites/twitch-twilight/modules/css_tweaks/index.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx index 89b7fc41..9a735291 100644 --- a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx +++ b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx @@ -17,7 +17,7 @@ export default class ViewerCards extends Module { this.last_login = null; - this.settings.add('chat.viewer-cards.hide-gift-subscribe-button', { + this.settings.add('chat.viewer-cards.viewer-card-gift-subscribe-button', { default: false, ui: { path: 'Chat > Viewer Cards >> Appearance', @@ -61,8 +61,8 @@ export default class ViewerCards extends Module { onEnable() { this.chat.context.on('changed:chat.viewer-cards.highlight-chat', this.refreshStyle, this); this.chat.context.on('changed:chat.viewer-cards.color', this.refreshStyle, this); - this.chat.context.getChanges('chat.viewer-cards.hide-gift-subscribe-button', val => - this.css_tweaks.toggleHide('hide-gift-subscribe-button', val) + this.chat.context.getChanges('chat.viewer-cards.viewer-card-gift-subscribe-button', val => + this.css_tweaks.toggleHide('viewer-card-gift-subscribe-button', val) ); this.on('..:update-colors', this.refreshStyle, this); diff --git a/src/sites/twitch-twilight/modules/css_tweaks/index.js b/src/sites/twitch-twilight/modules/css_tweaks/index.js index bbdef722..6c436189 100644 --- a/src/sites/twitch-twilight/modules/css_tweaks/index.js +++ b/src/sites/twitch-twilight/modules/css_tweaks/index.js @@ -48,7 +48,7 @@ const CLASSES = { 'celebration': 'body .celebration__overlay', 'mod-view': '.chat-input__buttons-container a[href*="/moderator"]', - 'hide-gift-subscribe-button': 'button[data-test-selector="gift-subscribe-button"]' + 'viewer-card-gift-subscribe-button': '.viewer-card button[data-test-selector="gift-subscribe-button"]' }; From 84631fb80209537054653b413f63f3c272a8b189 Mon Sep 17 00:00:00 2001 From: Jamah Akbary Date: Sat, 20 Nov 2021 21:43:41 +0100 Subject: [PATCH 5/6] Hiding all Subgift button i could find --- .../twitch-twilight/modules/chat/viewer_card.jsx | 10 +++++++++- src/sites/twitch-twilight/modules/css_tweaks/index.js | 11 +++++++++++ .../css_tweaks/styles/hide-all-sub-gifting.scss | 4 ++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/sites/twitch-twilight/modules/css_tweaks/styles/hide-all-sub-gifting.scss diff --git a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx index 9a735291..649aea7d 100644 --- a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx +++ b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx @@ -18,10 +18,18 @@ export default class ViewerCards extends Module { this.last_login = null; this.settings.add('chat.viewer-cards.viewer-card-gift-subscribe-button', { - default: false, + requires: ['channel.hide-all-sub-gifting'], + default: null, + process(ctx, val) { + if ( val != null ) + return val; + + return ctx.get('channel.hide-all-sub-gifting') + }, ui: { path: 'Chat > Viewer Cards >> Appearance', title: 'Hide "Gift a Sub" button on viewer cards', + description: 'By default, this inherits its value from [Channel > Appearance > Hide all "Gift a Sub" button](~channel.hide-all-sub-gifting)\'', component: 'setting-check-box' }, }); diff --git a/src/sites/twitch-twilight/modules/css_tweaks/index.js b/src/sites/twitch-twilight/modules/css_tweaks/index.js index 6c436189..802f0f9c 100644 --- a/src/sites/twitch-twilight/modules/css_tweaks/index.js +++ b/src/sites/twitch-twilight/modules/css_tweaks/index.js @@ -407,6 +407,16 @@ export default class CSSTweaks extends Module { changed: val => this.toggle('hide-unfollow-button', val) }); + this.settings.add('channel.hide-all-sub-gifting', { + default: false, + ui: { + path: 'Channel > Appearance >> General', + title: 'Hide all "Gift a Sub" button.', + component: 'setting-check-box' + }, + changed: val => this.toggle('hide-all-sub-gifting', val) + }); + this.settings.add('channel.hide-live-indicator', { requires: ['context.route.name'], process(ctx, val) { @@ -461,6 +471,7 @@ export default class CSSTweaks extends Module { this.toggleHide('prime-offers', !this.settings.get('layout.prime-offers')); this.toggleHide('top-discover', !this.settings.get('layout.discover')); this.toggle('hide-unfollow-button', this.settings.get('channel.hide-unfollow')); + this.toggle('hide-all-sub-gifting', this.settings.get('channel.hide-all-sub-gifting')); this.toggle('square-avatars', ! this.settings.get('channel.round-avatars')); //this.toggleHide('not-live-bar', this.settings.get('channel.hide-not-live-bar')); diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-all-sub-gifting.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-all-sub-gifting.scss new file mode 100644 index 00000000..6a991ad9 --- /dev/null +++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/hide-all-sub-gifting.scss @@ -0,0 +1,4 @@ +.support-panel > div:not(.scrollable-area) button:not(.tw-interactable):not(.tw-purchase-button), +button[data-test-selector="gift-subscribe-button"] { + display: none !important; +} \ No newline at end of file From b9a171986868baa416798bfef220ce3a78639e5b Mon Sep 17 00:00:00 2001 From: Jamah Akbary Date: Sat, 20 Nov 2021 22:12:27 +0100 Subject: [PATCH 6/6] fix link --- src/sites/twitch-twilight/modules/chat/viewer_card.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx index 649aea7d..9c0b46e1 100644 --- a/src/sites/twitch-twilight/modules/chat/viewer_card.jsx +++ b/src/sites/twitch-twilight/modules/chat/viewer_card.jsx @@ -29,7 +29,7 @@ export default class ViewerCards extends Module { ui: { path: 'Chat > Viewer Cards >> Appearance', title: 'Hide "Gift a Sub" button on viewer cards', - description: 'By default, this inherits its value from [Channel > Appearance > Hide all "Gift a Sub" button](~channel.hide-all-sub-gifting)\'', + description: 'By default, this inherits its value from [Channel > Appearance > Hide all "Gift a Sub" button](~channel.appearance)', component: 'setting-check-box' }, });