Merge branch 'main' into tweak/thumbnail-fixed-width-height

Co-authored-by: Jay Sitter <jsit@users.noreply.github.com>

.prettierignore

@@ -2,4 +2,3 @@ src/shared/translations
 lemmy-translations
 src/assets/css/themes/*.css
 stats.json
-dist

Dockerfile

@@ -27,7 +27,7 @@ COPY .git .git
 RUN echo "export const VERSION = '$(git describe --tag)';" > "src/shared/version.ts"
 
 RUN yarn --production --prefer-offline
-RUN NODE_OPTIONS="--max-old-space-size=8192" yarn build:prod
+RUN yarn build:prod
 
 # Prune the image
 RUN node-prune /usr/src/app/node_modules

dev.dockerfile

@@ -20,7 +20,6 @@ COPY generate_translations.js \
 
 COPY lemmy-translations lemmy-translations
 COPY src src
-COPY .git .git
 
 # Set UI version 
 RUN echo "export const VERSION = 'dev';" > "src/shared/version.ts"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lemmy-ui",
-  "version": "0.18.1-rc.5",
+  "version": "0.18.1-rc.2",
   "description": "An isomorphic UI for lemmy",
   "repository": "https://github.com/LemmyNet/lemmy-ui",
   "license": "AGPL-3.0",
@@ -8,9 +8,9 @@
   "scripts": {
     "analyze": "webpack --mode=none",
     "prebuild:dev": "yarn clean && node generate_translations.js",
-    "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development",
+    "build:dev": "webpack --mode=development",
     "prebuild:prod": "yarn clean && node generate_translations.js",
-    "build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production",
+    "build:prod": "webpack --mode=production",
     "clean": "yarn run rimraf dist",
     "dev": "yarn build:dev --watch",
     "lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"",

src/server/handlers/security-handler.ts

@@ -1,17 +0,0 @@
-import type { Response } from "express";
-
-export default async ({ res }: { res: Response }) => {
-  res.setHeader("content-type", "text/plain; charset=utf-8");
-
-  res.send(
-    `Contact: mailto:security@lemmy.ml
-  Contact: mailto:admin@` +
-      process.env.LEMMY_UI_LEMMY_EXTERNAL_HOST +
-      `
-  Contact: mailto:security@` +
-      process.env.LEMMY_UI_LEMMY_EXTERNAL_HOST +
-      `
-  Expires: 2024-01-01T04:59:00.000Z
-  `
-  );
-};

src/server/index.tsx

@@ -1,12 +1,10 @@
 import { setupDateFns } from "@utils/app";
-import { getStaticDir } from "@utils/env";
 import express from "express";
 import path from "path";
 import process from "process";
 import CatchAllHandler from "./handlers/catch-all-handler";
 import ManifestHandler from "./handlers/manifest-handler";
 import RobotsHandler from "./handlers/robots-handler";
-import SecurityHandler from "./handlers/security-handler";
 import ServiceWorkerHandler from "./handlers/service-worker-handler";
 import ThemeHandler from "./handlers/theme-handler";
 import ThemesListHandler from "./handlers/themes-list-handler";
@@ -20,20 +18,13 @@ const [hostname, port] = process.env["LEMMY_UI_HOST"]
 
 server.use(express.json());
 server.use(express.urlencoded({ extended: false }));
-server.use(
-  getStaticDir(),
-  express.static(path.resolve("./dist"), {
-    maxAge: 24 * 60 * 60 * 1000, // 1 day
-    immutable: true,
-  })
-);
+server.use("/static", express.static(path.resolve("./dist")));
 server.use(setCacheControl);
 
 if (!process.env["LEMMY_UI_DISABLE_CSP"] && !process.env["LEMMY_UI_DEBUG"]) {
   server.use(setDefaultCsp);
 }
 
-server.get("/.well-known/security.txt", SecurityHandler);
 server.get("/robots.txt", RobotsHandler);
 server.get("/service-worker.js", ServiceWorkerHandler);
 server.get("/manifest.webmanifest", ManifestHandler);

src/server/middleware.ts

@@ -1,4 +1,4 @@
-import type { NextFunction, Request, Response } from "express";
+import type { NextFunction, Response } from "express";
 import { UserService } from "../shared/services";
 
 export function setDefaultCsp({
@@ -10,7 +10,7 @@ export function setDefaultCsp({
 }) {
   res.setHeader(
     "Content-Security-Policy",
-    `default-src 'self'; manifest-src *; connect-src *; img-src * data:; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; frame-src *; media-src * data:`
+    `default-src 'self'; manifest-src *; connect-src *; img-src * data:; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; frame-src *; media-src *`
   );
 
   next();
@@ -18,33 +18,24 @@ export function setDefaultCsp({
 
 // Set cache-control headers. If user is logged in, set `private` to prevent storing data in
 // shared caches (eg nginx) and leaking of private data. If user is not logged in, allow caching
-// all responses for 5 seconds to reduce load on backend and database. The specific cache
+// all responses for 60 seconds to reduce load on backend and database. The specific cache
 // interval is rather arbitrary and could be set higher (less server load) or lower (fresher data).
 //
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
-export function setCacheControl(
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
+export function setCacheControl({
+  res,
+  next,
+}: {
+  res: Response;
+  next: NextFunction;
+}) {
   const user = UserService.Instance;
-  let caching: string;
-
-  if (
-    process.env.NODE_ENV === "production" &&
-    (req.path.match(/\.(js|css|txt|manifest\.webmanifest)\/?$/) ||
-      req.path.includes("/css/themelist"))
-  ) {
-    // Static content gets cached publicly for a day
-    caching = "public, max-age=86400";
+  let caching;
+  if (user.auth()) {
+    caching = "private";
   } else {
-    if (user.auth()) {
-      caching = "private";
-    } else {
-      caching = "public, max-age=5";
-    }
+    caching = "public, max-age=60";
   }
-
   res.setHeader("Cache-Control", caching);
 
   next();

src/server/utils/create-ssr-html.tsx

@@ -1,4 +1,3 @@
-import { getStaticDir } from "@utils/env";
 import { Helmet } from "inferno-helmet";
 import { renderToString } from "inferno-server";
 import serialize from "serialize-javascript";
@@ -24,7 +23,7 @@ export async function createSsrHtml(
 
   if (!appleTouchIcon) {
     appleTouchIcon = site?.site_view.site.icon
-      ? `data:image/png;base64,${await sharp(
+      ? `data:image/png;base64,${sharp(
           await fetchIconPng(site.site_view.site.icon)
         )
           .resize(180, 180)
@@ -88,7 +87,7 @@ export async function createSsrHtml(
     <link rel="apple-touch-startup-image" href=${appleTouchIcon} />
   
     <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="${getStaticDir()}/styles/styles.css" />
+    <link rel="stylesheet" type="text/css" href="/static/styles/styles.css" />
   
     <!-- Current theme and more -->
     ${helmet.link.toString() || fallbackTheme}
@@ -103,7 +102,7 @@ export async function createSsrHtml(
       </noscript>
   
       <div id='root'>${root}</div>
-      <script defer src='${getStaticDir()}/js/client.js'></script>
+      <script defer src='/static/js/client.js'></script>
     </body>
   </html>
   `;

src/shared/components/common/icon.tsx

@@ -1,4 +1,3 @@
-import { getStaticDir } from "@utils/env";
 import classNames from "classnames";
 import { Component } from "inferno";
 import { I18NextService } from "../../services";
@@ -24,9 +23,7 @@ export class Icon extends Component<IconProps, any> {
         })}
       >
         <use
-          xlinkHref={`${getStaticDir()}/assets/symbols.svg#icon-${
-            this.props.icon
-          }`}
+          xlinkHref={`/static/assets/symbols.svg#icon-${this.props.icon}`}
         ></use>
         <div className="visually-hidden">
           <title>{this.props.icon}</title>

src/shared/components/common/image-upload-form.tsx

@@ -84,8 +84,6 @@ export class ImageUploadForm extends Component<
       if (res.state === "success") {
         if (res.data.msg === "ok") {
           i.props.onUpload(res.data.url as string);
-        } else if (res.data.msg === "too_large") {
-          toast(I18NextService.i18n.t("upload_too_large"), "danger");
         } else {
           toast(JSON.stringify(res), "danger");
         }

src/shared/components/common/markdown-textarea.tsx

@@ -443,10 +443,6 @@ export class MarkdownTextArea extends Component<
         const textarea: any = document.getElementById(i.id);
         autosize.update(textarea);
         pictrsDeleteToast(image.name, res.data.delete_url as string);
-      } else if (res.data.msg === "too_large") {
-        toast(I18NextService.i18n.t("upload_too_large"), "danger");
-        i.setState({ imageUploadStatus: undefined });
-        throw JSON.stringify(res.data);
       } else {
         throw JSON.stringify(res.data);
       }

src/shared/components/common/moment-time.tsx

@@ -1,5 +1,5 @@
 import { capitalizeFirstLetter, formatPastDate } from "@utils/helpers";
-import { format } from "date-fns";
+import format from "date-fns/format";
 import parseISO from "date-fns/parseISO";
 import { Component } from "inferno";
 import { I18NextService } from "../../services";
@@ -13,8 +13,7 @@ interface MomentTimeProps {
 }
 
 function formatDate(input: string) {
-  const parsed = parseISO(input + "Z");
-  return format(parsed, "PPPPpppp");
+  return format(parseISO(input), "PPPPpppp");
 }
 
 export class MomentTime extends Component<MomentTimeProps, any> {

src/shared/components/community/communities.tsx

@@ -284,9 +284,7 @@ export class Communities extends Component<any, CommunitiesState> {
   handleSearchSubmit(i: Communities, event: any) {
     event.preventDefault();
     const searchParamEncoded = encodeURIComponent(i.state.searchText);
-    i.context.router.history.push(
-      `/search?q=${searchParamEncoded}&type=Communities`
-    );
+    i.context.router.history.push(`/search?q=${searchParamEncoded}`);
   }
 
   static async fetchInitialData({

src/shared/components/home/emojis-form.tsx

@@ -508,8 +508,6 @@ export class EmojiForm extends Component<EmojiFormProps, EmojiFormState> {
             { form: form, index: index, overrideValue: res.data.url as string },
             event
           );
-        } else if (res.data.msg === "too_large") {
-          toast(I18NextService.i18n.t("upload_too_large"), "danger");
         } else {
           toast(JSON.stringify(res), "danger");
         }

src/shared/components/home/home.tsx

@@ -279,15 +279,13 @@ export class Home extends Component<any, HomeState> {
         trendingCommunitiesRes,
         commentsRes,
         postsRes,
+        tagline: getRandomFromList(this.state?.siteRes?.taglines ?? [])
+          ?.content,
         isIsomorphic: true,
       };
 
       HomeCacheService.postsRes = postsRes;
     }
-
-    this.state.tagline = getRandomFromList(
-      this.state?.siteRes?.taglines ?? []
-    )?.content;
   }
 
   componentWillUnmount() {

src/shared/components/home/setup.tsx

@@ -205,7 +205,9 @@ export class Setup extends Component<any, State> {
         const data = i.state.registerRes.data;
 
         UserService.Instance.login(data);
-        i.setState({ doneRegisteringUser: true });
+        if (UserService.Instance.jwtInfo) {
+          i.setState({ doneRegisteringUser: true });
+        }
       }
     }
   }

src/shared/components/home/tagline-form.tsx

@@ -141,7 +141,7 @@ export class TaglineForm extends Component<TaglineFormProps, TaglineFormState> {
 
   handleEditTaglineClick(d: { i: TaglineForm; index: number }, event: any) {
     event.preventDefault();
-    if (d.i.state.editingRow == d.index) {
+    if (this.state.editingRow == d.index) {
       d.i.setState({ editingRow: undefined });
     } else {
       d.i.setState({ editingRow: d.index });

src/shared/components/person/person-listing.tsx

@@ -1,5 +1,4 @@
 import { showAvatars } from "@utils/app";
-import { getStaticDir } from "@utils/env";
 import { hostname, isCakeDay } from "@utils/helpers";
 import classNames from "classnames";
 import { Component } from "inferno";
@@ -89,7 +88,7 @@ export class PersonListing extends Component<PersonListingProps, any> {
           !this.props.person.banned &&
           showAvatars() && (
             <PictrsImage
-              src={avatar ?? `${getStaticDir()}/assets/icons/icon-96x96.png`}
+              src={avatar ?? "/static/assets/icons/icon-96x96.png"}
               icon
             />
           )}

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

@@ -187,8 +187,6 @@ function handleImageUpload(i: PostForm, event: any) {
           imageLoading: false,
           imageDeleteUrl: res.data.delete_url as string,
         });
-      } else if (res.data.msg === "too_large") {
-        toast(I18NextService.i18n.t("upload_too_large"), "danger");
       } else {
         toast(JSON.stringify(res), "danger");
       }

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

@@ -333,7 +333,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
       return (
         <button
           type="button"
-          className="thumbnail rounded overflow-hidden d-inline-block position-relative p-0 border-0"
+          className="thumbnail rounded overflow-hidden d-inline-block position-relative mb-2 p-0 border-0"
           data-tippy-content={I18NextService.i18n.t("expand_here")}
           onClick={linkEvent(this, this.handleImageExpandClick)}
           aria-label={I18NextService.i18n.t("expand_here")}
@@ -348,7 +348,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     } else if (!this.props.hideImage && url && thumbnail && this.imageSrc) {
       return (
         <a
-          className="thumbnail rounded overflow-hidden d-inline-block position-relative p-0 border-0"
+          className="thumbnail rounded bg-light d-flex justify-content-center"
           href={url}
           rel={relTags}
           title={url}
@@ -403,9 +403,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
 
   createdLine() {
     const post_view = this.postView;
-
     return (
-      <div className="small mb-1 mb-md-0">
+      <div className="small">
         <span className="me-1">
           <PersonListing person={post_view.creator} />
         </span>
@@ -703,50 +702,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             {(this.canMod_ || this.canAdmin_) && (
               <li>{this.modRemoveButton}</li>
             )}
-
-            {this.canMod_ && (
-              <>
-                <li>
-                  <hr className="dropdown-divider" />
-                </li>
-                {!this.creatorIsMod_ &&
-                  (!post_view.creator_banned_from_community ? (
-                    <li>{this.modBanFromCommunityButton}</li>
-                  ) : (
-                    <li>{this.modUnbanFromCommunityButton}</li>
-                  ))}
-                {!post_view.creator_banned_from_community && (
-                  <li>{this.addModToCommunityButton}</li>
-                )}
-              </>
-            )}
-
-            {(amCommunityCreator(post_view.creator.id, this.props.moderators) ||
-              this.canAdmin_) &&
-              this.creatorIsMod_ && <li>{this.transferCommunityButton}</li>}
-
-            {/* Admins can ban from all, and appoint other admins */}
-            {this.canAdmin_ && (
-              <>
-                <li>
-                  <hr className="dropdown-divider" />
-                </li>
-                {!this.creatorIsAdmin_ && (
-                  <>
-                    {!isBanned(post_view.creator) ? (
-                      <li>{this.modBanButton}</li>
-                    ) : (
-                      <li>{this.modUnbanButton}</li>
-                    )}
-                    <li>{this.purgePersonButton}</li>
-                    <li>{this.purgePostButton}</li>
-                  </>
-                )}
-                {!isBanned(post_view.creator) && post_view.creator.local && (
-                  <li>{this.toggleAdminButton}</li>
-                )}
-              </>
-            )}
           </ul>
         </div>
       </>
