Merge branch 'LemmyNet:main' into master

Author: kroese

lemmy-translations

@@ -1,23 +1,19 @@
-import { getHttpBaseExternal, getHttpBaseInternal } from "@utils/env";
+import { getHttpBaseInternal } from "@utils/env";
 import type { Request, Response } from "express";
 import { LemmyHttp } from "lemmy-js-client";
 import { wrapClient } from "../../shared/services/HttpService";
 import generateManifestJson from "../utils/generate-manifest-json";
-import { setForwardedHeaders } from "../utils/set-forwarded-headers";
 
 let manifest: Awaited<ReturnType<typeof generateManifestJson>> | undefined =
   undefined;
 
-export default async (req: Request, res: Response) => {
-  if (!manifest || manifest.start_url !== getHttpBaseExternal()) {
-    const headers = setForwardedHeaders(req.headers);
-    const client = wrapClient(
-      new LemmyHttp(getHttpBaseInternal(), { headers }),
-    );
+export default async (_req: Request, res: Response) => {
+  if (!manifest) {
+    const client = wrapClient(new LemmyHttp(getHttpBaseInternal()));
     const site = await client.getSite();
 
     if (site.state === "success") {
-      manifest = await generateManifestJson(site.data);
+      manifest = await generateManifestJson(site.data.site_view.site);
     } else {
       res.sendStatus(500);
       return;

src/server/handlers/manifest-handler.ts

@@ -1,7 +1,6 @@
 import { readFile } from "fs/promises";
-import { GetSiteResponse } from "lemmy-js-client";
+import { Site } from "lemmy-js-client";
 import path from "path";
-import sharp from "sharp";
 import { fetchIconPng } from "./fetch-icon-png";
 
 const iconSizes = [72, 96, 128, 144, 152, 192, 384, 512];
@@ -13,13 +12,7 @@ const defaultLogoPathDirectory = path.join(
   "icons",
 );
 
-export default async function ({
-  my_user,
-  site_view: {
-    site,
-    local_site: { community_creation_admin_only },
-  },
-}: GetSiteResponse) {
+export default async function (site: Site) {
   const icon = site.icon ? await fetchIconPng(site.icon) : null;
 
   return {
@@ -38,6 +31,7 @@ export default async function ({
         ).then(buf => buf.toString("base64"));
 
         if (icon) {
+          const sharp = (await import("sharp")).default;
           src = await sharp(icon)
             .resize(size, size)
             .png()
@@ -72,19 +66,7 @@ export default async function ({
         short_name: "Create Post",
         description: "Create a post.",
       },
-    ].concat(
-      my_user?.local_user_view.local_user.admin ||
-        !community_creation_admin_only
-        ? [
-            {
-              name: "Create Community",
-              url: "/create_community",
-              short_name: "Create Community",
-              description: "Create a community",
-            },
-          ]
-        : [],
-    ),
+    ],
     related_applications: [
       {
         platform: "f-droid",

src/server/utils/generate-manifest-json.ts

@@ -1,4 +1,9 @@
-import { enableDownvotes, enableNsfw, setIsoData } from "@utils/app";
+import {
+  communityToChoice,
+  enableDownvotes,
+  enableNsfw,
+  setIsoData,
+} from "@utils/app";
 import { getIdFromString, getQueryParams } from "@utils/helpers";
 import type { QueryParams } from "@utils/types";
 import { Choice, RouteDataResponse } from "@utils/types";
@@ -85,10 +90,9 @@ export class CreatePost extends Component<
       };
 
       if (communityRes?.state === "success") {
-        const communityChoice: Choice = {
-          label: communityRes.data.community_view.community.title,
-          value: communityRes.data.community_view.community.id.toString(),
-        };
+        const communityChoice = communityToChoice(
+          communityRes.data.community_view,
+        );
 
         this.state = {
           ...this.state,
@@ -107,10 +111,7 @@ export class CreatePost extends Component<
       });
       if (res.state === "success") {
         this.setState({
-          selectedCommunityChoice: {
-            label: res.data.community_view.community.title,
-            value: res.data.community_view.community.id.toString(),
-          },
+          selectedCommunityChoice: communityToChoice(res.data.community_view),
           loading: false,
         });
       }

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

@@ -263,26 +263,16 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
           community_id: getIdFromString(selectedCommunityChoice.value),
         },
         communitySearchOptions: [selectedCommunityChoice].concat(
-          (
-            this.props.initialCommunities?.map(
-              ({ community: { id, title } }) => ({
-                label: title,
-                value: id.toString(),
-              }),
-            ) ?? []
-          ).filter(option => option.value !== selectedCommunityChoice.value),
+          (this.props.initialCommunities?.map(communityToChoice) ?? []).filter(
+            option => option.value !== selectedCommunityChoice.value,
+          ),
         ),
       };
     } else {
       this.state = {
         ...this.state,
         communitySearchOptions:
-          this.props.initialCommunities?.map(
-            ({ community: { id, title } }) => ({
-              label: title,
-              value: id.toString(),
-            }),
-          ) ?? [],
+          this.props.initialCommunities?.map(communityToChoice) ?? [],
       };
     }