From 159e3a0035024b16ed48a78b14782b62de67469f Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Thu, 25 Mar 2021 11:58:29 -0400
Subject: [PATCH] Fixing custom favicons. Fixes #220

---
 src/server/index.tsx          |  4 ----
 src/shared/components/app.tsx | 11 +++++++++--
 src/shared/utils.ts           |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/server/index.tsx b/src/server/index.tsx
index 0dcd164..1382889 100644
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -133,10 +133,6 @@ server.get("/*", async (req, res) => {
            <!-- Web app manifest -->
            <link rel="manifest" href="/static/assets/manifest.webmanifest">
 
-           <!-- Icons -->
-           <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/icons/favicon.svg" />
-           <link rel="apple-touch-icon" href="/static/assets/icons/apple-touch-icon.png" />
-
            <!-- Styles -->
            <link rel="stylesheet" type="text/css" href="/static/styles/styles.css" />
 
diff --git a/src/shared/components/app.tsx b/src/shared/components/app.tsx
index 262e4b5..6012d31 100644
--- a/src/shared/components/app.tsx
+++ b/src/shared/components/app.tsx
@@ -11,6 +11,7 @@ import { Theme } from "./theme";
 import { Symbols } from "./symbols";
 import { GetSiteResponse } from "lemmy-js-client";
 import "./styles.scss";
+import { favIconPngUrl, favIconUrl } from "shared/utils";
 
 export interface AppProps {
   siteRes: GetSiteResponse;
@@ -33,9 +34,15 @@ export class App extends Component<AppProps, any> {
                 <Helmet>
                   <link
                     id="favicon"
-                    rel="icon"
+                    rel="shortcut icon"
                     type="image/x-icon"
-                    href={this.props.siteRes.site_view.site.icon}
+                    href={this.props.siteRes.site_view.site.icon || favIconUrl}
+                  />
+                  <link
+                    rel="apple-touch-icon"
+                    href={
+                      this.props.siteRes.site_view.site.icon || favIconPngUrl
+                    }
                   />
                 </Helmet>
               )}
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 363f810..3049a03 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -72,8 +72,8 @@ import { i18n } from "./i18next";
 
 export const wsClient = new LemmyWebsocket();
 
-export const favIconUrl = "/static/assets/favicon.svg";
-export const favIconPngUrl = "/static/assets/apple-touch-icon.png";
+export const favIconUrl = "/static/assets/icons/favicon.svg";
+export const favIconPngUrl = "/static/assets/icons/apple-touch-icon.png";
 // TODO
 // export const defaultFavIcon = `${window.location.protocol}//${window.location.host}${favIconPngUrl}`;
 export const repoUrl = "https://github.com/LemmyNet";
-- 
2.44.1