@@ -1014,8 +969,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modBanFromCommunityButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanFromCommunityShow)}
+        aria-label={I18NextService.i18n.t("ban_from_community")}
       >
         {I18NextService.i18n.t("ban_from_community")}
       </button>
@@ -1025,8 +981,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modUnbanFromCommunityButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanFromCommunitySubmit)}
+        aria-label={I18NextService.i18n.t("unban")}
       >
         {this.state.banLoading ? <Spinner /> : I18NextService.i18n.t("unban")}
       </button>
@@ -1036,15 +993,20 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get addModToCommunityButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleAddModToCommunity)}
+        aria-label={
+          this.creatorIsMod_
+            ? I18NextService.i18n.t("remove_as_mod")
+            : I18NextService.i18n.t("appoint_as_mod")
+        }
       >
         {this.state.addModLoading ? (
           <Spinner />
         ) : this.creatorIsMod_ ? (
-          capitalizeFirstLetter(I18NextService.i18n.t("remove_as_mod"))
+          I18NextService.i18n.t("remove_as_mod")
         ) : (
-          capitalizeFirstLetter(I18NextService.i18n.t("appoint_as_mod"))
+          I18NextService.i18n.t("appoint_as_mod")
         )}
       </button>
     );
@@ -1053,10 +1015,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modBanButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanShow)}
+        aria-label={I18NextService.i18n.t("ban_from_site")}
       >
