From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:04:25 +0000 (-0400)
Subject: fix merge conflicts
X-Git-Url: http://these/git/ui/assets/static/%22%7Burl%7D/%22?a=commitdiff_plain;h=8e767f2331c1c5cfc34d7385812f12223f4e93b9;p=lemmy-ui.git

fix merge conflicts
---

8e767f2331c1c5cfc34d7385812f12223f4e93b9
diff --cc src/server/handlers/catch-all-handler.tsx
index e57f079,efadee4..f22b8a1
--- a/src/server/handlers/catch-all-handler.tsx
+++ b/src/server/handlers/catch-all-handler.tsx
@@@ -1,6 -1,6 +1,7 @@@
  import { initializeSite, isAuthPath } from "@utils/app";
 +import { getHttpBaseInternal } from "@utils/env";
  import { ErrorPageData } from "@utils/types";
+ import fetch from "cross-fetch";
  import type { Request, Response } from "express";
  import { StaticRouter, matchPath } from "inferno-router";
  import { renderToString } from "inferno-server";
diff --cc src/server/handlers/manifest-handler.ts
index 014e034,b9a1108..c1756f7
--- a/src/server/handlers/manifest-handler.ts
+++ b/src/server/handlers/manifest-handler.ts
@@@ -1,6 -1,7 +1,7 @@@
 +import { getHttpBaseExternal, getHttpBaseInternal } from "@utils/env";
+ import fetch from "cross-fetch";
  import type { Request, Response } from "express";
  import { LemmyHttp } from "lemmy-js-client";
 -import { getHttpBaseExternal, getHttpBaseInternal } from "../../shared/env";
  import { wrapClient } from "../../shared/services/HttpService";
  import generateManifestJson from "../utils/generate-manifest-json";
  import { setForwardedHeaders } from "../utils/set-forwarded-headers";
diff --cc src/shared/components/post/post-listing.tsx
index 8e4d730,b9ad5eb..4d0951b
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@@ -1,7 -1,11 +1,12 @@@
  import { myAuthRequired, newVote, showScores } from "@utils/app";
  import { canShare, share } from "@utils/browser";
 +import { getExternalHost, getHttpBase } from "@utils/env";
- import { futureDaysToUnixTime, hostname, numToSI } from "@utils/helpers";
+ import {
+   capitalizeFirstLetter,
+   futureDaysToUnixTime,
+   hostname,
+   numToSI,
+ } from "@utils/helpers";
  import { isImage, isVideo } from "@utils/media";
  import {
    amAdmin,