Merge branch 'main' into added-darkly-compact-552

diff --combined src/server/utils/build-themes-list.ts
index c3d2b05012b69486b2ce1e189a88e555c6af47b4,74b910c767d86ed24973886adb4d387a05dd5b0e..de027182075bfbdb6e25dc0325d506b16dfb57a1
--- 1/src/server/utils/build-themes-list.ts
--- 2/src/server/utils/build-themes-list.ts
+++ b/src/server/utils/build-themes-list.ts
@@@ -4,22 -4,20 +4,22 @@@ import { readdir } from "fs/promises"
  const extraThemesFolder =
    process.env["LEMMY_UI_EXTRA_THEMES_FOLDER"] || "./extra_themes";
  
- const themes = [
+ const themes: ReadonlyArray<string> = [
    "darkly",
    "darkly-red",
 +  "darkly-compact",
    "litely",
    "litely-red",
 +  "litely-compact",
  ];
  
- export async function buildThemeList(): Promise<string[]> {
+ export async function buildThemeList(): Promise<ReadonlyArray<string>> {
    if (existsSync(extraThemesFolder)) {
      const dirThemes = await readdir(extraThemesFolder);
      const cssThemes = dirThemes
        .filter(d => d.endsWith(".css"))
        .map(d => d.replace(".css", ""));
-     themes.push(...cssThemes);
+     return themes.concat(cssThemes);
    }
    return themes;
  }