.gitignore

@@ -29,3 +29,5 @@ yarn-error.log*
 .env.test.local
 .env.production.local
 .env
+
+.vercel

LICENSE

+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

ROADMAP.md

+*Last updated: 08. May 2021*
+
+# Roadmap
+
+> ## Please read!
+> This roadmap is a rough approximation of the major features being added, please look to the [release tracker for more detailed information](https://github.com/orgs/revoltchat/projects/2). You can also talk to the team and monitor development from the REVOLT testers server. (which is also [bridged to Discord here!](https://discord.gg/AWFZeCc))
+
+## 0.4: Voice
+
+This update introduces voice support to REVOLT.
+
+### Release Features
+
+[x]  Voice Chat
+
+### General Features
+
+[x]  Ability to change username.
+[x]  Markdown User Profiles
+[x]  User Badges
+[x]  User Status
+  [x]  Status Indicators
+[x]  Re-designed languages page in settings.
+[x]  Ability to change group name / description.
+[x]  Mention auto-complete.
+[x]  Emoji auto-complete.
+
+### Improvements
+
+[x]  Combo box design.
+[x]  User selector design.
+[x]  Show participants on sidebar.
+[x]  Improve call design.
+
+## 0.4.1: CDN Rework
+
+This update aims to refine how the CDN works.
+
+### Features
+
+[x]  Add support for S3.
+[x]  Remove EXIF data.
+[x]  Link embeds.
+[x]  Image proxy.
+[x]  Announce max file limit through server configuration.
+[x]  Save file size to database, and display it in client.
+[x]  Improve image / video detection, hence allow more file types.
+[x]  Ability to change group icons.
+[x]  Ability to change user profile picture.
+[x]  Ability to change user profile background image.
+
+### Improvements
+
+[ ]  Deafening
+[ ]  Volume Sliders
+[ ]  Show Call Status Globally
+[ ]  Ringing
+[ ]  Use server configuration to determine endpoints for voso.
+[x]  Allow failed image / video uploads to be uploaded as a normal file.
+
+## 0.5: Servers
+
+This update adds community and server features.
+
+### Features
+
+[x]  Ability to create a server.
+[x]  Creating, editing and deleting server channels.
+[x]  Ability to edit server. (name, description, banner)
+[x]  Ability to ban and unban users.
+[x]  Invites.
+[x]  Roles.
+[x]  Permission editor.
+
+## 0.5.2: Bot Support
+
+This update adds bot support.
+
+### Features
+
+[ ]  Mini member pop out.
+[ ]  Bot support.
+[ ]  Webhooks for groups / guild channels.
+
+## 0.5.3: Moderation and Native BRidges
+
+This update adds natively supported bridges to other platforms.
+
+### Features
+
+[ ]  Built-in bridges to other platforms.
+  [ ]  Discord bridge. (prototype has already been built)
+  [ ]  Matrix bridge.
+
+## 0.5.4: Emoji Overhaul
+
+This update adds better emoji support. This is more or less a requirement to bringing in certain people over.
+
+### Features
+
+[ ]  Emoji Picker
+[ ]  Server Emojis
+[ ]  Message Reactions
+
+## (draft) 0.6.0: E2EE Chat
+
+This is the drafted version for e2ee.

components/Footer.tsx

-import { Gitlab, Reddit, Twitter } from '@styled-icons/simple-icons';
+import URLs from '../urls';
 import Link from 'next/link';
-import { URLs } from '../urls';
 import styles from './Footer.module.scss';
+import { Gitlab, Reddit, Twitter, Mastodon, Github } from '@styled-icons/simple-icons';
 
 export function Footer() {
     return (
@@ -9,29 +9,40 @@ export function Footer() {
             <div className={styles.branding}>
                 <img src="/logo.svg" draggable={false} />
                 <div className={styles.socials}>
-                    <a href="https://gitlab.insrt.uk/revolt">
+                    <a href={URLs.GitHub}>
+                        <Github size={24} />
+                    </a>
+                    <a href={URLs.GitLab}>
                         <Gitlab size={24} />
                     </a>
-                    <a href="https://reddit.com/r/revoltchat">
+                    <a href={URLs.Reddit}>
                         <Reddit size={24} />
                     </a>
-                    <a href="https://twitter.com/revoltchat">
+                    <a href={URLs.Twitter}>
                         <Twitter size={24} />
                     </a>
+                    <a rel="me" href={URLs.Mastodon}>
+                        <Mastodon size={24} />
+                    </a>
                 </div>
             </div>
             <div className={styles.links}>
                 <div className={styles.column}>
                     <b>App</b>
                     <a href={URLs.App}>Open App</a>
-                    <a href={URLs.Roadmap}>Roadmap</a>
+                    <Link href="/roadmap">
+                        <a>Roadmap</a>
+                    </Link>
+                    <a href={URLs.ReleaseTracker}>
+                        <a>Release Tracker</a>
+                    </a>
                     {/*<a>Download</a>
                     <a>Features</a>
                     <a>Branding</a>*/}
                 </div>
                 <div className={styles.column}>
                     <b>Developers</b>
-                    <a href={URLs.SourceCode}>Contribute</a>
+                    <a href={URLs.GitHub}>Contribute</a>
                     <a href={URLs.Developers}>Documentation</a>
                     <a href={URLs.Translate}>Help translate</a>
                 </div>
@@ -40,6 +51,7 @@ export function Footer() {
                     <Link href="/about">
                         <a>About Us</a>
                     </Link>
+                    <a href="mailto:hello@revolt.chat">Email</a>
                 </div>
                 <div className={styles.column}>
                     <b>Legal</b>

components/JoinLinks.tsx

-import { URLs } from '../urls';
+import URLs from '../urls';
 import classNames from 'classnames';
 import { Edit } from '@styled-icons/feather';
 import styles from './JoinLinks.module.scss';
@@ -10,8 +10,8 @@ interface Props {
 export function JoinLinks(props: Props) {
     return (
         <div className={styles.actions}>
-            <a className={classNames("button", "red", props.contrast && "border")} href={URLs.Apply}>
-                <Edit size={24} strokeWidth={2}/> Apply for the Beta
+            <a className={classNames("button", "red", props.contrast && "border")} href={URLs.PublicBeta}>
+                <Edit size={24} strokeWidth={2}/> Join Public Beta
             </a>
             <a className="button" href={URLs.App}>
                 Open Web app

components/Markdown.module.scss

@@ -30,4 +30,41 @@
             opacity: 0.8;
         }
     }
+
+    input[type="checkbox"] {
+        opacity: 0;
+        margin-top: 12px;
+        pointer-events: none;
+        display: inline-block;
+    }
+
+    label {
+        pointer-events: none;
+    }
+
+    input[type="checkbox"] + label:before {
+        width: 32px;
+        height: 32px;
+        content: 'a';
+        line-height: 32px;
+        position: relative;
+        border-radius: 6px;
+        background: white;
+        display: inline-block;
+    }
+
+    input[type="checkbox"][checked="true"] + label:before {
+        content: '✓';
+        align-items: center;
+        display: inline-flex;
+        justify-content: center;
+        background: var(--accent);
+    }
+
+    input[type="checkbox"] + label {
+        top: -6px;
+        line-height: 20px;
+        padding-left: 6px;
+        position: relative;
+    }
 }

components/Markdown.tsx

 import MarkdownIt from "markdown-it";
 import styles from './Markdown.module.scss';
 import MarkdownItAnchor from "markdown-it-anchor";
+import MarkdownItCheckbox from "markdown-it-checkbox";
 
 export const md: MarkdownIt = MarkdownIt({ breaks: true, linkify: true })
-    .use(MarkdownItAnchor, { level: 3 });
+    .use(MarkdownItAnchor, { level: 3 })
+    .use(MarkdownItCheckbox);
 
 interface Props {
     content?: string;

components/Navbar.tsx

 import Link from 'next/link';
-import { URLs } from '../urls';
 import styles from './Navbar.module.scss';
 import { Globe } from '@styled-icons/feather';
 
@@ -12,7 +11,9 @@ export function Navbar() {
                 </a>
             </Link>
             <div className={styles.actions}>
-                <a href={URLs.Roadmap} target="_blank">Roadmap</a>
+                <Link href="/roadmap">
+                    <a>Roadmap</a>
+                </Link>
                 {/* <a>Developers</a> */}
                 {/* <a>Download</a> */}
                 {/*<a><Globe size={28} strokeWidth={2} /></a>*/}

legal @ 9beb7ab7

-Subproject commit 587d133232e7c739cffd449c4e011d0519a0a6c4
+Subproject commit 9beb7ab7b8f219d6b03a775a3fbbb7a937848554

package.json

@@ -10,10 +10,12 @@
   },
   "dependencies": {
     "next": "^10.1.3",
+    "nextjs-redirect": "^5.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
+    "@fontsource/inter": "^4.2.2",
     "@styled-icons/feather": "^10.18.0",
     "@styled-icons/simple-icons": "^10.33.0",
     "@types/node": "^14.14.41",
@@ -21,6 +23,7 @@
     "classnames": "^2.3.1",
     "markdown-it": "^12.0.6",
     "markdown-it-anchor": "^7.1.0",
+    "markdown-it-checkbox": "^1.1.0",
     "sass": "^1.32.10",
     "styled-components": "^5.2.3",
     "typescript": "^4.2.4"

pages/about.tsx

@@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) {
                 <title>About Revolt</title>
                 <link rel="icon" href="/favicon.ico" />
                 <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
-
-                <link rel="preconnect" href="https://fonts.gstatic.com" />
-                <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" />
             </Head>
             <main>
                 <Navbar />

pages/aup.tsx

@@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) {
                 <title>Acceptable Usage Policy - Revolt</title>
                 <link rel="icon" href="/favicon.ico" />
                 <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
-
-                <link rel="preconnect" href="https://fonts.gstatic.com" />
-                <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" />
             </Head>
             <main>
                 <Navbar />

pages/beta.ts

+import URLs from '../urls';
+import redirect from 'nextjs-redirect';
+export default redirect(URLs.ApplicationForm);

pages/index.tsx

+import URLs from '../urls';
 import Head from 'next/head';
 import { Footer } from '../components/Footer';
-import { JoinLinks } from '../components/JoinLinks';
-import { ArrowRight, HelpCircle } from '@styled-icons/feather';
-import { JoinPrompt } from '../components/JoinPrompt';
 import { Navbar } from '../components/Navbar';
 import styles from '../styles/Home.module.scss';
-import { URLs } from '../urls';
+import { JoinLinks } from '../components/JoinLinks';
+import { JoinPrompt } from '../components/JoinPrompt';
+import { ArrowRight, HelpCircle } from '@styled-icons/feather';
 
 export default function Home() {
     return (
@@ -17,13 +17,13 @@ export default function Home() {
 
                 <meta property="og:title" content="Revolt" />
                 <meta property="og:url" content="https://revolt.chat" />
-                <meta property="og:image" content="https://revolt.chat/embed.png" />
+                <meta property="og:image" content="https://revolt.chat/embed_new.png" />
                 <meta property="og:description" content="Don't bother with chat apps that don't respect your privacy. Revolt is a brand new chat platform designed around you." />
 
                 <meta property="twitter:title" content="Revolt" />
                 <meta property="twitter:site" content="@revoltchat" />
                 <meta property="twitter:card" content="summary_large_image" />
-                <meta property="twitter:image" content="https://revolt.chat/embed.png" />
+                <meta property="twitter:image" content="https://revolt.chat/embed_new.png" />
                 <meta property="twitter:image:alt" content='Image of REVOLT app alongside logo with subtext "Communication is critical. Privacy is essential."' />
                 <meta property="twitter:description" content="Don't bother with chat apps that don't respect your privacy. Revolt is a brand new chat platform designed around you." />
 
@@ -31,16 +31,12 @@ export default function Home() {
                 <meta property="og:image:width" content="1280" />
                 <meta property="og:image:height" content="720" />
 
-                <link rel="preconnect" href="https://fonts.gstatic.com" />
-                <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" />
-
-                <script async defer data-domain='revolt.chat' src='https://plausible.insrt.uk/js/plausible.js' />
-
-                {   // Firefox only: Scroll snapping.
+                {   // Disabled scroll snapping.
+                    /* // Firefox only: Scroll snapping.
                     // Doesn't work properly with Chromium.
                     typeof window !== 'undefined' &&
                     typeof (window as any).InstallTrigger !== 'undefined' &&
-                    <style dangerouslySetInnerHTML={{ __html: `html { scroll-snap-type: y mandatory; }` }} /> }
+                    <style dangerouslySetInnerHTML={{ __html: `html { scroll-snap-type: y mandatory; }` }} /> */ }
             </Head>
             <main>
                 <a className={styles.feedback} href={URLs.Feedback} target="_blank">
@@ -51,7 +47,7 @@ export default function Home() {
                     <div className={styles.overview}>
                         <div className={styles.left}>
                             <div className={styles.tagline}>
-                                <p>Don't bother with other chat apps when</p>
+                                <p>Don't bother with other chat apps.</p>
                                 <h1>Communication is critical.<br />Privacy is essential.</h1>
                                 <JoinLinks />
                             </div>
@@ -68,16 +64,16 @@ export default function Home() {
                     <div className={styles.content}>
                         <div>
                             <h1>Familiar and simple,<br/>just how you like it.</h1>
-                            <p>Revolt is built on the same technologies as other popular chat applications, so there won’t be any need to re-learn on how to use it. Also, you can customize it to your heart’s content.</p>
+                            <p>Revolt is built on the same technologies as other popular chat applications, so there won’t be any need to re-learn how to use it. If you don't like the default look, you can customize it to your heart’s content.</p>
                         </div>
                     </div>
                 </section>
                 <section className={styles.section}>
                     <div className={styles.content}>
                         <div>
-                            <h1>Open source<br />to the public</h1>
-                            <p>We believe that there’s more to it than just code. By having the Revolt project open source means that we can create a transparent layer between us and the user.<br/><br/>Contribute, create your own bot or make your own version of the Revolt client.</p>
-                            <a className={styles.link} href="https://gitlab.insrt.uk/revolt" target="_blank"><ArrowRight size={24} strokeWidth={2}/>View project on GitLab</a>
+                            <h1>Open source<br />to the public.</h1>
+                            <p>We believe that there’s more to it than just code. Having the Revolt project open source means that we can create a transparent layer between us and the user.<br/><br/>You can contribute, create your own bot, or make your own version of the Revolt client.</p>
+                            <a className={styles.link} href={URLs.GitHub} target="_blank"><ArrowRight size={24} strokeWidth={2}/>View project on GitHub</a>
                         </div>
                     </div>
                     <div className={styles.image}>
@@ -90,8 +86,8 @@ export default function Home() {
                     </div>
                     <div className={styles.content}>
                         <div>
-                            <h1>Available<br/>everywhere</h1>
-                            <p>From desktop to mobile, the Revolt app is available wherever you are, so you can chat, call or get in a video call, even if you're not in front of your computer.</p>
+                            <h1>Available<br/>everywhere.</h1>
+                            <p>From desktop to mobile, the Revolt app is available wherever you are, so you can hang out, coordinate a meetup, or hop in a video call, even if you're not in front of your computer.</p>
                         </div>
                     </div>
                 </section>
@@ -99,7 +95,7 @@ export default function Home() {
                     <div className={styles.content}>
                         <div>
                             <h1>Your data should be yours,<br/>not ours.</h1>
-                            <p>Privacy has become a major concern over the past few years, and we wanted to take action by building a <u>privacy-safe, open source chat platform without any data aggregation.</u></p>
+                            <p>Privacy has become a major concern over the past few years, and we wanted to take action by building a <u>privacy-first, open source chat platform.</u></p>
                         </div>
                     </div>
                     <div className={styles.image}>

pages/onboarding.tsx

+import URLs from '../urls';
+import Head from 'next/head';
+import { Footer } from '../components/Footer';
+import { Navbar } from '../components/Navbar';
+import styles from '../styles/Legal.module.scss';
+import { useRouter } from 'next/dist/client/router';
+import { ExternalLink } from '@styled-icons/feather';
+
+export default function Onboarding() {
+    const { query } = useRouter();
+    const { code } = query;
+
+    return (
+        <div>
+            <Head>
+                <title>Welcome to Revolt</title>
+                <link rel="icon" href="/favicon.ico" />
+                <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
+            </Head>
+            <main>
+                <Navbar />
+                <div className={styles.content}>
+                    <h1 className={styles.title}>Welcome to Revolt</h1>
+                    <p>
+                        If you've been linked to this page, you likely applied to join the beta and have now been invited to sign up. To sign up, use the invite code below from the app or click the button below to be taken straight to the account creation screen.
+                    </p>
+                    { code && <p>
+                        You've been given an invite code: <code className={styles.inviteCode}>{ code }</code>
+                    </p> }
+                    <span>
+                        <a className="button red"
+                            target="_blank"
+                            href={code ? `${URLs.App}/login/create?code=${code}` : URLs.App}>
+                            <ExternalLink size={24} /> Open App
+                        </a>
+                    </span>
+                    <h3>Having problems?</h3>
+                    <p>
+                        We have a number of channels you can contact us directly through for help.
+                    </p>
+                    <ul>
+                        <li>Email support: <a href="mailto:contact@revolt.chat">contact@revolt.chat</a></li>
+                        <li>Online support: <a href="https://help.revolt.chat" target="_blank">help.revolt.chat</a></li>
+                        <li>Matrix channel: <a href="https://matrix.to/#revolt-chat:clustor.net" target="_blank">#revolt-chat:clustor.net</a></li>
+                        <li>Discord server: <a href="https://discord.gg/AWFZeCc" target="_blank">discord.gg/AWFZeCc</a></li>
+                    </ul>
+                </div>
+                <Footer />
+            </main>
+        </div>
+    );
+}

pages/privacy.tsx

@@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) {
                 <title>Privacy Policy - Revolt</title>
                 <link rel="icon" href="/favicon.ico" />
                 <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
-
-                <link rel="preconnect" href="https://fonts.gstatic.com" />
-                <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" />
             </Head>
             <main>
                 <Navbar />

pages/publicbeta.tsx

+import URLs from '../urls';
+import Head from 'next/head';
+import { Footer } from '../components/Footer';
+import { Navbar } from '../components/Navbar';
+import styles from '../styles/Legal.module.scss';
+import { ExternalLink } from '@styled-icons/feather';
+import { JoinLinks } from '../components/JoinLinks';
+import classNames from 'classnames';
+
+export default function Beta() {
+    return (
+        <div>
+            <Head>
+                <title>Revolt Public Beta</title>
+                <link rel="icon" href="/favicon.ico" />
+                <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
+            </Head>
+            <main>
+                <Navbar />
+                <div className={styles.content}>
+                    <h1 className={styles.title}>Revolt Public Beta</h1>
+                    <h3>
+                        Hi there! <img src="https://static.revolt.chat/emoji/mutant/1f44b-10160a.svg" style={{ height: '1.2em', verticalAlign: 'top' }} />
+                    </h3>
+                    <p>
+                        Before we let you in, there's just a few ground rules:
+                    </p>
+                    <ul style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
+                        <li><b style={{ fontWeight: 700 }}>Be respectful to others in our public spaces.</b><br/>
+                        We have a steadily growing and friendly community in the public tester server, please be nice to others when you join.</li>
+                        <li><b style={{ fontWeight: 700 }}>Follow our Acceptable Usage policy.</b><br/>
+                        Failure to do so may result in your access being revoked.</li>
+                        <li><b style={{ fontWeight: 700 }}>Expect some bugs!</b><br/>
+                        We're trying our best to keep everything stable but sometimes things slip through.<br/>
+                        Most of the time we don't run into issues, but if you do have any issues please report them through the app.</li>
+                    </ul>
+                    <p>
+                        Thank you!
+                    </p>
+                    <p>
+                        <a className={classNames("button", "red")} href={URLs.GenerateCode}>
+                            Continue
+                        </a>
+                    </p>
+                </div>
+                <Footer />
+            </main>
+        </div>
+    );
+}

pages/roadmap.tsx

+import Head from 'next/head';
+import { Footer } from '../components/Footer';
+import { Navbar } from '../components/Navbar';
+import styles from '../styles/Legal.module.scss';
+import { Markdown } from '../components/Markdown';
+
+export default function Home({ content }: { content: string }) {
+    return (
+        <div>
+            <Head>
+                <title>Roadmap - Revolt</title>
+                <link rel="icon" href="/favicon.ico" />
+                <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
+            </Head>
+            <main>
+                <Navbar />
+                <div className={styles.content}>
+                    <Markdown content={content} />
+                </div>
+                <Footer />
+            </main>
+        </div>
+    );
+}
+
+export async function getStaticProps() {
+    const { readFile } = require('fs/promises');
+    const file = await readFile('./ROADMAP.md');
+    const content = file.toString();
+    
+    return { props: { content } }
+}

pages/terms.tsx

@@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) {
                 <title>Terms of Service - Revolt</title>
                 <link rel="icon" href="/favicon.ico" />
                 <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" />
-
-                <link rel="preconnect" href="https://fonts.gstatic.com" />
-                <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" />
             </Head>
             <main>
                 <Navbar />

public/.well-known/assetlinks.json

+[{
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+        "namespace": "android_app",
+        "package_name": "chat.revolt.app.twa",
+        "sha256_cert_fingerprints": [
+            "6E:62:C1:BF:5A:2D:11:31:A3:22:91:8D:22:2B:2C:49:D3:70:F3:A1:45:DF:11:6A:97:DC:4C:A9:3B:C3:AA:FB"
+        ]
+    }
+}]
\ No newline at end of file