Merge branch 'main' into error-status-codes

src/assets/css/themes/_variables.darkly-pureblack.scss

@@ -0,0 +1,117 @@
+@import "./variables";
+
+// Colors
+$white: #f3f3f3;
+$gray-200: #ebebeb;
+$gray-300: #dee2e6;
+$gray-500: #adb5bd;
+$gray-600: #666;
+$gray-700: #333;
+$gray-800: #202020;
+$gray-900: #111;
+$black: #000;
+
+$blue: #375a7f;
+$red: #e74c3c;
+$yellow: #f39c12;
+$green: #00bc8c;
+$cyan: #3498db;
+
+$primary: $green;
+$secondary: $gray-700;
+$success: $green;
+$dark: $gray-300;
+
+$body-color: $gray-200;
+$body-bg: $black;
+$link-color: $success;
+$border-color: rgba($body-color, 0.25);
+$mark-bg: $gray-900;
+$text-muted: $gray-600;
+$yiq-contrasted-threshold: 175;
+
+$font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI",
+  Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji",
+  "Segoe UI Emoji", "Segoe UI Symbol";
+$font-size-base: 0.9375rem;
+$h1-font-size: 3rem;
+$h2-font-size: 2.5rem;
+$h3-font-size: 2rem;
+
+$card-cap-bg: $gray-900;
+$card-bg: $gray-900;
+$card-color: $gray-300;
+
+$navbar-padding-y: 1rem;
+$navbar-dark-color: rgba($white, 0.6);
+$navbar-dark-hover-color: $white;
+$navbar-light-color: rgba($white, 0.6);
+$navbar-light-hover-color: $white;
+$navbar-light-active-color: $white;
+$navbar-light-toggler-border-color: rgba($gray-900, 0.1);
+$navbar-light-brand-color: $white;
+$navbar-light-brand-hover-color: $navbar-light-brand-color;
+
+$nav-link-padding-x: 2rem;
+$nav-link-disabled-color: $gray-500;
+
+$nav-tabs-border-color: $gray-700;
+$nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color
+  transparent;
+$nav-tabs-link-active-color: $white;
+$nav-tabs-link-active-border-color: $nav-tabs-border-color
+  $nav-tabs-border-color transparent;
+
+$input-bg: $gray-900;
+$input-color: $white;
+$input-disabled-bg: darken($gray-900, 20%);
+$input-border-color: $gray-800;
+$input-group-addon-color: $gray-800;
+$input-group-addon-bg: $gray-800;
+
+$hr-border-color: rgba($body-color, 0.25);
+
+$table-border-color: $gray-700;
+
+$custom-file-color: $gray-500;
+$custom-file-border-color: $body-bg;
+
+$dropdown-bg: $gray-900;
+$dropdown-border-color: $gray-800;
+$dropdown-divider-bg: $gray-700;
+$dropdown-link-color: $white;
+$dropdown-link-hover-color: $white;
+$dropdown-link-hover-bg: $primary;
+
+$pagination-color: $white;
+$pagination-bg: $success;
+$pagination-border-width: 0;
+$pagination-border-color: transparent;
+$pagination-hover-color: $white;
+$pagination-hover-bg: lighten($success, 10%);
+$pagination-hover-border-color: transparent;
+$pagination-active-bg: $pagination-hover-bg;
+$pagination-active-border-color: transparent;
+$pagination-disabled-color: $white;
+$pagination-disabled-bg: darken($success, 15%);
+$pagination-disabled-border-color: transparent;
+
+$jumbotron-bg: $gray-900;
+$popover-bg: $gray-900;
+$popover-header-bg: $gray-900;
+$toast-background-color: $gray-800;
+$toast-header-background-color: $gray-900;
+$modal-content-bg: $gray-800;
+$modal-content-border-color: $gray-700;
+$modal-header-border-color: $gray-700;
+$progress-bg: $gray-700;
+$list-group-bg: $gray-800;
+$list-group-border-color: $gray-700;
+$list-group-hover-bg: $gray-700;
+$breadcrumb-bg: $gray-700;
+$close-color: $white;
+$close-text-shadow: none;
+$pre-color: inherit;
+$custom-select-bg: $gray-700;
+$custom-select-color: $white;
+$light: $gray-900;

src/assets/css/themes/darkly-pureblack.scss

@@ -0,0 +1,2 @@
+@import "variables.darkly-pureblack";
+@import "../../../../node_modules/bootstrap/scss/bootstrap";

src/server/utils/build-themes-list.ts

