Fix discourse issues (#100)

Signed-off-by: Radu Nichita <[email protected]>

Author: RaduNichita

src/components/DiscourseComments/index.tsx

@@ -1,71 +1,74 @@
 import React, { useEffect } from 'react';
+import { useLocation } from '@docusaurus/router';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 
-type DiscourseEmbedWindow = Window & {
-  DiscourseEmbed?: {
-    discourseUrl: string;
-    discourseEmbedUrl: string;
-    discourseTopicTitle?: string;
-  };
-};
-
-export default function DiscourseComments(): JSX.Element {
+export default function DiscourseComments() {
   const {
     siteConfig: {
+      url,
       themeConfig: { discourseUrl },
     },
-  } = useDocusaurusContext<{ discourseUrl: string }>();
+  } = useDocusaurusContext();
+  const { pathname } = useLocation();
 
-  useEffect(() => {
-    const win = window as DiscourseEmbedWindow;
+  // If discourseUrl is not defined, return null to skip rendering
+  if (!discourseUrl) {
+    console.log('DiscourseComments: No discourseUrl defined in themeConfig, skipping render');
+    return null;
+  }
 
-    if (!win.DiscourseEmbed) {
-      const forum = discourseUrl.endsWith('/') ? discourseUrl : `${discourseUrl}/`;
-      const path = window.location.pathname;
+  if (pathname == "/blog" || pathname == '/blog/') {
+    return;
+  }
 
-      // Use production URL only if not localhost
-      const isLocal = window.location.hostname === 'localhost';
-      const base = isLocal
-        ? 'https://bemanproject.org'
-        : `${window.location.origin}`;
+  useEffect(() => {
 
-      win.DiscourseEmbed = {
-        discourseUrl: forum,
-        discourseEmbedUrl: `${base}${path}`,
-      };
+    const baseUrl = url.endsWith('/') ? url.slice(-1, 1) : url; // Ensure baseUrl does not end with a slash
+    const forum = discourseUrl;
+    const embedUrl = baseUrl + window.location.pathname;
 
-      // Remove existing Discourse iframe if present
-      const existingIframe = document.querySelector('#discourse-comments iframe');
-      if (existingIframe && existingIframe.parentNode) {
-        existingIframe.parentNode.removeChild(existingIframe);
-      }
+    console.log('Discourse comments component mounted');
+    console.log('Base URL:', baseUrl);
+    console.log('Current pathname:', pathname);
+    console.log('Discourse URL:', forum);
+    console.log('Embed URL:', embedUrl);
 
-      // Load or reload the embed script
-      const existingScript = document.querySelector(`script[src="${forum}javascripts/embed.js"]`);
-      if (existingScript) {
-        existingScript.parentNode.removeChild(existingScript);
-      }
+    // Update or set DiscourseEmbed
+    window.DiscourseEmbed = {
+      discourseUrl: forum,
+      discourseEmbedUrl: embedUrl,
+    };
 
-      const script = document.createElement('script');
-      script.src = forum + 'javascripts/embed.js';
-      script.async = true;
-      script.referrerPolicy = 'no-referrer-when-downgrade';
-      script.onload = () => console.log('Discourse script loaded successfully');
-      script.onerror = () => console.error('Failed to load Discourse script');
-      document.body.appendChild(script);
+    // Remove existing Discourse iframe if present
+    const existingIframe = document.querySelector('#discourse-comments iframe');
+    if (existingIframe && existingIframe.parentNode) {
+      existingIframe.parentNode.removeChild(existingIframe);
+    }
 
-      return () => {
-        if (script.parentNode) {
-          script.parentNode.removeChild(script);
-        }
-        // Clean up iframe on unmount
-        const iframe = document.querySelector('#discourse-comments iframe');
-        if (iframe && iframe.parentNode) {
-          iframe.parentNode.removeChild(iframe);
-        }
-      };
+    // Load or reload the embed script
+    const existingScript = document.querySelector(`script[src="${forum}javascripts/embed.js"]`);
+    if (existingScript) {
+      existingScript.parentNode.removeChild(existingScript);
     }
-  }, [discourseUrl]);
 
-  return <div id="discourse-comments" style={{ marginTop: '2rem' }} />;
-}
+    const script = document.createElement('script');
+    script.src = forum + 'javascripts/embed.js';
+    script.async = true;
+    script.onload = () => console.log('Discourse script loaded successfully');
+    script.onerror = () => console.error('Failed to load Discourse script');
+    document.body.appendChild(script);
+
+    return () => {
+      if (script.parentNode) {
+        script.parentNode.removeChild(script);
+      }
+      // Clean up iframe on unmount
+      const iframe = document.querySelector('#discourse-comments iframe');
+      if (iframe && iframe.parentNode) {
+        iframe.parentNode.removeChild(iframe);
+      }
+    };
+  }, [pathname, discourseUrl]); // Depend on pathname to re-run on route changes
+
+  return <div id="discourse-comments" />;
+}

src/theme/BlogPostItem/index.tsx

@@ -17,6 +17,8 @@ export default function BlogPostItemWrapper(props) {
     frontMatter.comments === true || frontMatter.comments === "true";
   const shouldShowComments =
     commentsEnabled && !isBlogListPage && frontMatter.slug;
+  console.log(pathname)
+  console.log(shouldShowComments)
 
   return (
     <>