-        {capitalizeFirstLetter(I18NextService.i18n.t("ban_from_site"))}
+        {I18NextService.i18n.t("ban_from_site")}
       </button>
     );
   }
@@ -1064,13 +1027,14 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modUnbanButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanSubmit)}
+        aria-label={I18NextService.i18n.t("unban_from_site")}
       >
         {this.state.banLoading ? (
           <Spinner />
         ) : (
-          capitalizeFirstLetter(I18NextService.i18n.t("unban_from_site"))
+          I18NextService.i18n.t("unban_from_site")
         )}
       </button>
     );
@@ -1079,10 +1043,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get purgePersonButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handlePurgePersonShow)}
+        aria-label={I18NextService.i18n.t("purge_user")}
       >
-        {capitalizeFirstLetter(I18NextService.i18n.t("purge_user"))}
+        {I18NextService.i18n.t("purge_user")}
       </button>
     );
   }
@@ -1090,10 +1055,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get purgePostButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handlePurgePostShow)}
+        aria-label={I18NextService.i18n.t("purge_post")}
       >
-        {capitalizeFirstLetter(I18NextService.i18n.t("purge_post"))}
+        {I18NextService.i18n.t("purge_post")}
       </button>
     );
   }
@@ -1101,31 +1067,20 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get toggleAdminButton() {
     return (
       <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleAddAdmin)}
       >
         {this.state.addAdminLoading ? (
           <Spinner />
         ) : this.creatorIsAdmin_ ? (
-          capitalizeFirstLetter(I18NextService.i18n.t("remove_as_admin"))
+          I18NextService.i18n.t("remove_as_admin")
         ) : (
-          capitalizeFirstLetter(I18NextService.i18n.t("appoint_as_admin"))
+          I18NextService.i18n.t("appoint_as_admin")
         )}
       </button>
     );
   }
 