@@ -8,6 +8,7 @@ const themes: ReadonlyArray<string> = [
   "darkly",
   "darkly-red",
   "darkly-compact",
+  "darkly-pureblack",
   "litely",
   "litely-red",
   "litely-compact",

src/shared/components/comment/comment-form.tsx

@@ -1,5 +1,4 @@
 import { myAuthRequired } from "@utils/app";
-import getUserInterfaceLangId from "@utils/app/user-interface-language";
 import { capitalizeFirstLetter } from "@utils/helpers";
 import { Component } from "inferno";
 import { T } from "inferno-i18next-dess";
@@ -41,8 +40,6 @@ export class CommentForm extends Component<CommentFormProps, any> {
           : undefined
         : undefined;
 
-    const userInterfaceLangId = getUserInterfaceLangId(this.props.allLanguages);
-
     return (
       <div
         className={["comment-form", "mb-3", this.props.containerClass].join(
@@ -52,7 +49,6 @@ export class CommentForm extends Component<CommentFormProps, any> {
         {UserService.Instance.myUserInfo ? (
           <MarkdownTextArea
             initialContent={initialContent}
-            initialLanguageId={userInterfaceLangId}
             showLanguage
             buttonTitle={this.buttonTitle}
             finished={this.props.finished}

src/shared/components/common/language-select.tsx

@@ -49,7 +49,7 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
     return this.props.iconVersion ? (
       this.selectBtn
     ) : (
-      <div className="language-select row mb-3">
+      <div className="language-select mb-3">
         <label
           className={classNames(
             "col-form-label",

src/shared/components/common/markdown-textarea.tsx

@@ -274,12 +274,8 @@ export class MarkdownTextArea extends Component<
               <LanguageSelect
                 iconVersion
                 allLanguages={this.props.allLanguages}
-                // Only set the selected language ID if it exists as an option
-                // in the dropdown; otherwise, set it to 0 (Undetermined)
                 selectedLanguageIds={
-                  languageId && this.props.siteLanguages.includes(languageId)
+                  languageId ? Array.of(languageId) : undefined
-                    ? [languageId]
-                    : [0]
                 }
                 siteLanguages={this.props.siteLanguages}
                 onChange={this.handleLanguageChange}

src/shared/components/post/post-form.tsx

@@ -4,7 +4,6 @@ import {
   myAuth,
   myAuthRequired,
 } from "@utils/app";
-import getUserInterfaceLangId from "@utils/app/user-interface-language";
 import {
   capitalizeFirstLetter,
   debounce,
@@ -324,9 +323,10 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
   }
 
   render() {
-    const url = this.state.form.url;
+    const firstLang = this.state.form.language_id;
+    const selectedLangs = firstLang ? Array.of(firstLang) : undefined;
 
-    const userInterfaceLangId = getUserInterfaceLangId(this.props.allLanguages);
+    const url = this.state.form.url;
 
     return (
       <form className="post-form" onSubmit={linkEvent(this, handlePostSubmit)}>
@@ -494,8 +494,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
         </div>
         <LanguageSelect
           allLanguages={this.props.allLanguages}
-          selectedLanguageIds={[userInterfaceLangId]}
           siteLanguages={this.props.siteLanguages}
+          selectedLanguageIds={selectedLangs}
           multiple={false}
           onChange={this.handleLanguageChange}
         />

src/shared/utils/app/index.ts

@@ -54,7 +54,6 @@ import showScores from "./show-scores";
 import siteBannerCss from "./site-banner-css";
 import updateCommunityBlock from "./update-community-block";
 import updatePersonBlock from "./update-person-block";
-import getUserInterfaceLangId from "./user-interface-language";
 
 export {
   buildCommentsTree,
@@ -90,7 +89,6 @@ export {
   getRecipientIdFromProps,
   getRoleLabelPill,
   getUpdatedSearchId,
-  getUserInterfaceLangId,
   initializeSite,
   insertCommentIntoTree,
   isAuthPath,

src/shared/utils/app/user-interface-language.ts

@@ -1,18 +0,0 @@
-import { Language } from "lemmy-js-client";
-import { I18NextService } from "../../services/I18NextService";
-
-export default function getUserInterfaceLangId(
-  allLanguages: Language[]
-): number {
-  // Get the string of the browser- or user-defined language, like en-US
-  const i18nLang = I18NextService.i18n.language;
-
-  // Find the Language object with a code that matches the initial characters of
-  // this string
-  const userLang = allLanguages.find(lang => {
-    return i18nLang.indexOf(lang.code) === 0;
-  });
-
-  // Return the ID of that language object, or "0" for Undetermined
-  return userLang?.id || 0;
-}