Building themes on startup.

package.json

@@ -19,6 +19,7 @@
   "dependencies": {
     "@typescript-eslint/parser": "^5.6.0",
     "autosize": "^5.0.1",
+    "buffer": "^6.0.3",
     "check-password-strength": "^2.0.3",
     "choices.js": "^10.0.0",
     "classnames": "^2.3.1",

src/server/index.tsx

@@ -1,4 +1,5 @@
 import express from "express";
+import fs from "fs";
 import { IncomingHttpHeaders } from "http";
 import { Helmet } from "inferno-helmet";
 import { matchPath, StaticRouter } from "inferno-router";
@@ -23,6 +24,10 @@ const server = express();
 const [hostname, port] = process.env["LEMMY_UI_HOST"]
   ? process.env["LEMMY_UI_HOST"].split(":")
   : ["0.0.0.0", "1234"];
+const extraThemesFolder =
+  process.env["LEMMY_UI_EXTRA_THEMES_FOLDER"] || "./extra_themes";
+
+export const themeList = buildThemeList();
 
 server.use(express.json());
 server.use(express.urlencoded({ extended: false }));
@@ -46,6 +51,86 @@ server.get("/robots.txt", async (_req, res) => {
   res.send(robotstxt);
 });
 
+export const builtinThemes = [
+  "litera",
+  "materia",
+  "minty",
+  "solar",
+  "united",
+  "cyborg",
+  "darkly",
+  "journal",
+  "sketchy",
+  "vaporwave",
+  "vaporwave-dark",
+  "i386",
+  "litely",
+  "nord",
+];
+
+function buildThemeList(): string[] {
+  let data = fs.readdirSync(extraThemesFolder);
+  if (data != null) {
+    data = data
+      .filter(d => d.endsWith(".min.css"))
+      .map(d => d.replace(".min.css", ""));
+    data = builtinThemes.concat(data);
+    // use set to remove duplicate values
+    data = Array.from(new Set(data));
+    return data;
+  } else {
+    return builtinThemes;
+  }
+}
+
+server.get("/css/themes-list", async (req, res) => {
+  const builtinThemes = [
+    "litera",
+    "materia",
+    "minty",
+    "solar",
+    "united",
+    "cyborg",
+    "darkly",
+    "journal",
+    "sketchy",
+    "vaporwave",
+    "vaporwave-dark",
+    "i386",
+    "litely",
+    "nord",
+  ];
+  fs.readdir(extraThemesFolder, function (_, data) {
+    if (data != null) {
+      data = data
+        .filter(d => d.endsWith(".min.css"))
+        .map(d => d.replace(".min.css", ""));
+      data = builtinThemes.concat(data);
+      // use set to remove duplicate values
+      data = Array.from(new Set(data));
+      res.send(data);
+    } else {
+      res.send(builtinThemes);
+    }
+  });
+});
+
+server.get("/css/themes/:name", async (req, res) => {
+  res.contentType("text/css");
+  const theme = req.params.name;
+  if (!theme.endsWith(".min.css")) {
+    res.send("Theme must be a css file");
+  }
+
+  const customTheme = path.resolve(`./${extraThemesFolder}/${theme}`);
+  if (fs.existsSync(customTheme)) {
+    res.sendFile(customTheme);
+  } else {
+    const internalTheme = path.resolve(`./dist/assets/css/themes/${theme}`);
+    res.sendFile(internalTheme);
+  }
+});
+
 // server.use(cookieParser());
 server.get("/*", async (req, res) => {
   try {

src/shared/components/app/theme.tsx

@@ -17,21 +17,21 @@ export class Theme extends Component<Props> {
           <link
             rel="stylesheet"
             type="text/css"
-            href={`/static/assets/css/themes/${user.local_user_view.local_user.theme}.min.css`}
+            href={`css/themes/${user.local_user_view.local_user.theme}.min.css`}
           />
         ) : (
           [
             <link
               rel="stylesheet"
               type="text/css"
-              href="/static/assets/css/themes/litely.min.css"
+              href="css/themes/litely.min.css"
               id="default-light"
               media="(prefers-color-scheme: light)"
             />,
             <link
               rel="stylesheet"
               type="text/css"
-              href="/static/assets/css/themes/darkly.min.css"
+              href="css/themes/darkly.min.css"
               id="default-dark"
               media="(prefers-color-scheme: no-preference), (prefers-color-scheme: dark)"
             />,

src/shared/components/person/settings.tsx

@@ -29,6 +29,7 @@ import {
   debounce,
   elementUrl,
   fetchCommunities,
+  fetchThemes,
   fetchUsers,
   getLanguages,
   isBrowser,
@@ -39,7 +40,6 @@ import {
   setTheme,
   setupTippy,
   showLocal,
-  themes,
   toast,
   updateCommunityBlock,
   updatePersonBlock,
@@ -545,7 +545,7 @@ export class Settings extends Component<any, SettingsState> {
                   {i18n.t("theme")}
                 </option>
                 <option value="browser">{i18n.t("browser_default")}</option>
-                {themes.map(theme => (
+                {fetchThemes().map(theme => (
                   <option value={theme}>{theme}</option>
                 ))}
               </select>

src/shared/utils.ts

@@ -77,22 +77,23 @@ export const mentionDropdownFetchLimit = 10;
 
 export const relTags = "noopener nofollow";
 
-export const themes = [
-  "litera",
-  "materia",
-  "minty",
-  "solar",
-  "united",
-  "cyborg",
-  "darkly",
-  "journal",
-  "sketchy",
-  "vaporwave",
-  "vaporwave-dark",
-  "i386",
-  "litely",
-  "nord",
-];
+export function fetchThemes(): Promise<string[]> {
+  var promise = new Promise<string[]>((resolve, reject) => {
+    if (isBrowser()) {
+      const url = `${window.location.protocol}//${window.location.host}/css/themes-list`;
+      console.log(url);
+      fetch(url).then(res => {
+        res.json().then(json => {
+          console.log(json);
+          resolve(json);
+        });
+      });
+    } else {
+      listThemes().then(themes => resolve(themes));
+    }
+  });
+  return promise;
+}
 
 const DEFAULT_ALPHABET =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";