Allow disabling reactions from content or comments or from both

OdyseeTeam · Apr 11, 2024 · ad84571 · ad84571
1 parent cde4cbe
commit ad84571
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/static/app-strings.json b/static/app-strings.json
@@ -2958,8 +2958,6 @@
   "Publications: %claims%": "Publications: %claims%",
   "Channels:": "Channels",
   "Larger comment histories may take time to load": "Larger comment histories may take time to load",
-  "Disable Slimes Video + Comments": "Disable Slimes Video + Comments",
-  "Disable Reactions Video + Comments": "Disable Reactions Video + Comments",
   "Disable Tipping and Boosting": "Disable Tipping and Boosting",
 
   "--end--": "--end--"

diff --git a/ui/component/commentReactions/index.js b/ui/component/commentReactions/index.js
@@ -6,7 +6,12 @@ import { doToast } from 'redux/actions/notifications';
 import { selectMyReactsForComment, selectOthersReactsForComment } from 'redux/selectors/comments';
 import { doCommentReact } from 'redux/actions/comments';
 import { selectActiveChannelClaim } from 'redux/selectors/app';
-import { DISABLE_REACTIONS_ALL_TAG, DISABLE_SLIMES_ALL_TAG } from 'constants/tags';
+import {
+  DISABLE_REACTIONS_ALL_TAG,
+  DISABLE_SLIMES_ALL_TAG,
+  DISABLE_SLIMES_COMMENTS_TAG,
+  DISABLE_REACTIONS_COMMENTS_TAG,
+} from 'constants/tags';
 
 const select = (state, props) => {
   const activeChannelClaim = selectActiveChannelClaim(state);
@@ -16,8 +21,12 @@ const select = (state, props) => {
 
   return {
     claim,
-    disableReactions: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_REACTIONS_ALL_TAG)(state),
-    disableSlimes: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_SLIMES_ALL_TAG)(state),
+    disableReactions:
+      makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_REACTIONS_ALL_TAG)(state) ||
+      makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_REACTIONS_COMMENTS_TAG)(state),
+    disableSlimes:
+      makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_SLIMES_ALL_TAG)(state) ||
+      makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_SLIMES_COMMENTS_TAG)(state),
     claimIsMine: selectClaimIsMine(state, claim),
     myReacts: selectMyReactsForComment(state, reactionKey),
     othersReacts: selectOthersReactsForComment(state, reactionKey),

diff --git a/ui/component/tagsSearch/view.jsx b/ui/component/tagsSearch/view.jsx
@@ -111,10 +111,6 @@ export default function TagsSearch(props: Props) {
     let label;
     if (t === 'disable-support') {
       label = __('Disable Tipping and Boosting');
-    } else if (t === 'c:disable-reactions-all') {
-      label = __('Disable Reactions Video + Comments');
-    } else if (t === 'c:disable-slimes-all') {
-      label = __('Disable Slimes Video + Comments');
     } else {
       label = __(
         t

diff --git a/ui/constants/tags.js b/ui/constants/tags.js
@@ -23,8 +23,10 @@ export const LBRY_FIRST_TAG = 'c:lbry-first';
 export const DISABLE_DOWNLOAD_BUTTON_TAG = 'c:disable-download';
 export const DISABLE_REACTIONS_ALL_TAG = 'c:disable-reactions-all';
 export const DISABLE_REACTIONS_VIDEO_TAG = 'c:disable-reactions-video';
+export const DISABLE_REACTIONS_COMMENTS_TAG = 'c:disable-reactions-comments';
 export const DISABLE_SLIMES_ALL_TAG = 'c:disable-slimes-all';
 export const DISABLE_SLIMES_VIDEO_TAG = 'c:disable-slimes-video';
+export const DISABLE_SLIMES_COMMENTS_TAG = 'c:disable-slimes-comments';
 
 export const PURCHASE_TAG = 'c:purchase';
 export const RENTAL_TAG = 'c:rental';
@@ -50,16 +52,23 @@ export const SCHEDULED_TAGS = Object.freeze({
 export const CONTROL_TAGS = [
   DISABLE_SUPPORT_TAG,
   DISABLE_DOWNLOAD_BUTTON_TAG,
-  DISABLE_REACTIONS_ALL_TAG,
   DISABLE_REACTIONS_VIDEO_TAG,
-  DISABLE_SLIMES_ALL_TAG,
+  DISABLE_REACTIONS_COMMENTS_TAG,
   DISABLE_SLIMES_VIDEO_TAG,
+  DISABLE_SLIMES_COMMENTS_TAG,
 ];
 
 // System tags are special tags that are not available to the user.
 export const SYSTEM_TAGS = [LBRY_FIRST_TAG, ...Object.values(VISIBILITY_TAGS), ...Object.values(SCHEDULED_TAGS)];
 
-export const INTERNAL_TAGS = [...CONTROL_TAGS, ...SYSTEM_TAGS, ...MEMBERS_ONLY_TAGS, PREFERENCE_EMBED];
+export const INTERNAL_TAGS = [
+  ...CONTROL_TAGS,
+  ...SYSTEM_TAGS,
+  ...MEMBERS_ONLY_TAGS,
+  PREFERENCE_EMBED,
+  DISABLE_REACTIONS_ALL_TAG,
+  DISABLE_SLIMES_ALL_TAG,
+];
 
 export const MATURE_TAGS = Object.freeze([
   'porn',