-  get transferCommunityButton() {
-    return (
-      <button
-        className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
-        onClick={linkEvent(this, this.handleShowConfirmTransferCommunity)}
-      >
-        {capitalizeFirstLetter(I18NextService.i18n.t("transfer_community"))}
-      </button>
-    );
-  }
-
   get modRemoveButton() {
     const removed = this.postView.post.removed;
     return (
@@ -1140,17 +1095,102 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
         {this.state.removeLoading ? (
           <Spinner />
         ) : !removed ? (
-          capitalizeFirstLetter(I18NextService.i18n.t("remove_post"))
+          I18NextService.i18n.t("remove")
         ) : (
-          <>
-            {capitalizeFirstLetter(I18NextService.i18n.t("restore"))}{" "}
-            {I18NextService.i18n.t("post")}
-          </>
+          I18NextService.i18n.t("restore")
         )}
       </button>
     );
   }
 
+  /**
+   * Mod/Admin actions to be taken against the author.
+   */
+  userActionsLine() {
+    // TODO: make nicer
+    const post_view = this.postView;
+    return (
+      this.state.showAdvanced && (
+        <div className="mt-3">
+          {this.canMod_ && (
+            <>
+              {!this.creatorIsMod_ &&
+                (!post_view.creator_banned_from_community
+                  ? this.modBanFromCommunityButton
+                  : this.modUnbanFromCommunityButton)}
+              {!post_view.creator_banned_from_community &&
+                this.addModToCommunityButton}
+            </>
+          )}
+
+          {/* Community creators and admins can transfer community to another mod */}
+          {(amCommunityCreator(post_view.creator.id, this.props.moderators) ||
+            this.canAdmin_) &&
+            this.creatorIsMod_ &&
+            (!this.state.showConfirmTransferCommunity ? (
+              <button
+                className="btn btn-link btn-animate text-muted py-0"
+                onClick={linkEvent(
+                  this,
+                  this.handleShowConfirmTransferCommunity
+                )}
+                aria-label={I18NextService.i18n.t("transfer_community")}
+              >
+                {I18NextService.i18n.t("transfer_community")}
+              </button>
+            ) : (
+              <>
+                <button
+                  className="d-inline-block me-1 btn btn-link btn-animate text-muted py-0"
+                  aria-label={I18NextService.i18n.t("are_you_sure")}
+                >
+                  {I18NextService.i18n.t("are_you_sure")}
+                </button>
+                <button
+                  className="btn btn-link btn-animate text-muted py-0 d-inline-block me-1"
+                  aria-label={I18NextService.i18n.t("yes")}
+                  onClick={linkEvent(this, this.handleTransferCommunity)}
+                >
+                  {this.state.transferLoading ? (
+                    <Spinner />
+                  ) : (
+                    I18NextService.i18n.t("yes")
+                  )}
+                </button>
+                <button
+                  className="btn btn-link btn-animate text-muted py-0 d-inline-block"
+                  onClick={linkEvent(
+                    this,
+                    this.handleCancelShowConfirmTransferCommunity
+                  )}
+                  aria-label={I18NextService.i18n.t("no")}
+                >
+                  {I18NextService.i18n.t("no")}
+                </button>
+              </>
+            ))}
+          {/* Admins can ban from all, and appoint other admins */}
+          {this.canAdmin_ && (
+            <>
+              {!this.creatorIsAdmin_ && (
+                <>
+                  {!isBanned(post_view.creator)
+                    ? this.modBanButton
+                    : this.modUnbanButton}
+                  {this.purgePersonButton}
+                  {this.purgePostButton}
+                </>
+              )}
+              {!isBanned(post_view.creator) &&
+                post_view.creator.local &&
+                this.toggleAdminButton}
+            </>
+          )}
+        </div>
+      )
+    );
+  }
+
   removeAndBanDialogs() {
     const post = this.postView;
     const purgeTypeText =
@@ -1178,7 +1218,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
               value={this.state.removeReason}
               onInput={linkEvent(this, this.handleModRemoveReasonChange)}
             />
-            <button type="submit" className="btn btn-secondary">
+            <button
+              type="submit"
+              className="btn btn-secondary"
+              aria-label={I18NextService.i18n.t("remove_post")}
+            >
               {this.state.removeLoading ? (
                 <Spinner />
               ) : (
@@ -1187,33 +1231,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             </button>
           </form>
         )}
-        {this.state.showConfirmTransferCommunity && (
-          <>
-            <button className="d-inline-block me-1 btn btn-link btn-animate text-muted py-0">
-              {I18NextService.i18n.t("are_you_sure")}
-            </button>
-            <button
-              className="btn btn-link btn-animate text-muted py-0 d-inline-block me-1"
-              onClick={linkEvent(this, this.handleTransferCommunity)}
-            >
-              {this.state.transferLoading ? (
-                <Spinner />
-              ) : (
-                I18NextService.i18n.t("yes")
-              )}
-            </button>
-            <button
-              className="btn btn-link btn-animate text-muted py-0 d-inline-block"
-              onClick={linkEvent(
-                this,
-                this.handleCancelShowConfirmTransferCommunity
-              )}
-              aria-label={I18NextService.i18n.t("no")}
-            >
-              {I18NextService.i18n.t("no")}
-            </button>
-          </>
-        )}
         {this.state.showBanDialog && (
           <form onSubmit={linkEvent(this, this.handleModBanBothSubmit)}>
             <div className="mb-3 row col-12">
@@ -1267,7 +1284,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             {/*   <input type="date" class="form-control me-2" placeholder={I18NextService.i18n.t('expires')} value={this.state.banExpires} onInput={linkEvent(this, this.handleModBanExpiresChange)} /> */}
             {/* </div> */}
             <div className="mb-3 row">
-              <button type="submit" className="btn btn-secondary">
+              <button
+                type="submit"
+                className="btn btn-secondary"
+                aria-label={I18NextService.i18n.t("ban")}
+              >
                 {this.state.banLoading ? (
                   <Spinner />
                 ) : (
@@ -1296,7 +1317,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
               value={this.state.reportReason}
               onInput={linkEvent(this, this.handleReportReasonChange)}
             />
-            <button type="submit" className="btn btn-secondary">
+            <button
+              type="submit"
+              className="btn btn-secondary"
+              aria-label={I18NextService.i18n.t("create_report")}
+            >
               {this.state.reportLoading ? (
                 <Spinner />
               ) : (
@@ -1325,7 +1350,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             {this.state.purgeLoading ? (
               <Spinner />
             ) : (
-              <button type="submit" className="btn btn-secondary">
+              <button
+                type="submit"
+                className="btn btn-secondary"
+                aria-label={purgeTypeText}
+              >
                 {this.state.purgeLoading ? <Spinner /> : { purgeTypeText }}
               </button>
             )}
@@ -1380,6 +1409,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
               {this.mobileThumbnail()}
 
               {this.commentsLine(true)}
+              {this.userActionsLine()}
               {this.duplicatesLine()}
               {this.removeAndBanDialogs()}
             </div>
@@ -1411,6 +1441,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                   {this.createdLine()}
                   {this.commentsLine()}
                   {this.duplicatesLine()}
+                  {this.userActionsLine()}
                   {this.removeAndBanDialogs()}
                 </div>
               </div>

src/shared/components/search.tsx

@@ -332,7 +332,9 @@ export class Search extends Component<any, SearchState> {
   }
 
   async componentDidMount() {
-    if (!this.state.isIsomorphic) {
+    if (
+      !(this.state.isIsomorphic || this.props.history.location.state?.searched)
+    ) {
       const promises = [this.fetchCommunities()];
       if (this.state.searchText) {
         promises.push(this.search());
@@ -430,15 +432,7 @@ export class Search extends Component<any, SearchState> {
             q: query,
             auth,
           };
-          resolveObjectResponse = await HttpService.silent_client.resolveObject(
-            resolveObjectForm
-          );
-
-          // If we return this object with a state of failed, the catch-all-handler will redirect
-          // to an error page, so we ignore it by covering up the error with the empty state.
-          if (resolveObjectResponse.state === "failed") {
-            resolveObjectResponse = { state: "empty" };
-          }
+          resolveObjectResponse = await client.resolveObject(resolveObjectForm);
         }
       }
     }
@@ -956,7 +950,7 @@ export class Search extends Component<any, SearchState> {
       if (auth) {
         this.setState({ resolveObjectRes: { state: "loading" } });
         this.setState({
-          resolveObjectRes: await HttpService.silent_client.resolveObject({
+          resolveObjectRes: await HttpService.client.resolveObject({
             q,
             auth,
           }),
@@ -1103,6 +1097,10 @@ export class Search extends Component<any, SearchState> {
       sort: sort ?? urlSort,
     };
 
-    this.props.history.push(`/search${getQueryString(queryParams)}`);
+    this.props.history.push(`/search${getQueryString(queryParams)}`, {
+      searched: true,
+    });
+
+    await this.search();
   }
 }

src/shared/config.ts

@@ -1,7 +1,5 @@
-import { getStaticDir } from "@utils/env";
-
-export const favIconUrl = `${getStaticDir()}/assets/icons/favicon.svg`;
-export const favIconPngUrl = `${getStaticDir()}/assets/icons/apple-touch-icon.png`;
+export const favIconUrl = "/static/assets/icons/favicon.svg";
+export const favIconPngUrl = "/static/assets/icons/apple-touch-icon.png";
 
 export const repoUrl = "https://github.com/LemmyNet";
 export const joinLemmyUrl = "https://join-lemmy.org";

src/shared/services/HttpService.ts

@@ -1,9 +1,9 @@
 import { getHttpBase } from "@utils/env";
 import { LemmyHttp } from "lemmy-js-client";
-import { toast } from "../toast";
+import { toast } from "../../shared/toast";
 import { I18NextService } from "./I18NextService";
 
-export type EmptyRequestState = {
+type EmptyRequestState = {
   state: "empty";
 };
 
@@ -45,7 +45,7 @@ export type WrappedLemmyHttp = {
 class WrappedLemmyHttpClient {
   #client: LemmyHttp;
 
-  constructor(client: LemmyHttp, silent = false) {
+  constructor(client: LemmyHttp) {
     this.#client = client;
 
     for (const key of Object.getOwnPropertyNames(
@@ -61,10 +61,8 @@ class WrappedLemmyHttpClient {
               state: !(res === undefined || res === null) ? "success" : "empty",
             };
           } catch (error) {
-            if (!silent) {
-              console.error(`API error: ${error}`);
-              toast(I18NextService.i18n.t(error), "danger");
-            }
+            console.error(`API error: ${error}`);
+            toast(I18NextService.i18n.t(error), "danger");
             return {
               state: "failed",
               msg: error,
@@ -76,23 +74,16 @@ class WrappedLemmyHttpClient {
   }
 }
 
-export function wrapClient(client: LemmyHttp, silent = false) {
-  // unfortunately, this verbose cast is necessary
-  return new WrappedLemmyHttpClient(
-    client,
-    silent
-  ) as unknown as WrappedLemmyHttp;
+export function wrapClient(client: LemmyHttp) {
+  return new WrappedLemmyHttpClient(client) as unknown as WrappedLemmyHttp; // unfortunately, this verbose cast is necessary
 }
 
 export class HttpService {
   static #_instance: HttpService;
-  #silent_client: WrappedLemmyHttp;
   #client: WrappedLemmyHttp;
 
   private constructor() {
-    const lemmyHttp = new LemmyHttp(getHttpBase());
-    this.#client = wrapClient(lemmyHttp);
-    this.#silent_client = wrapClient(lemmyHttp, true);
+    this.#client = wrapClient(new LemmyHttp(getHttpBase()));
   }
 
   static get #Instance() {
@@ -102,8 +93,4 @@ export class HttpService {
   public static get client() {
     return this.#Instance.#client;
   }
-
-  public static get silent_client() {
-    return this.#Instance.#silent_client;
-  }
 }

src/shared/utils/app/is-auth-path.ts

@@ -1,5 +1,5 @@
 export default function isAuthPath(pathname: string) {
-  return /^\/create_.*|inbox|settings|admin|reports|registration_applications/g.test(
+  return /create_.*|inbox|settings|admin|reports|registration_applications/g.test(
     pathname
   );
 }

src/shared/utils/env/get-static-dir.ts

@@ -1,5 +0,0 @@
-// Returns path to static directory, intended
-// for cache-busting based on latest commit hash.
-export default function getStaticDir() {
-  return `/static/${process.env.COMMIT_HASH}`;
-}

src/shared/utils/env/index.ts

@@ -6,7 +6,6 @@ import getHttpBaseExternal from "./get-http-base-external";
 import getHttpBaseInternal from "./get-http-base-internal";
 import getInternalHost from "./get-internal-host";
 import getSecure from "./get-secure";
-import getStaticDir from "./get-static-dir";
 import httpExternalPath from "./http-external-path";
 import isHttps from "./is-https";
 
@@ -19,7 +18,6 @@ export {
   getHttpBaseInternal,
   getInternalHost,
   getSecure,
-  getStaticDir,
   httpExternalPath,
   isHttps,
 };

src/shared/utils/helpers/format-past-date.ts

@@ -2,8 +2,11 @@ import formatDistanceStrict from "date-fns/formatDistanceStrict";
 import parseISO from "date-fns/parseISO";
 
 export default function (dateString?: string) {
-  const parsed = parseISO((dateString ?? Date.now().toString()) + "Z");
-  return formatDistanceStrict(parsed, new Date(), {
-    addSuffix: true,
-  });
+  return formatDistanceStrict(
+    parseISO(dateString ?? Date.now().toString()),
+    new Date(),
+    {
+      addSuffix: true,
+    }
+  );
 }

webpack.config.js

@@ -14,63 +14,56 @@ const banner = `
   @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0
   `;
 
-function getBase(env, mode) {
-  return {
-    output: {
-      filename: "js/server.js",
-      publicPath: "/",
-      hashFunction: "xxhash64",
+const base = {
+  output: {
+    filename: "js/server.js",
+    publicPath: "/",
+    hashFunction: "xxhash64",
+  },
+  resolve: {
+    extensions: [".js", ".jsx", ".ts", ".tsx"],
+    alias: {
+      "@": path.resolve(__dirname, "src/"),
+      "@utils": path.resolve(__dirname, "src/shared/utils/"),
     },
-    resolve: {
-      extensions: [".js", ".jsx", ".ts", ".tsx"],
-      alias: {
-        "@": path.resolve(__dirname, "src/"),
-        "@utils": path.resolve(__dirname, "src/shared/utils/"),
+  },
+  performance: {
+    hints: false,
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(scss|css)$/i,
+        use: [MiniCssExtractPlugin.loader, "css-loader", "sass-loader"],
       },
-    },
-    performance: {
-      hints: false,
-    },
-    module: {
-      rules: [
-        {
-          test: /\.(scss|css)$/i,
-          use: [MiniCssExtractPlugin.loader, "css-loader", "sass-loader"],
+      {
+        test: /\.(js|jsx|tsx|ts)$/, // All ts and tsx files will be process by
+        exclude: /node_modules/, // ignore node_modules
+        loader: "babel-loader",
+      },
+      // Due to some weird babel issue: https://github.com/webpack/webpack/issues/11467
+      {
+        test: /\.m?js/,
+        resolve: {
+          fullySpecified: false,
         },
-        {
-          test: /\.(js|jsx|tsx|ts)$/, // All ts and tsx files will be process by
-          exclude: /node_modules/, // ignore node_modules
-          loader: "babel-loader",
-        },
-        // Due to some weird babel issue: https://github.com/webpack/webpack/issues/11467
-        {
-          test: /\.m?js/,
-          resolve: {
-            fullySpecified: false,
-          },
-        },
-      ],
-    },
-    plugins: [
-      new webpack.DefinePlugin({
-        "process.env.COMMIT_HASH": `"${env.COMMIT_HASH}"`,
-        "process.env.NODE_ENV": `"${mode}"`,
-      }),
-      new MiniCssExtractPlugin({
-        filename: "styles/styles.css",
-      }),
-      new CopyPlugin({
-        patterns: [{ from: "./src/assets", to: "./assets" }],
-      }),
-      new webpack.BannerPlugin({
-        banner,
-      }),
+      },
     ],
-  };
-}
+  },
+  plugins: [
+    new MiniCssExtractPlugin({
+      filename: "styles/styles.css",
+    }),
+    new CopyPlugin({
+      patterns: [{ from: "./src/assets", to: "./assets" }],
+    }),
+    new webpack.BannerPlugin({
+      banner,
+    }),
+  ],
+};
 
-const createServerConfig = (env, mode) => {
-  const base = getBase(env, mode);
+const createServerConfig = (_env, mode) => {
   const config = merge({}, base, {
     mode,
     entry: "./src/server/index.tsx",
@@ -97,14 +90,12 @@ const createServerConfig = (env, mode) => {
   return config;
 };
 
-const createClientConfig = (env, mode) => {
-  const base = getBase(env, mode);
+const createClientConfig = (_env, mode) => {
   const config = merge({}, base, {
     mode,
     entry: "./src/client/index.tsx",
     output: {
       filename: "js/client.js",
-      publicPath: `/static/${env.COMMIT_HASH}/`,
     },
     plugins: [
       ...base.plugins,
@@ -112,10 +103,10 @@ const createClientConfig = (env, mode) => {
         enableInDevelopment: mode !== "development", // this may seem counterintuitive, but it is correct
         workbox: {
           modifyURLPrefix: {
-            "/": `/static/${env.COMMIT_HASH}/`,
+            "/": "/static/",
           },
           cacheId: "lemmy",
-          include: [/(assets|styles|js)\/.+\..+$/g],
+          include: [/(assets|styles)\/.+\..+|client\.js$/g],
           inlineWorkboxRuntime: true,
           runtimeCaching: [
             {