-* @dessalines @SleeplessOne1917 @alectrocute
+* @dessalines @SleeplessOne1917
- 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: false
+ required: true
- type: textarea
id: summary
attributes:
- 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: false
+ required: true
- type: textarea
id: problem
attributes:
-FROM node:20.2-alpine as builder\r
+FROM node:alpine as builder\r
RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache\r
RUN curl -sf https://gobinaries.com/tj/node-prune | sh\r
\r
-FROM node:20.2-alpine as builder\r
+FROM node:alpine as builder\r
RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache\r
\r
WORKDIR /usr/src/app\r
"inferno-server": "^8.1.1",
"isomorphic-cookie": "^1.2.4",
"jwt-decode": "^3.1.2",
- "lemmy-js-client": "0.18.0-rc.1",
+ "lemmy-js-client": "0.17.2-rc.24",
"lodash": "^4.17.21",
"markdown-it": "^13.0.1",
"markdown-it-container": "^3.0.0",
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;
}
import { Component } from "inferno";
import { Helmet } from "inferno-helmet";
import { httpExternalPath } from "../../env";
-import { i18n } from "../../i18next";
-import { md } from "../../utils";
+import { getLanguages, md } from "../../utils";
interface HtmlTagsProps {
title: string;
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={i18n.resolvedLanguage} />
+ <html lang={lang == "browser" ? "en" : lang} />
{["title", "og:title", "twitter:title"].map(t => (
<meta key={t} property={t} content={this.props.title} />
</div>
<div className="row">
<div className="col-sm-12 d-flex flex-wrap">
+ {this.props.buttonTitle && (
+ <button
+ type="submit"
+ className="btn btn-sm btn-secondary mr-2"
+ disabled={this.isDisabled}
+ >
+ {this.state.loading ? (
+ <Spinner />
+ ) : (
+ <span>{this.props.buttonTitle}</span>
+ )}
+ </button>
+ )}
+ {this.props.replyType && (
+ <button
+ type="button"
+ className="btn btn-sm btn-secondary mr-2"
+ onClick={linkEvent(this, this.handleReplyCancel)}
+ >
+ {i18n.t("cancel")}
+ </button>
+ )}
+ {this.state.content && (
+ <button
+ className={`btn btn-sm btn-secondary mr-2 ${
+ this.state.previewMode && "active"
+ }`}
+ onClick={linkEvent(this, this.handlePreviewToggle)}
+ >
+ {this.state.previewMode ? i18n.t("edit") : i18n.t("preview")}
+ </button>
+ )}
+ {/* A flex expander */}
+ <div className="flex-grow-1"></div>
+
+ {this.props.showLanguage && (
+ <LanguageSelect
+ iconVersion
+ allLanguages={this.props.allLanguages}
+ selectedLanguageIds={
+ languageId ? Array.of(languageId) : undefined
+ }
+ siteLanguages={this.props.siteLanguages}
+ onChange={this.handleLanguageChange}
+ disabled={this.isDisabled}
+ />
+ )}
{this.getFormatButton("bold", this.handleInsertBold)}
{this.getFormatButton("italic", this.handleInsertItalic)}
{this.getFormatButton("link", this.handleInsertLink)}
<Icon icon="help-circle" classes="icon-inline" />
</a>
</div>
-
- <div className="col-sm-12 d-flex align-items-center flex-wrap">
- {this.props.showLanguage && (
- <LanguageSelect
- iconVersion
- allLanguages={this.props.allLanguages}
- selectedLanguageIds={
- languageId ? Array.of(languageId) : undefined
- }
- siteLanguages={this.props.siteLanguages}
- onChange={this.handleLanguageChange}
- disabled={this.isDisabled}
- />
- )}
-
- {/* A flex expander */}
- <div className="flex-grow-1"></div>
-
- {this.props.buttonTitle && (
- <button
- type="submit"
- className="btn btn-sm btn-secondary mr-2"
- disabled={this.isDisabled}
- >
- {this.state.loading ? (
- <Spinner />
- ) : (
- <span>{this.props.buttonTitle}</span>
- )}
- </button>
- )}
- {this.props.replyType && (
- <button
- type="button"
- className="btn btn-sm btn-secondary mr-2"
- onClick={linkEvent(this, this.handleReplyCancel)}
- >
- {i18n.t("cancel")}
- </button>
- )}
- {this.state.content && (
- <button
- className={`btn btn-sm btn-secondary mr-2 ${
- this.state.previewMode && "active"
- }`}
- onClick={linkEvent(this, this.handlePreviewToggle)}
- >
- {this.state.previewMode ? i18n.t("edit") : i18n.t("preview")}
- </button>
- )}
- </div>
</div>
</form>
);
import { Component } from "inferno";
import moment from "moment";
import { i18n } from "../../i18next";
-import { capitalizeFirstLetter } from "../../utils";
+import { capitalizeFirstLetter, getLanguages } from "../../utils";
import { Icon } from "./icon";
interface MomentTimeProps {
constructor(props: any, context: any) {
super(props, context);
- moment.locale([...i18n.languages]);
+ const lang = getLanguages();
+
+ moment.locale(lang);
}
createdAndModifiedTimes() {
import { HttpService, RequestState } from "../services/HttpService";
import {
Choice,
- debounce,
fetchLimit,
fetchUsers,
getIdFromString,
personToChoice,
setIsoData,
} from "../utils";
+import { debounce } from "../utils/helpers/debounce";
import { getQueryParams } from "../utils/helpers/get-query-params";
import { getQueryString } from "../utils/helpers/get-query-string";
import { amAdmin } from "../utils/roles/am-admin";
Choice,
capitalizeFirstLetter,
communityToChoice,
- debounce,
elementUrl,
emDash,
enableNsfw,
updateCommunityBlock,
updatePersonBlock,
} from "../../utils";
+import { debounce } from "../../utils/helpers/debounce";
import { HtmlTags } from "../common/html-tags";
import { Icon, Spinner } from "../common/icon";
import { ImageUploadForm } from "../common/image-upload-form";
archiveTodayUrl,
capitalizeFirstLetter,
communityToChoice,
- debounce,
fetchCommunities,
getIdFromString,
ghostArchiveUrl,
validURL,
webArchiveUrl,
} from "../../utils";
+import { debounce } from "../../utils/helpers/debounce";
import { Icon, Spinner } from "../common/icon";
import { LanguageSelect } from "../common/language-select";
import { MarkdownTextArea } from "../common/markdown-textarea";
buildCommentsTree,
commentsToFlatNodes,
commentTreeMaxDepth,
- debounce,
editComment,
editWith,
enableDownvotes,
updatePersonBlock,
} from "../../utils";
import { isBrowser } from "../../utils/browser/is-browser";
+import { debounce } from "../../utils/helpers/debounce";
import { CommentForm } from "../comment/comment-form";
import { CommentNodes } from "../comment/comment-nodes";
import { HtmlTags } from "../common/html-tags";
capitalizeFirstLetter,
commentsToFlatNodes,
communityToChoice,
- debounce,
enableDownvotes,
enableNsfw,
fetchCommunities,
setIsoData,
showLocal,
} from "../utils";
+import { debounce } from "../utils/helpers/debounce";
import { getQueryParams } from "../utils/helpers/get-query-params";
import { getQueryString } from "../utils/helpers/get-query-string";
import type { QueryParams } from "../utils/types/query-params";
import i18next, { i18nTyped, Resource } from "i18next";
-import { UserService } from "./services";
import { ar } from "./translations/ar";
import { bg } from "./translations/bg";
import { ca } from "./translations/ca";
import { vi } from "./translations/vi";
import { zh } from "./translations/zh";
import { zh_Hant } from "./translations/zh_Hant";
-import { isBrowser } from "./utils";
+import { getLanguages } from "./utils";
export const languages = [
{ resource: ar, code: "ar", name: "العربية" },
return format === "uppercase" ? value.toUpperCase() : value;
}
-class LanguageDetector {
- static readonly type = "languageDetector";
-
- detect() {
- const langs: string[] = [];
-
- const myLang =
- UserService.Instance.myUserInfo?.local_user_view.local_user
- .interface_language ?? "browser";
-
- if (myLang !== "browser") langs.push(myLang);
-
- if (isBrowser()) langs.push(...navigator.languages);
-
- return langs;
- }
-}
-
-i18next.use(LanguageDetector).init({
+i18next.init({
debug: false,
compatibilityJSON: "v3",
- supportedLngs: languages.map(l => l.code),
- nonExplicitSupportedLngs: true,
// load: 'languageOnly',
// initImmediate: false,
+ lng: getLanguages()[0],
fallbackLng: "en",
resources,
interpolation: { format },
import tippy from "tippy.js";
import Toastify from "toastify-js";
import { getHttpBase } from "./env";
-import { i18n } from "./i18next";
+import { i18n, languages } from "./i18next";
import { CommentNodeI, DataType, IsoData, VoteType } from "./interfaces";
import { HttpService, UserService } from "./services";
import { isBrowser } from "./utils/browser/is-browser";
+import { debounce } from "./utils/helpers/debounce";
import { groupBy } from "./utils/helpers/group-by";
let Tribute: any;
const imageRegex = /(http)?s?:?(\/\/[^"']*\.(?:jpg|jpeg|gif|png|svg|webp))/;
const videoRegex = /(http)?s?:?(\/\/[^"']*\.(?:mp4|webm))/;
-const tldRegex = /([a-z0-9]+\.)*[a-z0-9]+\.[a-z]+/;
export function isImage(url: string) {
return imageRegex.test(url);
return !!new URL(str);
}
-export function validInstanceTLD(str: string) {
- return tldRegex.test(str);
-}
-
export function communityRSSUrl(actorId: string, sort: string): string {
const url = new URL(actorId);
return `${url.origin}/feeds${url.pathname}.xml?sort=${sort}`;
return dt === DataType.Post ? "Post" : "Comment";
}
-export function debounce<T extends any[], R>(
- func: (...e: T) => R,
- wait = 1000,
- immediate = false
-) {
- // 'private' variable for instance
- // The returned function will be able to reference this due to closure.
- // Each call to the returned function will share this common timer.
- let timeout: NodeJS.Timeout | null;
-
- // Calling debounce returns a new anonymous function
- return function () {
- // reference the context and args for the setTimeout function
- const args = arguments;
-
- // Should the function be called now? If immediate is true
- // and not already in a timeout then the answer is: Yes
- const callNow = immediate && !timeout;
-
- // This is the basic debounce behavior where you can call this
- // function several times, but it will only execute once
- // [before or after imposing a delay].
- // Each time the returned function is called, the timer starts over.
- clearTimeout(timeout ?? undefined);
-
- // Set the new timeout
- timeout = setTimeout(function () {
- // Inside the timeout function, clear the timeout variable
- // which will let the next execution run when in 'immediate' mode
- timeout = null;
-
- // Check if the function already ran with the immediate flag
- if (!immediate) {
- // Call the original function with apply
- // apply lets you define the 'this' object as well as the arguments
- // (both captured before setTimeout)
- func.apply(this, args);
- }
- }, wait);
+export function getLanguages(
+ override?: string,
+ myUserInfo = UserService.Instance.myUserInfo
+): string[] {
+ const myLang = myUserInfo?.local_user_view.local_user.interface_language;
+ const lang = override || myLang || "browser";
- // Immediate mode and no wait timer? Execute the function..
- if (callNow) func.apply(this, args);
- } as (...e: T) => R;
+ if (lang == "browser" && isBrowser()) {
+ return getBrowserLanguages();
+ } else {
+ return [lang];
+ }
+}
+
+function getBrowserLanguages(): string[] {
+ // Intersect lemmy's langs, with the browser langs
+ const langs = languages ? languages.map(l => l.code) : ["en"];
+
+ // NOTE, mobile browsers seem to be missing this list, so append en
+ const allowedLangs = navigator.languages
+ .concat("en")
+ .filter(v => langs.includes(v));
+ return allowedLangs;
}
export async function fetchThemeList(): Promise<string[]> {
defs: emojiDefs,
})
.disable("image");
- const defaultRenderer = md.renderer.rules.image;
+ var defaultRenderer = md.renderer.rules.image;
md.renderer.rules.image = function (
tokens: Token[],
idx: number,
const alt_text = item.content;
return `<img class="icon icon-emoji" src="${src}" title="${title}" alt="${alt_text}"/>`;
};
- md.renderer.rules.table_open = function () {
- return '<table class="table">';
- };
}
export function getEmojiMart(
export function initializeSite(site?: GetSiteResponse) {
UserService.Instance.myUserInfo = site?.my_user;
- i18n.changeLanguage();
+ i18n.changeLanguage(getLanguages()[0]);
if (site) {
setupEmojiDataModel(site.custom_emojis ?? []);
}
--- /dev/null
+export function debounce<T extends any[], R>(
+ func: (...e: T) => R,
+ wait = 1000,
+ immediate = false
+) {
+ // 'private' variable for instance
+ // The returned function will be able to reference this due to closure.
+ // Each call to the returned function will share this common timer.
+ let timeout: NodeJS.Timeout | null;
+
+ // Calling debounce returns a new anonymous function
+ return function () {
+ // reference the context and args for the setTimeout function
+ const args = arguments;
+
+ // Should the function be called now? If immediate is true
+ // and not already in a timeout then the answer is: Yes
+ const callNow = immediate && !timeout;
+
+ // This is the basic debounce behavior where you can call this
+ // function several times, but it will only execute once
+ // [before or after imposing a delay].
+ // Each time the returned function is called, the timer starts over.
+ clearTimeout(timeout ?? undefined);
+
+ // Set the new timeout
+ timeout = setTimeout(function () {
+ // Inside the timeout function, clear the timeout variable
+ // which will let the next execution run when in 'immediate' mode
+ timeout = null;
+
+ // Check if the function already ran with the immediate flag
+ if (!immediate) {
+ // Call the original function with apply
+ // apply lets you define the 'this' object as well as the arguments
+ // (both captured before setTimeout)
+ func.apply(this, args);
+ }
+ }, wait);
+
+ // Immediate mode and no wait timer? Execute the function..
+ if (callNow) func.apply(this, args);
+ } as (...e: T) => R;
+}
resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912"
integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
-lemmy-js-client@0.18.0-rc.1:
- version "0.18.0-rc.1"
- resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.18.0-rc.1.tgz#fd0c88810572d90413696011ebaed19e3b8162d8"
- integrity sha512-lQe443Nr5UCSoY+IxmT7mBe0IRF6EAZ/4PJSRoPSL+U8A+egMMBPbuxnisHzLsC+eDOWRUIgOqZlwlaRnbmuig==
+lemmy-js-client@0.17.2-rc.24:
+ version "0.17.2-rc.24"
+ resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.17.2-rc.24.tgz#3b09233a6d89286e559be2e840d81c0c549562ad"
+ integrity sha512-aSHz7UTcwnwnNd9poY8tEXP7RA9ieZm9MAfSljcbCNU5ds9CASXYNodmraUVJiqCmT4HWnj7IeVmBC9r7nTHnw==
dependencies:
cross-fetch "^3.1.5"
form-data "^4.0.0"
projects / lemmy-ui.git / commitdiff