From e164a3b9a1d0477cd8441072c4683c3fdaebb8e3 Mon Sep 17 00:00:00 2001
From: Alec Armbruster <alectrocute@gmail.com>
Date: Fri, 16 Jun 2023 19:10:25 -0400
Subject: [PATCH] attempt to fix crazy merge fiasco

---
 .github/CODEOWNERS                         |  2 +-
 .github/ISSUE_TEMPLATE/BUG_REPORT.yml      |  2 +-
 .github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml |  2 +-
 Dockerfile                                 |  2 +-
 dev.dockerfile                             |  2 +-
 package.json                               |  2 +-
 src/assets/css/main.css                    | 24 ----------------------
 src/shared/components/common/html-tags.tsx |  7 +++----
 8 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6df17d57..76916e60 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @dessalines @SleeplessOne1917
+* @dessalines @SleeplessOne1917 @alectrocute
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 2273a138..ae2d4e51 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -21,7 +21,7 @@ body:
         - label: Is this only a single bug? Do not put multiple bugs in one issue.
           required: true
         - label: Is this a server side (not related to the UI) issue? Use the [Lemmy back end](https://github.com/LemmyNet/lemmy) repo.
-          required: true
+          required: false
   - type: textarea
     id: summary
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
index 2f6f3fc1..3c75050a 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -19,7 +19,7 @@ body:
         - label: Is this only a feature request? Do not put multiple feature requests in one issue.
           required: true
         - label: Is this a server side (not related to the UI) issue? Use the [Lemmy back end](https://github.com/LemmyNet/lemmy) repo.
-          required: true
+          required: false
   - type: textarea
     id: problem
     attributes:
diff --git a/Dockerfile b/Dockerfile
index 3d6d6212..2b36581d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder
+FROM node:20.2-alpine as builder
 RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache
 RUN curl -sf https://gobinaries.com/tj/node-prune | sh
 
diff --git a/dev.dockerfile b/dev.dockerfile
index 0e925c0a..3bfc10da 100644
--- a/dev.dockerfile
+++ b/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder
+FROM node:20.2-alpine as builder
 RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache
 
 WORKDIR /usr/src/app
diff --git a/package.json b/package.json
index 2298d9e1..b7c48c79 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "inferno-server": "^8.1.1",
     "isomorphic-cookie": "^1.2.4",
     "jwt-decode": "^3.1.2",
-    "lemmy-js-client": "0.17.2-rc.24",
+    "lemmy-js-client": "0.18.0-rc.1",
     "lodash": "^4.17.21",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index e1adfc53..82f8433e 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -80,30 +80,6 @@
   overflow-x: auto;
 }
 
-.md-div table {
-  border-collapse: collapse;
-  width: 100%;
-  margin-bottom: 1rem;
-  border: 1px solid var(--dark);
-}
-
-.md-div table th,
-.md-div table td {
-  padding: 0.3rem;
-  vertical-align: top;
-  border-top: 1px solid var(--dark);
-  border: 1px solid var(--dark);
-}
-
-.md-div table thead th {
-  vertical-align: bottom;
-  border-bottom: 2px solid var(--dark);
-}
-
-.md-div table tbody + tbody {
-  border-top: 2px solid var(--dark);
-}
-
 .vote-bar {
   margin-top: -6.5px;
 }
diff --git a/src/shared/components/common/html-tags.tsx b/src/shared/components/common/html-tags.tsx
index 0e6cb2d0..387cd041 100644
--- a/src/shared/components/common/html-tags.tsx
+++ b/src/shared/components/common/html-tags.tsx
@@ -2,8 +2,8 @@ import { htmlToText } from "html-to-text";
 import { Component } from "inferno";
 import { Helmet } from "inferno-helmet";
 import { httpExternalPath } from "../../env";
-import { getLanguages, md } from "../../utils";
-
+import { i18n } from "../../i18next";
+import { md } from "../../utils";
 interface HtmlTagsProps {
   title: string;
   path: string;
@@ -17,11 +17,10 @@ export class HtmlTags extends Component<HtmlTagsProps, any> {
     const url = httpExternalPath(this.props.path);
     const desc = this.props.description;
     const image = this.props.image;
-    const lang = getLanguages()[0];
 
     return (
       <Helmet title={this.props.title}>
-        <html lang={lang == "browser" ? "en" : lang} />
+        <html lang={i18n.resolvedLanguage} />
 
         {["title", "og:title", "twitter:title"].map(t => (
           <meta key={t} property={t} content={this.props.title} />