attempt to fix crazy merge fiasco

[lemmy-ui.git] / src / shared / components / common / html-tags.tsx
diff --git a/src/shared/components/common/html-tags.tsx b/src/shared/components/common/html-tags.tsx

index 56cf3238ed0abf23407c449efd27bdda03655eae..387cd041302ef55d08337b86acd3129f1359131f 100644 (file)
--- a/src/shared/components/common/html-tags.tsx
+++ b/src/shared/components/common/html-tags.tsx
@@ -1,23 +1,27 @@
-import { Option } from "@sniptt/monads";
+import { htmlToText } from "html-to-text";
  import { Component } from "inferno";
  import { Helmet } from "inferno-helmet";
  import { httpExternalPath } from "../../env";
+import { i18n } from "../../i18next";
  import { md } from "../../utils";
-
  interface HtmlTagsProps {
    title: string;
    path: string;
-  description: Option<string>;
-  image: Option<string>;
+  description?: string;
+  image?: string;
  }
  
  /// Taken from https://metatags.io/
  export class HtmlTags extends Component<HtmlTagsProps, any> {
    render() {
-    let url = httpExternalPath(this.props.path);
+    const url = httpExternalPath(this.props.path);
+    const desc = this.props.description;
+    const image = this.props.image;
  
      return (
        <Helmet title={this.props.title}>
+        <html lang={i18n.resolvedLanguage} />
+
          {["title", "og:title", "twitter:title"].map(t => (
            <meta key={t} property={t} content={this.props.title} />
          ))}
@@ -32,19 +36,19 @@ export class HtmlTags extends Component<HtmlTagsProps, any> {
          <meta property="twitter:card" content="summary_large_image" />
  
          {/* Optional desc and images */}
-        {this.props.description.isSome() &&
-          ["description", "og:description", "twitter:description"].map(n => (
-            <meta
-              key={n}
-              name={n}
-              content={md.renderInline(this.props.description.unwrap())}
-            />
-          ))}
-
-        {this.props.image.isSome() &&
-          ["og:image", "twitter:image"].map(p => (
-            <meta key={p} property={p} content={this.props.image.unwrap()} />
-          ))}
+        {["description", "og:description", "twitter:description"].map(
+          n =>
+            desc && (
+              <meta
+                key={n}
+                name={n}
+                content={htmlToText(md.renderInline(desc))}
+              />
+            )
+        )}
+        {["og:image", "twitter:image"].map(
+          p => image && <meta key={p} property={p} content={image} />
+        )}
        </Helmet>
      );
    }