From 871a933fb4d4d99c3e7c20ed68d5be232e845368 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Mon, 7 Nov 2022 16:24:52 -0500
Subject: [PATCH] add yrbl to block page; dont do recsys plugin

---
 static/app-strings.json                       |  1 +
 .../viewers/videoViewer/internal/videojs.jsx  |  8 +--
 ui/page/show/view.jsx                         | 71 +++++++++++--------
 3 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 491c7edae..fd870d5c1 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2321,5 +2321,6 @@
   "Autoplay Next is on.": "Autoplay Next is on.",
   "Content Blocked": "Content Blocked",
   "Your hub has blocked %content% because it subscribes to the following blocking channel:": "Your hub has blocked %content% because it subscribes to the following blocking channel:",
+  "Your hub has blocked %content% because it subscribes to %channel%. You can change your hub in %settings%.": "Your hub has blocked %content% because it subscribes to %channel%. You can change your hub in %settings%.",
   "--end--": "--end--"
 }
diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx
index 11e77a892..344622d84 100644
--- a/ui/component/viewers/videoViewer/internal/videojs.jsx
+++ b/ui/component/viewers/videoViewer/internal/videojs.jsx
@@ -9,7 +9,7 @@ import eventTracking from 'videojs-event-tracking';
 import * as OVERLAY from './overlays';
 import './plugins/videojs-mobile-ui/plugin';
 import hlsQualitySelector from './plugins/videojs-hls-quality-selector/plugin';
-import recsys from './plugins/videojs-recsys/plugin';
+// import recsys from './plugins/videojs-recsys/plugin'; // points to view tracking plugin
 import qualityLevels from 'videojs-contrib-quality-levels';
 import LbryVolumeBarClass from './lbry-volume-bar';
 import keyboardShorcuts from './videojs-keyboard-shortcuts';
@@ -92,9 +92,9 @@ if (!Object.keys(videojs.getPlugins()).includes('qualityLevels')) {
   videojs.registerPlugin('qualityLevels', qualityLevels);
 }
 
-if (!Object.keys(videojs.getPlugins()).includes('recsys')) {
-  videojs.registerPlugin('recsys', recsys);
-}
+// if (!Object.keys(videojs.getPlugins()).includes('recsys')) {
+// videojs.registerPlugin('recsys', recsys);
+// }
 
 // ****************************************************************************
 // VideoJs
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index 49677f004..78227d651 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -1,12 +1,12 @@
 // @flow
 import * as PAGES from 'constants/pages';
+import I18nMessage from 'component/i18nMessage';
 import React, { useEffect } from 'react';
 import { Redirect, useHistory } from 'react-router-dom';
 import Spinner from 'component/spinner';
 import ChannelPage from 'page/channel';
 import Page from 'component/page';
 import Button from 'component/button';
-import Card from 'component/common/card';
 import { formatLbryUrlForWeb } from 'util/url';
 import { parseURI } from 'util/lbryURI';
 import * as COLLECTIONS_CONSTS from 'constants/collections';
@@ -117,6 +117,7 @@ function ShowPage(props: Props) {
         {!isResolvingUri && !isSubscribed && (
           <div className="main--empty">
             <Yrbl
+              type={'sad'}
               title={isChannel ? __('Channel Not Found') : __('No Content Found')}
               subtitle={
                 isChannel ? (
@@ -147,37 +148,49 @@ function ShowPage(props: Props) {
   } else if (isBlacklisted && !claimIsMine) {
     innerContent = isBlacklistedDueToDMCA ? (
       <Page>
-        <Card
-          title={uri}
-          subtitle={__(
-            'Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.'
-          )}
-          actions={
-            <div className="section__actions">
-              <Button button="link" href="https://lbry.com/faq/dmca" label={__('Read More')} />
-            </div>
-          }
-        />
+        <div className="main--empty">
+          <Yrbl
+            title={isChannel ? __('Channel Not Found') : __('No Content Found')}
+            subtitle={__(
+              'Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.'
+            )}
+            actions={
+              <div className="section__actions">
+                <Button button="link" href="https://lbry.com/faq/dmca" label={__('Read More')} />
+              </div>
+            }
+          />
+        </div>
       </Page>
     ) : (
       <Page>
-        <Card
-          title={__('Content Blocked')}
-          subtitle={
-            <>
-              {errorCensor &&
-                __(`Your hub has blocked %content% because it subscribes to the following blocking channel:`, {
-                  content: uri,
-                })}{' '}
-              <Button
-                button="link"
-                navigate={errorCensor && errorCensor.canonical_url}
-                label={errorCensor && errorCensor.name}
-              />
-              {errorCensor && <div className={'error__text'}>{`\nMessage:\n${errorCensor.text}\n`}</div>}
-            </>
-          }
-        />
+        <div className="main--empty">
+          <Yrbl
+            type={'sad'}
+            title={__('Content Blocked')}
+            subtitle={
+              <div>
+                <I18nMessage
+                  tokens={{
+                    content: uri,
+                    settings: <Button button="link" label={__('Settings')} navigate={`/$/${PAGES.SETTINGS}`} />,
+                    channel: (
+                      <Button
+                        button="link"
+                        navigate={errorCensor && errorCensor.canonical_url}
+                        label={errorCensor && errorCensor.name}
+                      />
+                    ),
+                  }}
+                >
+                  Your hub has blocked %content% because it subscribes to %channel%. You can change your hub in
+                  %settings%.
+                </I18nMessage>
+                {/* {errorCensor && <p>{`Message:\n${errorCensor.text}`}</p>} */}
+              </div>
+            }
+          />
+        </div>
       </Page>
     );
   } else if (claim) {