Merge pull request #159 from dassiorleando/fix-disqus-url

Improved disqus settings to use the provided site URL.

Author: styxlab

components/DisqusComments.tsx

@@ -1,13 +1,16 @@
 import { DiscussionEmbed } from 'disqus-react'
 import { GhostPostOrPage } from '@lib/ghost'
+import { resolvePostFullPath } from '@utils/routing'
 
 interface DisqusCommentsProps {
   post: GhostPostOrPage
   shortname: string
+  siteUrl: string
 }
 
-export const DisqusComments = ({ post, shortname }: DisqusCommentsProps) => {
-  const { url, id: identifier, title } = post
+export const DisqusComments = ({ post, shortname, siteUrl }: DisqusCommentsProps) => {
+  const url = resolvePostFullPath(siteUrl, post.slug)
+  const { id: identifier, title } = post
   const config = { url, identifier, title }
 
   return (

components/Post.tsx

@@ -156,7 +156,7 @@ export const Post = ({ cmsData }: PostProps) => {
 
                 {commenting.system === 'commento' && <CommentoComments {...{ id: post.id, url: commenting.commentoUrl }} />}
 
-                {commenting.system === 'disqus' && <DisqusComments {...{ post, shortname: commenting.disqusShortname }} />}
+                {commenting.system === 'disqus' && <DisqusComments {...{ post, shortname: commenting.disqusShortname, siteUrl: processEnv.siteUrl }} />}
               </article>
             </div>
           </Layout>

utils/routing.ts

@@ -38,3 +38,7 @@ export const resolveUrl = ({ cmsUrl, collectionPath = `/`, slug, url }: ResolveU
   const dirUrl = url.replace(cmsUrl, '/').replace('//', '/')
   return resolvePath(dirUrl)
 }
+
+export const resolvePostFullPath = (siteUrl: string, slug: string) => {
+  return `${trimSlash(siteUrl)}/${slug}`
+}