Merge remote-tracking branch 'origin/main' into tailwind_rework

recommended-instances.json

@@ -1,5 +1,5 @@
 {
-  "recommended": [
+  "start_scan_instances": [
     "lemmy.ml",
     "lemm.ee",
     "lemmy.world",
@@ -8,6 +8,8 @@
     "reddthat.com",
     "hexbear.net",
     "lemmy.fmhy.ml"
+    "discuss.online",
+    "lemmings.world",
   ],
   "exclude": [
     "lemmy.glasgow.social",
@@ -18,6 +20,7 @@
     "burggit.moe",
     "lemmy.burger.rodeo",
     "bakchodi.org",
-    "lemmy.comfysnug.space"
+    "lemmy.comfysnug.space",
+    "rqd2.net"
   ]
 }

src/assets/news/2023-09-29 - Lemmy Release v0.18.5 - Fix federation for Admin Actions.md

@@ -0,0 +1,36 @@
+# Lemmy v0.18.5 Release (2023-09-29)
+
+_Written by @nutomic and @dessalines, 2023-09-29_
+
+## What is Lemmy?
+
+Lemmy is a self-hosted social link aggregation and discussion platform. It is completely free and open, and not controlled by any company. This means that there is no advertising, tracking, or secret algorithms. Content is organized into communities, so it is easy to subscribe to topics that you are interested in, and ignore others. Voting is used to bring the most interesting items to the top.
+
+## Major Changes
+
+This release fixes a problem with federation of moderation actions performed by admin accounts. Specifically there is an check when receiving remote federation actions, which is incorrectly rejecting them in some cases. The problem is fixed by this release.
+
+There are no other changes.
+
+## Support development
+
+@dessalines and @nutomic are working full-time on Lemmy to integrate community contributions, fix bugs, optimize performance and much more. This work is funded exclusively through donations.
+
+If you like using Lemmy, and want to make sure that we will always be available to work full time building it, consider [donating to support its development](https://join-lemmy.org/donate). No one likes recurring donations, but they’ve proven to be the only way that open-source software like Lemmy can stay independent and alive.
+
+- [Liberapay](https://liberapay.com/Lemmy) (preferred option)
+- [Open Collective](https://opencollective.com/lemmy)
+- [Patreon](https://www.patreon.com/dessalines)
+- [Cryptocurrency](https://join-lemmy.org/donate) (scroll to bottom of page)
+
+## Upgrade instructions
+
+Follow the upgrade instructions for [ansible](https://github.com/LemmyNet/lemmy-ansible#upgrading) or [docker](https://join-lemmy.org/docs/en/administration/install_docker.html#updating). There are no config or API changes with this release.
+
+If you need help with the upgrade, you can ask in our [support forum](https://lemmy.ml/c/lemmy_support) or on the [Matrix Chat](https://matrix.to/#/#lemmy-admin-support-topics:discuss.online).
+
+## Changes
+
+### Lemmy
+
+- Fix federation of admin actions ([#3988](https://github.com/LemmyNet/lemmy/pull/3988))

src/shared/components/common.tsx

@@ -18,10 +18,6 @@ export const BACKGROUND_GRADIENT_2 =
 export const SELECT_CLASSES =
   "select select-sm select-ghost select-bordered text-gray-400";
 
-export function languageList() {
-  return Object.keys(i18n.services.resourceStore.data).sort();
-}
-
 export const Badge = ({ content, outline = false }) => (
   <div
     className={classNames("p-2 rounded-xl bg-neutral-800 text-gray-300 w-fit", {

src/shared/components/instances.tsx

@@ -3,8 +3,8 @@ import { Helmet } from "inferno-helmet";
 import { i18n, LANGUAGES } from "../i18next";
 import { T } from "inferno-i18next";
 import { instance_stats } from "../instance_stats";
-import { mdToHtml, numToSI } from "../utils";
+import { languageList, mdToHtml, numToSI } from "../utils";
-import { Badge, SELECT_CLASSES, TEXT_GRADIENT, languageList } from "./common";
+import { Badge, SELECT_CLASSES, TEXT_GRADIENT } from "./common";
 import {
   INSTANCE_HELPERS,
   Category,

src/shared/components/navbar.tsx

@@ -3,7 +3,8 @@ import { Link } from "inferno-router";
 import { Icon, IconSize } from "./icon";
 import { i18n, LANGUAGES } from "../i18next";
 import classNames from "classnames";
-import { SELECT_CLASSES, languageList } from "./common";
+import { SELECT_CLASSES } from "./common";
+import { languageList } from "../utils";
 
 const NavLink = ({ content }) => <li className="text-gray-400">{content}</li>;
 

src/shared/utils.ts

@@ -1,4 +1,5 @@
 import markdown_it from "markdown-it";
+import { i18n } from "./i18next";
 
 let SHORTNUM_SI_FORMAT = new Intl.NumberFormat("en-US", {
   maximumFractionDigits: 1,
@@ -24,3 +25,7 @@ export const md = new markdown_it({
 export function mdToHtml(text: string) {
   return { __html: md.render(text) };
 }
+
+export function languageList() {
+  return Object.keys(i18n.services.resourceStore.data).sort();
+}