fix: disable non-deterministic slug_short

GaiAma · Dec 10, 2019 · 7ff0ed7 · 7ff0ed7
1 parent e1537a7
commit 7ff0ed7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/gatsby/createPages.js b/gatsby/createPages.js
@@ -78,26 +78,26 @@ module.exports = store => ({ actions, getNodes, graphql }) => {
       })
 
       // set up short url redirects
-      const slugShort = isHomePage(node) ? `/` : `/${index}`
-      createNodeField({
-        node,
-        name: `slug_short`,
-        value: notIsErrorPage(node) ? slugShort : null,
-      })
+      // const slugShort = isHomePage(node) ? `/` : `/${index}`
+      // createNodeField({
+      //   node,
+      //   name: `slug_short`,
+      //   value: notIsErrorPage(node) ? slugShort : null,
+      // })
       if (notIsErrorPage(node)) {
-        redirects.push(
-          [
-            slugShort,
-            url + isHomePage(node)
-              ? ``
-              : `?ref=${encodeURIComponent(slugShort)}`,
-            `301!`,
-            node.frontmatter.lang === `de` && `Language=de`,
-          ]
-            .filter(Boolean)
-            .join(` `)
-            .trim()
-        )
+        // redirects.push(
+        //   [
+        //     slugShort,
+        //     url + (isHomePage(node)
+        //       ? ``
+        //       : `?ref=${encodeURIComponent(slugShort)}`),
+        //     `301!`,
+        //     node.frontmatter.lang === `de` && `Language=de`,
+        //   ]
+        //     .filter(Boolean)
+        //     .join(` `)
+        //     .trim()
+        // )
 
         // &fb_locale=en_US redirections as in https://stackoverflow.com/a/20827962/3484824
         node.fields.translations

diff --git a/gatsby/sourceNodes.js b/gatsby/sourceNodes.js
@@ -25,7 +25,7 @@ module.exports = store =>
       older: Mdx
       all: Mdx
       translations: [Translations]
-      slug_short: String
+      # slug_short: String
     }
     type Mdx implements Node {
       fields: MdxFields

diff --git a/src/components/ShareWidget.js b/src/components/ShareWidget.js
@@ -104,9 +104,10 @@ class ShareWidget extends Component {
 
   getLink = () =>
     this.props.siteUrl +
-    (this.state.showFullUrl
-      ? this.props.post.fields.url
-      : this.props.post.fields.slug_short)
+    // (this.state.showFullUrl
+    //   ?
+    this.props.post.fields.url
+  // : this.props.post.fields.slug_short)
 
   onLinkModalButtonClick = ({ metaKey }) =>
     metaKey ? this.copyToClipboard() : this.toggleLinkModal()
@@ -157,9 +158,10 @@ class ShareWidget extends Component {
       siteUrl,
       ...props
     } = this.props
-    const { title, tweet_id, lang } = post.frontmatter
+    const { title, tweet_id: tweetId, lang } = post.frontmatter
     const link = siteUrl + post.fields.url
-    const shortLink = siteUrl + post.fields.slug_short
+    // const shortLink = siteUrl + post.fields.slug_short
+    const shortLink = link
 
     return (
       <Container id="sharewidget" {...props}>
@@ -195,9 +197,9 @@ class ShareWidget extends Component {
           >
             <StyledA
               href={
-                tweet_id
+                tweetId
                   ? `https://twitter.com/intent/retweet?tweet_id=${encodeURIComponent(
-                      tweet_id
+                      tweetId
                     )}`
                   : `http://twitter.com/share?text=${encodeURIComponent(
                       title

diff --git a/src/templates/BlogPost.js b/src/templates/BlogPost.js
@@ -63,7 +63,8 @@ const BlogPost = props => {
           podcast={post.frontmatter.podcast}
           podcastPlayerMeta={PodcastPlayerMeta}
           shortUrl={
-            props.data.site.siteMetadata.siteUrl + post.fields.slug_short
+            // props.data.site.siteMetadata.siteUrl + post.fields.slug_short
+            props.data.site.siteMetadata.siteUrl + post.fields.url
           }
         />
 
@@ -275,7 +276,7 @@ export const query = graphql`
         dateTime
         dateStr
         dateStrLocalized
-        slug_short
+        # slug_short
         url
         translations {
           fields {