From 83a3585940bb7400e2906a498059884f4c13d3dd Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Sat, 7 May 2022 10:45:18 +0100
Subject: [PATCH 1/6] chore: add notice

---
 src/pages/RevoltApp.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pages/RevoltApp.tsx b/src/pages/RevoltApp.tsx
index e88fe208..93b623a1 100644
--- a/src/pages/RevoltApp.tsx
+++ b/src/pages/RevoltApp.tsx
@@ -112,19 +112,21 @@ export default function App() {
         path.startsWith("/invite") ||
         path.includes("/settings");
 
-    const [statusBar, setStatusBar] = useState(false);
+    const [statusBar, setStatusBar] = useState(true);
 
     return (
         <>
             {statusBar && (
                 <StatusBar>
-                    <div className="title">Partial outage: CDN</div>
+                    <div className="title">
+                        Planned Maintenance at 18:00 UTC (7th May 2022)
+                    </div>
                     <div class="actions">
-                        <Link to="/invite/Testers">
-                            <a>
-                                <div className="button">Updates</div>
-                            </a>
-                        </Link>
+                        <a
+                            href="https://github.com/revoltchat/revolt/issues/322#issuecomment-1120176609"
+                            target="_blank">
+                            <div className="button">Updates</div>
+                        </a>
                         <a onClick={() => setStatusBar(false)}>
                             <div className="button">Dismiss</div>
                         </a>

From 9807ef9c9a70a7809d5e86c5dfe73e456ac0ce02 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Mon, 18 Jul 2022 12:59:17 +0100
Subject: [PATCH 2/6] fix: match optional whitespace in quote regex

---
 src/components/markdown/RemarkRenderer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/markdown/RemarkRenderer.tsx b/src/components/markdown/RemarkRenderer.tsx
index e3b2f3d6..c02edcbb 100644
--- a/src/components/markdown/RemarkRenderer.tsx
+++ b/src/components/markdown/RemarkRenderer.tsx
@@ -182,7 +182,7 @@ const Container = styled.div<{ largeEmoji: boolean }>`
 /**
  * Regex for matching execessive blockquotes
  */
-const RE_QUOTE = /(^(?:>\s){5})[>\s]+(.*$)/gm;
+const RE_QUOTE = /(^(?:>\s?){5})[>\s?]+(.*$)/gm;
 
 /**
  * Sanitise Markdown input before rendering

From 3fbf315587ea27c103578da5502b843ecf53fb09 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Mon, 18 Jul 2022 13:02:40 +0100
Subject: [PATCH 3/6] fix: add LoadSuspense around verification page

---
 src/pages/app.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/app.tsx b/src/pages/app.tsx
index f84078df..c084b6ea 100644
--- a/src/pages/app.tsx
+++ b/src/pages/app.tsx
@@ -27,7 +27,9 @@ export function App() {
                 <Masks />
                 <Switch>
                     <Route path="/login/verify/:token">
-                        <Login />
+                        <LoadSuspense>
+                            <Login />
+                        </LoadSuspense>
                     </Route>
                     <Route path="/login/reset/:token">
                         <LoadSuspense>

From 791f4dfd89fe9a3467800904102386f568462a78 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Mon, 18 Jul 2022 13:04:03 +0100
Subject: [PATCH 4/6] chore: bump lang submodule

---
 external/lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/lang b/external/lang
index 1a854216..cf0b1893 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit 1a8542166173445602c0a4a8f821806002fd2fc4
+Subproject commit cf0b1893b66bbe100580ed2f2950d1ce125aee10

From 7e89dcfb1319485699aeffd1f3f9eb9f0d594ce9 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sun, 6 Nov 2022 13:21:06 +0000
Subject: [PATCH 5/6] chore: add notice for iCloud users

---
 src/pages/login/forms/MailProvider.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/login/forms/MailProvider.tsx b/src/pages/login/forms/MailProvider.tsx
index ac384ebd..d340b31f 100644
--- a/src/pages/login/forms/MailProvider.tsx
+++ b/src/pages/login/forms/MailProvider.tsx
@@ -1,7 +1,7 @@
 import styles from "../Login.module.scss";
 import { Text } from "preact-i18n";
 
-import { Button } from "@revoltchat/ui";
+import { Button, Tip } from "@revoltchat/ui";
 
 interface Props {
     email?: string;
@@ -115,6 +115,15 @@ export function MailProvider({ email }: Props) {
                     />
                 </Button>
             </a>
+            {provider[0] === "iCloud Mail" && (
+                <Tip palette="error">
+                    <span>
+                        iCloud users may not receive any emails due to a block
+                        by Proofpoint. Please use a different email provider if
+                        you do not receive anything.
+                    </span>
+                </Tip>
+            )}
         </div>
     );
 }

From 9be4afe241c56e64944ebde5834569ced7c75334 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sun, 6 Nov 2022 13:26:41 +0000
Subject: [PATCH 6/6] fix: allow setting custom remote for publish

---
 scripts/publish.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/publish.sh b/scripts/publish.sh
index 90c093cf..0ce86fe7 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -2,7 +2,10 @@
 # Build and publish release to production server
 
 # Remote Server
-REMOTE=revolt-de-nrb-1
+if [ -z "$REMOTE" ]; then
+    echo "Please set REMOTE!"
+    exit
+fi
 
 # Remote Directory
 REMOTE_DIR=/root/revite