Merge branch 'extension' of https://github.com/movie-web/movie-web into extension

src/assets/locales/en.json

@@ -277,6 +277,17 @@
         "homeButton": "Back to home",
         "text": "We couldn't find the media you requested. Either it's been removed or you tampered with the URL.",
         "title": "Couldn't find that media."
+      },
+      "extensionPermission": {
+        "badge": "Permission Missing",
+        "title": "Configure the extension",
+        "text": "You have the browser extension, but we need your permission to get started using the extension.",
+        "button": "Use extension"
+      },
+      "dmca": {
+        "badge": "Removed",
+        "title": "Media has been removed",
+        "text": "This media is no longer available due to a takedown notice or copyright claim."
       }
     },
     "nextEpisode": {

src/backend/extension/messaging.ts

@@ -67,5 +67,5 @@ export async function isExtensionActive(): Promise<boolean> {
   if (!info?.success) return false;
   const allowedVersion = isAllowedExtensionVersion(info.version);
   if (!allowedVersion) return false;
-  return true;
+  return info.allowed && info.hasPermission;
 }

src/pages/parts/player/MetaPart.tsx

@@ -46,11 +46,10 @@ export function MetaPart(props: MetaPartProps) {
   const { error, value, loading } = useAsync(async () => {
     const info = await extensionInfo();
     const isValidExtension =
-      info?.success && isAllowedExtensionVersion(info.version);
+      info?.success && isAllowedExtensionVersion(info.version) && info.allowed;
 
     if (isValidExtension) {
-      if (!info.allowed || !info.hasPermission)
-        throw new Error("extension-no-permission");
+      if (!info.hasPermission) throw new Error("extension-no-permission");
     }
 
     // use api metadata or providers metadata
@@ -117,13 +116,10 @@ export function MetaPart(props: MetaPartProps) {
       <ErrorLayout>
         <ErrorContainer>
           <IconPill icon={Icons.WAND}>
-            {t("player.metadata.failed.badge")}
+            {t("player.metadata.extensionPermission.badge")}
           </IconPill>
-          <Title>Configure the extension</Title>
-          <Paragraph>
-            You have the browser extension, but we need your permission to get
-            started using the extension.
-          </Paragraph>
+          <Title>{t("player.metadata.extensionPermission.title")}</Title>
+          <Paragraph>{t("player.metadata.extensionPermission.text")}</Paragraph>
           <Button
             onClick={() => {
               sendPage({
@@ -135,7 +131,7 @@ export function MetaPart(props: MetaPartProps) {
             padding="md:px-12 p-2.5"
             className="mt-6"
           >
-            Use extension
+            {t("player.metadata.extensionPermission.button")}
           </Button>
         </ErrorContainer>
       </ErrorLayout>
@@ -146,12 +142,11 @@ export function MetaPart(props: MetaPartProps) {
     return (
       <ErrorLayout>
         <ErrorContainer>
-          <IconPill icon={Icons.DRAGON}>Removed</IconPill>
-          <Title>Media has been removed</Title>
-          <Paragraph>
-            This media is no longer available due to a takedown notice or
-            copyright claim.
-          </Paragraph>
+          <IconPill icon={Icons.DRAGON}>
+            {t("player.metadata.dmca.badge")}
+          </IconPill>
+          <Title>{t("player.metadata.dmca.title")}</Title>
+          <Paragraph>{t("player.metadata.dmca.text")}</Paragraph>
           <Button
             href="/"
             theme="purple"