Add AutoComplete for role completion

[skip ci]

.env

@@ -1,2 +1,5 @@
-VITE_API_URL=https://api.revolt.chat
+# VITE_API_URL=https://api.revolt.chat
+# VITE_API_URL=https://app.revolt.chat/api
+# VITE_API_URL=http://local.revolt.chat:8000
+VITE_API_URL=https://app.revolt.chat/api
 VITE_THEMES_URL=https://themes.revolt.chat

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 ## Please make sure to check the following tasks before opening and submitting a PR
 
-* [ ] I understand and have followed the [contribution guide](https://github.com/revoltchat/revolt/discussions/282)
+* [ ] I understand and have followed the [contribution guide](https://developers.revolt.chat/contrib.html)
 * [ ] I have tested my changes locally and they are working as intended
 * [ ] These changes do not have any notable side effects on other Revolt projects
 * [ ] (optional) I have opened a pull request on [the translation repository](https://github.com/revoltchat/translations)

.github/workflows/docker.yml

@@ -30,55 +30,18 @@ on:
     workflow_dispatch:
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                architecture: [linux/amd64]
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-              with:
-                  submodules: "recursive"
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1
-            - name: Cache Docker layers
-              uses: actions/cache@v2
-              with:
-                  path: /tmp/.buildx-cache/${{ matrix.architecture }}
-                  key: ${{ runner.os }}-buildx-${{ matrix.architecture }}-${{ github.sha }}
-            - name: Build
-              uses: docker/build-push-action@v2
-              with:
-                  context: .
-                  platforms: ${{ matrix.architecture }}
-                  cache-from: type=local,src=/tmp/.buildx-cache/${{ matrix.architecture }}
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new/${{ matrix.architecture }},mode=max
-            - name: Move cache
-              run: |
-                  rm -rf /tmp/.buildx-cache/${{ matrix.architecture }}
-                  mv /tmp/.buildx-cache-new/${{ matrix.architecture }} /tmp/.buildx-cache/${{ matrix.architecture }}
-
     publish:
-        needs: [test]
         runs-on: ubuntu-latest
         if: github.event_name != 'pull_request'
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
               with:
                   submodules: "recursive"
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
+              uses: docker/setup-qemu-action@v3
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1
-            - name: Cache amd64 Docker layers
-              uses: actions/cache@v2
-              with:
-                  path: /tmp/.buildx-cache/linux/amd64
-                  key: ${{ runner.os }}-buildx-linux/amd64-${{ github.sha }}
+              uses: docker/setup-buildx-action@v3
             - name: Docker meta
               id: meta
               uses: docker/metadata-action@v3
@@ -86,26 +49,22 @@ jobs:
                   images: revoltchat/client, ghcr.io/revoltchat/client
             - name: Login to DockerHub
               uses: docker/login-action@v1
+              if: github.event_name != 'pull_request'
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Login to Github Container Registry
-              uses: docker/login-action@v1
+              uses: docker/login-action@v3
+              if: github.event_name != 'pull_request'
               with:
                   registry: ghcr.io
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
             - name: Build and publish
-              uses: docker/build-push-action@v2
+              uses: docker/build-push-action@v6
               with:
                   context: .
-                  push: true
+                  push: ${{ github.event_name != 'pull_request' }}
                   platforms: linux/amd64
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
-                  cache-from: type=local,src=/tmp/.buildx-cache/linux/amd64
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-            - name: Move cache
-              run: |
-                  rm -rf /tmp/.buildx-cache
-                  mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/mirroring.yml

@@ -1,16 +0,0 @@
-name: Mirroring
-
-on:
-    push:
-        branches:
-            - "master"
-
-jobs:
-    to_gitlab:
-        runs-on: ubuntu-18.04
-        steps:
-            - uses: actions/checkout@v1
-            - uses: pixta-dev/repository-mirroring-action@v1
-              with:
-                  target_repo_url: git@gitlab.com:insert/revolt-vite.git
-                  ssh_private_key: ${{ secrets.GITLAB_SSH_PRIVATE_KEY }}

.github/workflows/triage_issue.yml

@@ -15,22 +15,27 @@ jobs:
           gh api graphql -f query='
             query {
               organization(login: "revoltchat"){
-                projectNext(number: 3) {
+                projectV2(number: 3) {
                   id
                   fields(first:20) {
                     nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                     }
                   }
                 }
               }
             }' > project_data.json
 
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'TODO_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TODO_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV
 
       - name: Add issue to project
         env:
@@ -39,11 +44,11 @@ jobs:
         run: |
           item_id="$( gh api graphql -f query='
             mutation($project:ID!, $issue:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
+                item {
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
+
           echo 'ITEM_ID='$item_id >> $GITHUB_ENV

.github/workflows/triage_pr.yml

@@ -15,22 +15,27 @@ jobs:
           gh api graphql -f query='
             query {
               organization(login: "revoltchat"){
-                projectNext(number: 3) {
+                projectV2(number: 5) {
                   id
                   fields(first:20) {
                     nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                     }
                   }
                 }
               }
             }' > project_data.json
 
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'INCOMING_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Incoming PRs") |.id' project_data.json) >> $GITHUB_ENV
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'INCOMING_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="🆕 Untriaged") |.id' project_data.json) >> $GITHUB_ENV
 
       - name: Add PR to project
         env:
@@ -39,13 +44,13 @@ jobs:
         run: |
           item_id="$( gh api graphql -f query='
             mutation($project:ID!, $pr:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $pr}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $pr}) {
+                item {
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
+            }' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectV2ItemById.item.id')"
+
           echo 'ITEM_ID='$item_id >> $GITHUB_ENV
 
       - name: Set fields
@@ -59,14 +64,16 @@ jobs:
               $status_field: ID!
               $status_value: String!
             ) {
-              set_status: updateProjectNextItemField(input: {
+              set_status: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $status_field
-                value: $status_value
+                value: {
+                  singleSelectOptionId: $status_value
+                }
               }) {
-                projectNextItem {
+                projectV2Item {
                   id
-                  }
+                }
               }
             }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.INCOMING_OPTION_ID }} --silent

Dockerfile

@@ -5,7 +5,8 @@ COPY . .
 COPY .env.build .env
 
 RUN yarn install --frozen-lockfile
-RUN yarn typecheck
+RUN yarn build:deps
+# RUN yarn typecheck # lol no
 RUN yarn build:highmem
 RUN yarn workspaces focus --production --all
 

README.md

@@ -1,3 +1,30 @@
+# Deprecation Notice
+
+This project is deprecated, however it still may receive maintenance updates.
+
+PRs for small fixes are more than welcome.
+
+## Deploying a new release
+
+Ensure `.env.local` points to `https://app.revolt.chat/api`.
+
+```bash
+cd ~/deployments/revite
+git pull
+git submodule update
+
+# check:
+git status
+
+export REVOLT_SAAS_BRANCH=revite/main
+export REMOTE=root@production
+scripts/publish.sh
+
+# SSH in and restart revite:
+ssh $REMOTE
+tmux a -t 4
+```
+
 # Revite
 
 ## Description

package.json

@@ -44,8 +44,10 @@
         }
     },
     "dependencies": {
+        "@revoltchat/rehype-katex": "6.0.3-patch.1",
         "fs-extra": "^10.0.0",
         "klaw": "^3.0.0",
+        "lottie-react": "^2.4.0",
         "sirv-cli": "^1.0.14",
         "vite": "^3.0.5"
     },
@@ -136,7 +138,6 @@
         "react-router-dom": "^5.2.0",
         "react-scroll": "^1.8.2",
         "react-virtuoso": "^2.12.0",
-        "rehype-katex": "^6.0.2",
         "rehype-prism": "^2.1.3",
         "rehype-react": "^7.1.1",
         "remark-breaks": "^3.0.2",

scripts/publish.sh

@@ -2,13 +2,16 @@
 # 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
+REMOTE_DIR=/root/deployments/revite
 
 # Post-install script
-POST_INSTALL="pm2 restart revite"
+POST_INSTALL=""
 
 # Assets
 export REVOLT_SAAS=https://github.com/revoltchat/assets
@@ -18,7 +21,7 @@ export REVOLT_SAAS=https://github.com/revoltchat/assets
 set -e
 
 # 1. Build Revite
-yarn build
+yarn build:highmem
 
 # 2. Archive built files
 tar -czvf build.tar.gz dist

src/assets/changelogs.ts

@@ -1,38 +0,0 @@
-type Element =
-    | string
-    | {
-          type: "image";
-          src: string;
-      };
-
-export interface ChangelogPost {
-    date: Date;
-    title: string;
-    content: Element[];
-}
-
-export const changelogEntries: Record<number, ChangelogPost> = {
-    1: {
-        date: new Date("2022-06-12T20:39:16.674Z"),
-        title: "Secure your account with 2FA",
-        content: [
-            "Two-factor authentication is now available to all users, you can now head over to settings to enable recovery codes and an authenticator app.",
-            {
-                type: "image",
-                src: "https://autumn.revolt.chat/attachments/E21kwmuJGcASgkVLiSIW0wV3ggcaOWjW0TQF7cdFNY/image.png",
-            },
-            "Once enabled, you will be prompted on login.",
-            {
-                type: "image",
-                src: "https://autumn.revolt.chat/attachments/LWRYoKR2tE1ggW_Lzm547P1pnrkNgmBaoCAfWvHE74/image.png",
-            },
-            "Other authentication methods coming later, stay tuned!",
-        ],
-    },
-};
-
-export const changelogEntryArray = Object.keys(changelogEntries).map(
-    (index) => changelogEntries[index as unknown as number],
-);
-
-export const latestChangelog = changelogEntryArray.length;

src/assets/changelogs.tsx

@@ -0,0 +1,86 @@
+import Lottie, { LottieRefCurrentProps } from "lottie-react";
+
+import { JSX } from "preact";
+
+import usernameAnim from "../controllers/modals/components/legacy/usernameUpdateLottie.json";
+
+type Element =
+    | string
+    | {
+          type: "image";
+          src: string;
+          shadow?: boolean;
+      }
+    | { type: "element"; element: JSX.Element };
+
+export interface ChangelogPost {
+    date: Date;
+    title: string;
+    content: Element[];
+}
+
+export const changelogEntries: Record<number, ChangelogPost> = {
+    1: {
+        date: new Date("2022-06-12T20:39:16.674Z"),
+        title: "Secure your account with 2FA",
+        content: [
+            "Two-factor authentication is now available to all users, you can now head over to settings to enable recovery codes and an authenticator app.",
+            {
+                type: "image",
+                src: "https://autumn.revolt.chat/attachments/E21kwmuJGcASgkVLiSIW0wV3ggcaOWjW0TQF7cdFNY/image.png",
+            },
+            "Once enabled, you will be prompted on login.",
+            {
+                type: "image",
+                src: "https://autumn.revolt.chat/attachments/LWRYoKR2tE1ggW_Lzm547P1pnrkNgmBaoCAfWvHE74/image.png",
+            },
+            "Other authentication methods coming later, stay tuned!",
+        ],
+    },
+    2: {
+        date: new Date("2023-02-23T20:00:00.000Z"),
+        title: "In-App Reporting Is Here",
+        content: [
+            "You can now report any user, server, or message directly from the app.",
+            {
+                type: "image",
+                src: "https://autumn.revolt.chat/attachments/ZuDVIjGiCl61Pk9XGk5qfc8-idN9EnFAk55DUQp713/the.png",
+                shadow: true,
+            },
+            "If you want to learn more about how we're making Revolt safer for you, check out our new blog post :point_right: [https://revolt.chat/posts/improving-user-safety](https://revolt.chat/posts/improving-user-safety)",
+        ],
+    },
+    3: {
+        date: new Date("2023-06-11T15:00:00.000Z"),
+        title: "Usernames are Changing",
+        content: [
+            {
+                type: "element",
+                element: (
+                    <Lottie
+                        animationData={usernameAnim}
+                        style={{
+                            background: "var(--secondary-background)",
+                            borderRadius: "6px",
+                        }}
+                    />
+                ),
+            },
+            "Revolt has undergone a significant change to its username system, transitioning from unique username handles to a new system of display names and usernames with four-digit number tags called discriminators. The four-digit number tags serve as identifiers to differentiate users with the same username, allowing individuals to select desired usernames that reflect their identity.",
+            {
+                type: "element",
+                element: (
+                    <a href="https://revolt.chat/posts/evolving-usernames">
+                        Read more on our blog!
+                    </a>
+                ),
+            },
+        ],
+    },
+};
+
+export const changelogEntryArray = Object.keys(changelogEntries).map(
+    (index) => changelogEntries[index as unknown as number],
+);
+
+export const latestChangelog = changelogEntryArray.length;

src/assets/emojis.ts

@@ -1848,109 +1848,109 @@ export const emojiDictionary = {
     england: "🏴󠁧󠁢󠁥󠁮󠁧󠁿",
     scotland: "🏴󠁧󠁢󠁳󠁣󠁴󠁿",
     wales: "🏴󠁧󠁢󠁷󠁬󠁳󠁿",
-    ...{
-        1984: "custom:1984.gif",
-        KekW: "custom:KekW.png",
-        amogus: "custom:amogus.gif",
-        awaa: "custom:awaa.png",
-        boohoo: "custom:boohoo.png",
-        boohoo_goes_hard: "custom:boohoo_goes_hard.png",
-        boohoo_shaken: "custom:boohoo_shaken.png",
-        cat_arrival: "custom:cat_arrival.gif",
-        cat_awson: "custom:cat_awson.png",
-        cat_blob: "custom:cat_blob.png",
-        cat_bonk: "custom:cat_bonk.png",
-        cat_concern: "custom:cat_concern.png",
-        cat_fast: "custom:cat_fast.gif",
-        cat_kitty: "custom:cat_kitty.png",
-        cat_lick: "custom:cat_lick.gif",
-        cat_not_like: "custom:cat_not_like.png",
-        cat_put: "custom:cat_put.gif",
-        cat_pwease: "custom:cat_pwease.png",
-        cat_rage: "custom:cat_rage.png",
-        cat_sad: "custom:cat_sad.png",
-        cat_snuff: "custom:cat_snuff.gif",
-        cat_spin: "custom:cat_spin.gif",
-        cat_squish: "custom:cat_squish.gif",
-        cat_stare: "custom:cat_stare.gif",
-        cat_steal: "custom:cat_steal.gif",
-        cat_sussy: "custom:cat_sussy.gif",
-        clueless: "custom:clueless.png",
-        death: "custom:death.gif",
-        developers: "custom:developers.gif",
-        fastwawa: "custom:fastwawa.gif",
-        ferris: "custom:ferris.png",
-        ferris_bongo: "custom:ferris_bongo.gif",
-        ferris_nom: "custom:ferris_nom.png",
-        ferris_pensive: "custom:ferris_pensive.png",
-        ferris_unsafe: "custom:ferris_unsafe.png",
-        flesh: "custom:flesh.png",
-        flooshed: "custom:flooshed.png",
-        flosh: "custom:flosh.png",
-        flushee: "custom:flushee.png",
-        forgor: "custom:forgor.png",
-        hollow: "custom:hollow.png",
-        john: "custom:john.png",
-        lightspeed: "custom:lightspeed.png",
-        little_guy: "custom:little_guy.png",
-        lmaoooo: "custom:lmaoooo.gif",
-        lol: "custom:lol.png",
-        looking: "custom:looking.gif",
-        marie: "custom:marie.png",
-        marie_furret: "custom:marie_furret.gif",
-        marie_smug: "custom:marie_smug.png",
-        megumin: "custom:megumin.png",
-        michi_above: "custom:michi_above.png",
-        michi_awww: "custom:michi_awww.gif",
-        michi_drag: "custom:michi_drag.gif",
-        michi_flustered: "custom:michi_flustered.png",
-        michi_glare: "custom:michi_glare.png",
-        michi_sus: "custom:michi_sus.png",
-        monkaS: "custom:monkaS.png",
-        monkaStare: "custom:monkaStare.png",
-        monkey_grr: "custom:monkey_grr.png",
-        monkey_pensive: "custom:monkey_pensive.png",
-        monkey_zany: "custom:monkey_zany.png",
-        nazu_sit: "custom:nazu_sit.png",
-        nazu_sus: "custom:nazu_sus.png",
-        ok_and: "custom:ok_and.gif",
-        owo: "custom:owo.png",
-        pat: "custom:pat.png",
-        pointThink: "custom:pointThink.png",
-        rainbowHype: "custom:rainbowHype.gif",
-        rawr: "custom:rawr.png",
-        rember: "custom:rember.png",
-        revolt: "custom:revolt.png",
-        sickly: "custom:sickly.png",
-        stare: "custom:stare.png",
-        tfyoulookingat: "custom:tfyoulookingat.png",
-        thanks: "custom:thanks.png",
-        thonk: "custom:thonk.png",
-        trol: "custom:trol.png",
-        troll_smile: "custom:troll_smile.gif",
-        uber: "custom:uber.png",
-        ubertroll: "custom:ubertroll.png",
-        verycool: "custom:verycool.png",
-        verygood: "custom:verygood.png",
-        wawafast: "custom:wawafast.gif",
-        wawastance: "custom:wawastance.png",
-        yeahokayyy: "custom:yeahokayyy.png",
-        yed: "custom:yed.png",
-        yems: "custom:yems.png",
-        michael: "custom:michael.gif",
-        charle: "custom:charle.gif",
-        sadge: "custom:sadge.webp",
-        sus: "custom:sus.webp",
-        chade: "custom:chade.gif",
-        gigachad: "custom:gigachad.webp",
-        sippy: "custom:sippy.webp",
-        ayame_heart: "custom:ayame_heart.png",
-        catgirl_peek: "custom:catgirl_peek.png",
-        girl_happy: "custom:girl_happy.png",
-        hug_plushie: "custom:hug_plushie.png",
-        huggies: "custom:huggies.png",
-        noted: "custom:noted.gif",
-        waving: "custom:waving.png",
-        mogusvented: "custom:mogusvented.png",
-    },
+    // ...{
+    //     1984: "custom:1984.gif",
+    //     KekW: "custom:KekW.png",
+    //     amogus: "custom:amogus.gif",
+    //     awaa: "custom:awaa.png",
+    //     boohoo: "custom:boohoo.png",
+    //     boohoo_goes_hard: "custom:boohoo_goes_hard.png",
+    //     boohoo_shaken: "custom:boohoo_shaken.png",
+    //     cat_arrival: "custom:cat_arrival.gif",
+    //     cat_awson: "custom:cat_awson.png",
+    //     cat_blob: "custom:cat_blob.png",
+    //     cat_bonk: "custom:cat_bonk.png",
+    //     cat_concern: "custom:cat_concern.png",
+    //     cat_fast: "custom:cat_fast.gif",
+    //     cat_kitty: "custom:cat_kitty.png",
+    //     cat_lick: "custom:cat_lick.gif",
+    //     cat_not_like: "custom:cat_not_like.png",
+    //     cat_put: "custom:cat_put.gif",
+    //     cat_pwease: "custom:cat_pwease.png",
+    //     cat_rage: "custom:cat_rage.png",
+    //     cat_sad: "custom:cat_sad.png",
+    //     cat_snuff: "custom:cat_snuff.gif",
+    //     cat_spin: "custom:cat_spin.gif",
+    //     cat_squish: "custom:cat_squish.gif",
+    //     cat_stare: "custom:cat_stare.gif",
+    //     cat_steal: "custom:cat_steal.gif",
+    //     cat_sussy: "custom:cat_sussy.gif",
+    //     clueless: "custom:clueless.png",
+    //     death: "custom:death.gif",
+    //     developers: "custom:developers.gif",
+    //     fastwawa: "custom:fastwawa.gif",
+    //     ferris: "custom:ferris.png",
+    //     ferris_bongo: "custom:ferris_bongo.gif",
+    //     ferris_nom: "custom:ferris_nom.png",
+    //     ferris_pensive: "custom:ferris_pensive.png",
+    //     ferris_unsafe: "custom:ferris_unsafe.png",
+    //     flesh: "custom:flesh.png",
+    //     flooshed: "custom:flooshed.png",
+    //     flosh: "custom:flosh.png",
+    //     flushee: "custom:flushee.png",
+    //     forgor: "custom:forgor.png",
+    //     hollow: "custom:hollow.png",
+    //     john: "custom:john.png",
+    //     lightspeed: "custom:lightspeed.png",
+    //     little_guy: "custom:little_guy.png",
+    //     lmaoooo: "custom:lmaoooo.gif",
+    //     lol: "custom:lol.png",
+    //     looking: "custom:looking.gif",
+    //     marie: "custom:marie.png",
+    //     marie_furret: "custom:marie_furret.gif",
+    //     marie_smug: "custom:marie_smug.png",
+    //     megumin: "custom:megumin.png",
+    //     michi_above: "custom:michi_above.png",
+    //     michi_awww: "custom:michi_awww.gif",
+    //     michi_drag: "custom:michi_drag.gif",
+    //     michi_flustered: "custom:michi_flustered.png",
+    //     michi_glare: "custom:michi_glare.png",
+    //     michi_sus: "custom:michi_sus.png",
+    //     monkaS: "custom:monkaS.png",
+    //     monkaStare: "custom:monkaStare.png",
+    //     monkey_grr: "custom:monkey_grr.png",
+    //     monkey_pensive: "custom:monkey_pensive.png",
+    //     monkey_zany: "custom:monkey_zany.png",
+    //     nazu_sit: "custom:nazu_sit.png",
+    //     nazu_sus: "custom:nazu_sus.png",
+    //     ok_and: "custom:ok_and.gif",
+    //     owo: "custom:owo.png",
+    //     pat: "custom:pat.png",
+    //     pointThink: "custom:pointThink.png",
+    //     rainbowHype: "custom:rainbowHype.gif",
+    //     rawr: "custom:rawr.png",
+    //     rember: "custom:rember.png",
+    //     revolt: "custom:revolt.png",
+    //     sickly: "custom:sickly.png",
+    //     stare: "custom:stare.png",
+    //     tfyoulookingat: "custom:tfyoulookingat.png",
+    //     thanks: "custom:thanks.png",
+    //     thonk: "custom:thonk.png",
+    //     trol: "custom:trol.png",
+    //     troll_smile: "custom:troll_smile.gif",
+    //     uber: "custom:uber.png",
+    //     ubertroll: "custom:ubertroll.png",
+    //     verycool: "custom:verycool.png",
+    //     verygood: "custom:verygood.png",
+    //     wawafast: "custom:wawafast.gif",
+    //     wawastance: "custom:wawastance.png",
+    //     yeahokayyy: "custom:yeahokayyy.png",
+    //     yed: "custom:yed.png",
+    //     yems: "custom:yems.png",
+    //     michael: "custom:michael.gif",
+    //     charle: "custom:charle.gif",
+    //     sadge: "custom:sadge.webp",
+    //     sus: "custom:sus.webp",
+    //     chade: "custom:chade.gif",
+    //     gigachad: "custom:gigachad.webp",
+    //     sippy: "custom:sippy.webp",
+    //     ayame_heart: "custom:ayame_heart.png",
+    //     catgirl_peek: "custom:catgirl_peek.png",
+    //     girl_happy: "custom:girl_happy.png",
+    //     hug_plushie: "custom:hug_plushie.png",
+    //     huggies: "custom:huggies.png",
+    //     noted: "custom:noted.gif",
+    //     waving: "custom:waving.png",
+    //     mogusvented: "custom:mogusvented.png",
+    // },
 };

src/components/common/AutoComplete.tsx

@@ -1,4 +1,7 @@
-import { Channel, User } from "revolt.js";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { Link } from "react-router-dom";
+import { Channel, User, Role } from "revolt.js";
+import { Emoji as CustomEmoji } from "revolt.js/esm/maps/Emojis";
 import styled, { css } from "styled-components/macro";
 
 import { StateUpdater, useState } from "preact/hooks";
@@ -7,6 +10,8 @@ import { emojiDictionary } from "../../assets/emojis";
 import { useClient } from "../../controllers/client/ClientController";
 import ChannelIcon from "./ChannelIcon";
 import Emoji from "./Emoji";
+import ServerIcon from "./ServerIcon";
+import Tooltip from "./Tooltip";
 import UserIcon from "./user/UserIcon";
 
 export type AutoCompleteState =
@@ -14,7 +19,7 @@ export type AutoCompleteState =
     | ({ selected: number; within: boolean } & (
           | {
                 type: "emoji";
-                matches: string[];
+                matches: (string | CustomEmoji)[];
             }
           | {
                 type: "user";
@@ -24,11 +29,16 @@ export type AutoCompleteState =
                 type: "channel";
                 matches: Channel[];
             }
+          | {
+                type: "role";
+                matches: Role[];
+            }
       ));
 
 export type SearchClues = {
     users?: { type: "channel"; id: string } | { type: "all" };
     channels?: { server: string };
+    roles?: { server: string };
 };
 
 export type AutoCompleteProps = {
@@ -54,18 +64,20 @@ export function useAutoComplete(
 
     function findSearchString(
         el: HTMLTextAreaElement,
-    ): ["emoji" | "user" | "channel", string, number] | undefined {
+    ): ["emoji" | "user" | "channel" | "role", string, number] | undefined {
         if (el.selectionStart === el.selectionEnd) {
             const cursor = el.selectionStart;
             const content = el.value.slice(0, cursor);
 
-            const valid = /\w/;
+            const valid = /[\w\-]/;
 
             let j = content.length - 1;
             if (content[j] === "@") {
                 return ["user", "", j];
             } else if (content[j] === "#") {
                 return ["channel", "", j];
+            } else if (content[j] === "%") {
+                return ["role", "", j];
             }
 
             while (j >= 0 && valid.test(content[j])) {
@@ -75,7 +87,12 @@ export function useAutoComplete(
             if (j === -1) return;
             const current = content[j];
 
-            if (current === ":" || current === "@" || current === "#") {
+            if (
+                current === ":" ||
+                current === "@" ||
+                current === "#" ||
+                current === "%"
+            ) {
                 const search = content.slice(j + 1, content.length);
                 const minLen = current === ":" ? 2 : 1;
 
@@ -85,6 +102,8 @@ export function useAutoComplete(
                             ? "channel"
                             : current === ":"
                             ? "emoji"
+                            : current === "%"
+                            ? "role"
                             : "user",
                         search.toLowerCase(),
                         current === ":" ? j + 1 : j,
@@ -104,16 +123,23 @@ export function useAutoComplete(
 
             if (type === "emoji") {
                 // ! TODO: we should convert it to a Binary Search Tree and use that
-                const matches = Object.keys(emojiDictionary)
-                    .filter((emoji: string) => emoji.match(regex))
-                    .splice(0, 5);
+                const matches = [
+                    ...Object.keys(emojiDictionary).filter((emoji: string) =>
+                        emoji.match(regex),
+                    ),
+                    ...Array.from(client.emojis.values()).filter((emoji) =>
+                        emoji.name.match(regex),
+                    ),
+                ].splice(0, 5);
 
                 if (matches.length > 0) {
                     const currentPosition =
                         state.type !== "none" ? state.selected : 0;
 
                     setState({
+                        // @ts-ignore-next-line are you high
                         type: "emoji",
+                        // @ts-ignore-next-line
                         matches,
                         selected: Math.min(currentPosition, matches.length - 1),
                         within: false,
@@ -218,6 +244,42 @@ export function useAutoComplete(
                     return;
                 }
             }
+
+            if (type === "role" && searchClues?.roles) {
+                const server = client.servers.get(searchClues.roles.server);
+
+                let roles: (Role & { id: string })[] = [];
+                if (server?.roles) {
+                    roles = Object.entries(server.roles).map(([id, role]) => ({
+                        ...role,
+                        id,
+                    }));
+                }
+
+                const matches = (
+                    search.length > 0
+                        ? roles.filter((role) =>
+                              role.name.toLowerCase().match(regex),
+                          )
+                        : roles
+                )
+                    .splice(0, 5)
+                    .filter((x) => typeof x !== "undefined");
+
+                if (matches.length > 0) {
+                    const currentPosition =
+                        state.type !== "none" ? state.selected : 0;
+
+                    setState({
+                        type: "role",
+                        matches,
+                        selected: Math.min(currentPosition, matches.length - 1),
+                        within: false,
+                    });
+
+                    return;
+                }
+            }
         }
 
         if (state.type !== "none") {
@@ -233,10 +295,13 @@ export function useAutoComplete(
 
                 const content = el.value.split("");
                 if (state.type === "emoji") {
+                    const selected = state.matches[state.selected];
                     content.splice(
                         index,
                         search.length,
-                        state.matches[state.selected],
+                        selected instanceof CustomEmoji
+                            ? selected._id
+                            : selected,
                         ": ",
                     );
                 } else if (state.type === "user") {
@@ -247,6 +312,14 @@ export function useAutoComplete(
                         state.matches[state.selected]._id,
                         "> ",
                     );
+                } else if (state.type === "role") {
+                    content.splice(
+                        index,
+                        search.length + 1,
+                        "<%",
+                        state.matches[state.selected].id,
+                        "> ",
+                    );
                 } else {
                     content.splice(
                         index,
@@ -388,12 +461,17 @@ export default function AutoComplete({
     setState,
     onClick,
 }: Pick<AutoCompleteProps, "detached" | "state" | "setState" | "onClick">) {
+    const client = useClient();
     return (
         <Base detached={detached}>
             <div>
                 {state.type === "emoji" &&
                     state.matches.map((match, i) => (
                         <button
+                            style={{
+                                display: "flex",
+                                justifyContent: "space-between",
+                            }}
                             key={match}
                             className={i === state.selected ? "active" : ""}
                             onMouseEnter={() =>
@@ -412,21 +490,67 @@ export default function AutoComplete({
                                 })
                             }
                             onClick={onClick}>
-                            <Emoji
-                                emoji={
-                                    (emojiDictionary as Record<string, string>)[
-                                        match
-                                    ]
-                                }
-                                size={20}
-                            />
-                            :{match}:
+                            <div
+                                style={{
+                                    display: "flex",
+                                    flexDirection: "row",
+                                    justifyContent: "center",
+                                }}>
+                                {match instanceof CustomEmoji ? (
+                                    <img
+                                        loading="lazy"
+                                        src={match.imageURL}
+                                        style={{
+                                            width: `20px`,
+                                            height: `20px`,
+                                        }}
+                                    />
+                                ) : (
+                                    <Emoji
+                                        emoji={
+                                            (
+                                                emojiDictionary as Record<
+                                                    string,
+                                                    string
+                                                >
+                                            )[match]
+                                        }
+                                        size={20}
+                                    />
+                                )}
+                                <span style={{ paddingLeft: "4px" }}>{`:${
+                                    match instanceof CustomEmoji
+                                        ? match.name
+                                        : match
+                                }:`}</span>
+                            </div>
+                            {match instanceof CustomEmoji &&
+                                match.parent.type == "Server" && (
+                                    <>
+                                        <Tooltip
+                                            content={
+                                                client.servers.get(
+                                                    match.parent.id,
+                                                )?.name
+                                            }>
+                                            <Link
+                                                to={`/server/${match.parent.id}`}>
+                                                <ServerIcon
+                                                    target={client.servers.get(
+                                                        match.parent.id,
+                                                    )}
+                                                    size={20}
+                                                />
+                                            </Link>
+                                        </Tooltip>
+                                    </>
+                                )}
                         </button>
                     ))}
                 {state.type === "user" &&
                     state.matches.map((match, i) => (
                         <button
-                            key={match}
+                            key={match._id}
                             className={i === state.selected ? "active" : ""}
                             onMouseEnter={() =>
                                 (i !== state.selected || !state.within) &&
@@ -451,7 +575,7 @@ export default function AutoComplete({
                 {state.type === "channel" &&
                     state.matches.map((match, i) => (
                         <button
-                            key={match}
+                            key={match._id}
                             className={i === state.selected ? "active" : ""}
                             onMouseEnter={() =>
                                 (i !== state.selected || !state.within) &&
@@ -473,6 +597,40 @@ export default function AutoComplete({
                             {match.name}
                         </button>
                     ))}
+                {state.type === "role" &&
+                    state.matches.map((match, i) => (
+                        <button
+                            key={match._id}
+                            className={i === state.selected ? "active" : ""}
+                            onMouseEnter={() =>
+                                (i !== state.selected || !state.within) &&
+                                setState({
+                                    ...state,
+                                    selected: i,
+                                    within: true,
+                                })
+                            }
+                            onMouseLeave={() =>
+                                state.within &&
+                                setState({
+                                    ...state,
+                                    within: false,
+                                })
+                            }
+                            onClick={onClick}>
+                            <div
+                                style={{
+                                    width: "16px",
+                                    height: "16px",
+                                    borderRadius: "50%",
+                                    backgroundColor: match.colour || "#7c7c7c",
+                                    marginRight: "8px",
+                                    flexShrink: 0,
+                                }}
+                            />
+                            {match.name}
+                        </button>
+                    ))}
             </div>
         </Base>
     );

src/components/common/Emoji.tsx

@@ -43,11 +43,11 @@ function toCodePoint(rune: string) {
 }
 
 export function parseEmoji(emoji: string) {
-    if (emoji.startsWith("custom:")) {
-        return `https://dl.insrt.uk/projects/revolt/emotes/${emoji.substring(
-            7,
-        )}`;
-    }
+    // if (emoji.startsWith("custom:")) {
+    //     return `https://dl.insrt.uk/projects/revolt/emotes/${emoji.substring(
+    //         7,
+    //     )}`;
+    // }
 
     const codepoint = toCodePoint(emoji);
     return `https://static.revolt.chat/emoji/${EMOJI_PACK}/${codepoint}.svg?rev=${REVISION}`;

src/components/common/messaging/Message.tsx

@@ -5,7 +5,7 @@ import { useTriggerEvents } from "preact-context-menu";
 import { memo } from "preact/compat";
 import { useEffect, useState } from "preact/hooks";
 
-import { Category, Button } from "@revoltchat/ui";
+import { Category } from "@revoltchat/ui";
 
 import { internalEmit } from "../../../lib/eventEmitter";
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
@@ -33,7 +33,7 @@ import InviteList from "./embed/EmbedInvite";
 interface Props {
     attachContext?: boolean;
     queued?: QueuedMessage;
-    message: MessageObject;
+    message: MessageObject & { webhook: { name: string; avatar?: string } };
     highlight?: boolean;
     contrast?: boolean;
     content?: Children;
@@ -63,6 +63,7 @@ const Message = observer(
             ? useTriggerEvents("Menu", {
                   user: message.author_id,
                   contextualChannel: message.channel_id,
+                  contextualMessage: message._id,
                   // eslint-disable-next-line
               })
             : undefined;
@@ -137,6 +138,11 @@ const Message = observer(
                             <UserIcon
                                 className="avatar"
                                 url={message.generateMasqAvatarURL()}
+                                override={
+                                    message.webhook?.avatar
+                                        ? `https://autumn.revolt.chat/avatars/${message.webhook.avatar}`
+                                        : undefined
+                                }
                                 target={user}
                                 size={36}
                                 onClick={handleUserClick}
@@ -157,6 +163,7 @@ const Message = observer(
                                     showServerIdentity
                                     onClick={handleUserClick}
                                     masquerade={message.masquerade!}
+                                    override={message.webhook?.name}
                                     {...userContext}
                                 />
                                 <MessageDetail

src/components/common/messaging/MessageBox.tsx

@@ -23,6 +23,7 @@ import {
 } from "../../../lib/renderer/Singleton";
 
 import { state, useApplicationState } from "../../../mobx/State";
+import { DraftObject } from "../../../mobx/stores/Draft";
 import { Reply } from "../../../mobx/stores/MessageQueue";
 
 import { dayjs } from "../../../context/Locale";
@@ -277,7 +278,12 @@ export default observer(({ channel }: Props) => {
 
     // Push message content to draft.
     const setMessage = useCallback(
-        (content?: string) => state.draft.set(channel._id, content),
+        (content?: string) => {
+            const dobj: DraftObject = {
+                content,
+            };
+            state.draft.set(channel._id, dobj);
+        },
         [state.draft, channel._id],
     );
 
@@ -299,7 +305,7 @@ export default observer(({ channel }: Props) => {
             if (!state.draft.has(channel._id)) {
                 setMessage(text);
             } else {
-                setMessage(`${state.draft.get(channel._id)}\n${text}`);
+                setMessage(`${state.draft.get(channel._id)?.content}\n${text}`);
             }
         }
 
@@ -317,8 +323,8 @@ export default observer(({ channel }: Props) => {
         if (uploadState.type === "uploading" || uploadState.type === "sending")
             return;
 
-        const content = state.draft.get(channel._id)?.trim() ?? "";
-        if (uploadState.type === "attached") return sendFile(content);
+        const content = state.draft.get(channel._id)?.content?.trim() ?? "";
+        if (uploadState.type !== "none") return sendFile(content);
         if (content.length === 0) return;
 
         internalEmit("NewMessages", "hide");
@@ -400,7 +406,9 @@ export default observer(({ channel }: Props) => {
      * @returns
      */
     async function sendFile(content: string) {
-        if (uploadState.type !== "attached") return;
+        if (uploadState.type !== "attached" && uploadState.type !== "failed")
+            return;
+
         const attachments: string[] = [];
         setMessage;
 
@@ -526,7 +534,7 @@ export default observer(({ channel }: Props) => {
     }
 
     function isInCodeBlock(cursor: number): boolean {
-        const content = state.draft.get(channel._id) || "";
+        const content = state.draft.get(channel._id)?.content || "";
         const contentBeforeCursor = content.substring(0, cursor);
 
         let delimiterCount = 0;
@@ -559,6 +567,7 @@ export default observer(({ channel }: Props) => {
             channel.channel_type === "TextChannel"
                 ? { server: channel.server_id! }
                 : undefined,
+        roles: { server: channel.server_id! },
     });
 
     return (
@@ -607,10 +616,12 @@ export default observer(({ channel }: Props) => {
                     <HackAlertThisFileWillBeReplaced
                         onSelect={(emoji) => {
                             const v = state.draft.get(channel._id);
-                            state.draft.set(
-                                channel._id,
-                                `${v ? `${v} ` : ""}:${emoji}:`,
-                            );
+                            const cnt: DraftObject = {
+                                content:
+                                    (v?.content ? `${v.content} ` : "") +
+                                    `:${emoji}:`,
+                            };
+                            state.draft.set(channel._id, cnt);
                         }}
                         onClose={closePicker}
                     />
@@ -664,7 +675,7 @@ export default observer(({ channel }: Props) => {
                     id="message"
                     maxLength={2000}
                     onKeyUp={onKeyUp}
-                    value={state.draft.get(channel._id) ?? ""}
+                    value={state.draft.get(channel._id)?.content ?? ""}
                     padding="var(--message-box-padding)"
                     onKeyDown={(e) => {
                         if (e.ctrlKey && e.key === "Enter") {
@@ -736,13 +747,11 @@ export default observer(({ channel }: Props) => {
                     onFocus={onFocus}
                     onBlur={onBlur}
                 />
-                {state.experiments.isEnabled("picker") && (
-                    <Action>
-                        <IconButton onClick={() => setPicker(!picker)}>
-                            <HappyBeaming size={24} />
-                        </IconButton>
-                    </Action>
-                )}
+                <Action>
+                    <IconButton onClick={() => setPicker(!picker)}>
+                        <HappyBeaming size={24} />
+                    </IconButton>
+                </Action>
                 <Action>
                     <IconButton
                         className={

src/components/common/messaging/attachments/AttachmentActions.tsx

@@ -27,7 +27,7 @@ export default function AttachmentActions({ attachment }: Props) {
 
     const url = client.generateFileURL(attachment);
     const open_url = `${url}/${filename}`;
-    const download_url = url?.replace("attachments", "attachments/download");
+    const download_url = url;
 
     const filesize = determineFileSize(size);
 
@@ -49,10 +49,11 @@ export default function AttachmentActions({ attachment }: Props) {
                         </IconButton>
                     </a>
                     <a
+                        target="_blank"
                         href={download_url}
                         className={styles.downloadIcon}
                         download
-                        target={isFirefox || window.native ? "_blank" : "_self"}
+                        // target={isFirefox || window.native ? "_blank" : "_self"}
                         rel="noreferrer">
                         <IconButton>
                             <Download size={24} />

src/components/common/messaging/bars/MessageOverlayBar.tsx

@@ -119,19 +119,18 @@ export const MessageOverlayBar = observer(
                     </Tooltip>
                 )}
 
-                {message.channel?.havePermission("React") &&
-                    state.experiments.isEnabled("picker") && (
-                        <ReactionWrapper
-                            open={reactionsOpen}
-                            setOpen={setReactionsOpen}
-                            message={message}>
-                            <Tooltip content="React">
-                                <Entry>
-                                    <HappyBeaming size={18} />
-                                </Entry>
-                            </Tooltip>
-                        </ReactionWrapper>
-                    )}
+                {message.channel?.havePermission("React") && (
+                    <ReactionWrapper
+                        open={reactionsOpen}
+                        setOpen={setReactionsOpen}
+                        message={message}>
+                        <Tooltip content="React">
+                            <Entry>
+                                <HappyBeaming size={18} />
+                            </Entry>
+                        </Tooltip>
+                    </ReactionWrapper>
+                )}
 
                 {isAuthor && (
                     <Tooltip content="Edit">

src/components/common/messaging/bars/NewMessages.tsx

@@ -17,6 +17,7 @@ import { Bar } from "./JumpToBottom";
 export default observer(
     ({ channel, last_id }: { channel: Channel; last_id?: string }) => {
         const [hidden, setHidden] = useState(false);
+        const [timeAgo, setTimeAgo] = useState("");
         const hide = () => setHidden(true);
 
         useEffect(() => setHidden(false), [last_id]);
@@ -29,6 +30,14 @@ export default observer(
             return () => document.removeEventListener("keydown", onKeyDown);
         }, []);
 
+        useEffect(() => {
+            if (last_id) {
+                try {
+                    setTimeAgo(dayjs(decodeTime(last_id)).fromNow());
+                } catch (err) {}
+            }
+        }, [last_id]);
+
         const renderer = getRenderer(channel);
         const history = useHistory();
         if (renderer.state !== "RENDER") return null;
@@ -52,7 +61,7 @@ export default observer(
                         <Text
                             id="app.main.channel.misc.new_messages"
                             fields={{
-                                time_ago: dayjs(decodeTime(last_id)).fromNow(),
+                                time_ago: timeAgo,
                             }}
                         />
                     </div>

src/components/common/messaging/bars/TypingIndicator.tsx

@@ -76,7 +76,9 @@ export default observer(({ channel }: Props) => {
         if (users.length >= 5) {
             text = <Text id="app.main.channel.typing.several" />;
         } else if (users.length > 1) {
-            const userlist = [...users].map((x) => x!.username);
+            const userlist = [...users].map(
+                (x) => x!.display_name ?? x!.username,
+            );
             const user = userlist.pop();
 
             text = (
@@ -92,7 +94,9 @@ export default observer(({ channel }: Props) => {
             text = (
                 <Text
                     id="app.main.channel.typing.single"
-                    fields={{ user: users[0]!.username }}
+                    fields={{
+                        user: users[0]!.display_name ?? users[0]!.username,
+                    }}
                 />
             );
         }

src/components/common/messaging/embed/Embed.tsx

@@ -67,7 +67,8 @@ export default function Embed({ embed }: Props) {
                         break;
                     }
                     case "Twitch":
-                    case "Lightspeed": {
+                    case "Lightspeed":
+                    case "Streamable": {
                         mw = 1280;
                         mh = 720;
                         break;
@@ -141,7 +142,11 @@ export default function Embed({ embed }: Props) {
                                 <a
                                     onMouseDown={(ev) =>
                                         (ev.button === 0 || ev.button === 1) &&
-                                        modalController.openLink(embed.url!)
+                                        modalController.openLink(
+                                            embed.url!,
+                                            undefined,
+                                            true,
+                                        )
                                     }
                                     className={styles.title}>
                                     {embed.title}
@@ -193,7 +198,8 @@ export default function Embed({ embed }: Props) {
                         modalController.push({ type: "image_viewer", embed })
                     }
                     onMouseDown={(ev) =>
-                        ev.button === 1 && modalController.openLink(embed.url)
+                        ev.button === 1 &&
+                        modalController.openLink(embed.url, undefined, true)
                     }
                 />
             );

src/components/common/messaging/embed/EmbedMedia.tsx

@@ -92,6 +92,16 @@ export default function EmbedMedia({ embed, width, height }: Props) {
                 />
             );
         }
+        case "Streamable": {
+            return (
+                <iframe
+                    src={`https://streamable.com/e/${embed.special.id}?loop=0`}
+                    seamless
+                    loading="lazy"
+                    style={{ height }}
+                />
+            );
+        }
         default: {
             if (embed.video) {
                 const url = embed.video.url;

src/components/common/user/UserBadges.tsx

@@ -22,12 +22,11 @@ enum Badges {
 const BadgesBase = styled.div`
     gap: 8px;
     display: flex;
-    margin-top: 4px;
     flex-direction: row;
 
     img {
-        width: 32px;
-        height: 32px;
+        width: 24px;
+        height: 24px;
     }
 `;
 
@@ -103,7 +102,7 @@ export default function UserBadges({ badges, uid }: Props) {
                         content={
                             <Text id="app.special.popovers.user_profile.badges.responsible_disclosure" />
                         }>
-                        <Shield size={32} color="gray" />
+                        <Shield size={24} color="gray" />
                     </Tooltip>
                 ) : (
                     <></>
@@ -120,7 +119,7 @@ export default function UserBadges({ badges, uid }: Props) {
                             }}
                             onClick={() => {
                                 window.open(
-                                    "https://insrt.uk/donate",
+                                    "https://wiki.revolt.chat/notes/project/financial-support/",
                                     "_blank",
                                 );
                             }}

src/components/common/user/UserHeader.tsx

@@ -29,9 +29,14 @@ const HeaderBase = styled.div`
         text-overflow: ellipsis;
     }
 
+    .new-name {
+        font-size: 16px;
+        font-weight: 600;
+    }
+
     .username {
         cursor: pointer;
-        font-size: 16px;
+        font-size: 13px;
         font-weight: 600;
     }
 
@@ -50,6 +55,9 @@ export default observer(({ user }: Props) => {
     return (
         <Header topBorder palette="secondary">
             <HeaderBase>
+                <div className="new-name">
+                    {user.display_name ?? user.username}
+                </div>
                 <Localizer>
                     <Tooltip content={<Text id="app.special.copy_username" />}>
                         <span
@@ -57,7 +65,9 @@ export default observer(({ user }: Props) => {
                             onClick={() =>
                                 modalController.writeText(user.username)
                             }>
-                            @{user.username}
+                            {user.username}
+                            {"#"}
+                            {user.discriminator}
                         </span>
                     </Tooltip>
                 </Localizer>

src/components/common/user/UserIcon.tsx

@@ -14,6 +14,7 @@ import IconBase, { IconBaseProps } from "../IconBase";
 type VoiceStatus = "muted" | "deaf";
 interface Props extends IconBaseProps<User> {
     status?: boolean;
+    override?: string;
     voice?: VoiceStatus;
     masquerade?: API.Masquerade;
     showServerIdentity?: boolean;
@@ -70,12 +71,15 @@ export default observer(
             showServerIdentity,
             masquerade,
             innerRef,
+            override,
             ...svgProps
         } = props;
 
         let { url } = props;
         if (masquerade?.avatar) {
             url = client.proxyFile(masquerade.avatar);
+        } else if (override) {
+            url = override;
         } else if (!url) {
             let override;
             if (target && showServerIdentity) {

src/components/common/user/UserShort.tsx

@@ -39,6 +39,7 @@ type UsernameProps = Omit<
     masquerade?: API.Masquerade;
     showServerIdentity?: boolean | "both";
 
+    override?: string;
     innerRef?: Ref<any>;
 };
 
@@ -64,13 +65,18 @@ export const Username = observer(
         masquerade,
         showServerIdentity,
         innerRef,
+        override,
         ...otherProps
     }: UsernameProps) => {
-        let username = user?.username;
+        let username =
+            (user as unknown as { display_name: string })?.display_name ??
+            user?.username;
         let color = masquerade?.colour;
         let timed_out: Date | undefined;
 
-        if (user && showServerIdentity) {
+        if (override) {
+            username = override;
+        } else if (user && showServerIdentity) {
             const { server } = useParams<{ server?: string }>();
             if (server) {
                 const client = useClient();
@@ -146,6 +152,17 @@ export const Username = observer(
             );
         }
 
+        if (override) {
+            return (
+                <>
+                    {el}
+                    <BotBadge>
+                        <Text id="app.main.channel.bot" />
+                    </BotBadge>
+                </>
+            );
+        }
+
         return el;
     },
 );

src/components/markdown/RemarkRenderer.tsx

@@ -1,5 +1,4 @@
 import "katex/dist/katex.min.css";
-import rehypeKatex from "rehype-katex";
 import rehypePrism from "rehype-prism";
 import rehypeReact from "rehype-react";
 import remarkBreaks from "remark-breaks";
@@ -14,6 +13,9 @@ import { createElement } from "preact";
 import { memo } from "preact/compat";
 import { useLayoutEffect, useMemo, useState } from "preact/hooks";
 
+// @ts-expect-error no typings
+import rehypeKatex from "@revoltchat/rehype-katex";
+
 import { MarkdownProps } from "./Markdown";
 import { handlers } from "./hast";
 import { RenderCodeblock } from "./plugins/Codeblock";
@@ -146,6 +148,7 @@ const render = unified()
     .use(rehypeKatex, {
         maxSize: 10,
         maxExpand: 0,
+        maxLength: 512,
         trust: false,
         strict: false,
         output: "html",
@@ -182,7 +185,8 @@ const Container = styled.div<{ largeEmoji: boolean }>`
 /**
  * Regex for matching execessive recursion of blockquotes and lists
  */
-const RE_RECURSIVE = /(^(?:[>*+-][^\S\r\n]*){5})(?:[>*+-][^\S\r\n]*)+(.*$)/gm;
+const RE_RECURSIVE =
+    /(^(?:(?:[>*+-]|\d+\.)[^\S\r\n]*){5})(?:(?:[>*+-]|\d+\.)[^\S\r\n]*)+(.*$)/gm;
 
 /**
  * Regex for matching multi-line blockquotes
@@ -244,9 +248,13 @@ export default memo(({ content, disallowBigEmoji }: MarkdownProps) => {
     const [Content, setContent] = useState<React.ReactElement>(null!);
 
     useLayoutEffect(() => {
-        render
-            .process(sanitisedContent)
-            .then((file) => setContent(file.result));
+        try {
+            render
+                .process(sanitisedContent)
+                .then((file) => setContent(file.result));
+        } catch (err) {
+            setContent("Message failed to render." as never);
+        }
     }, [sanitisedContent]);
 
     const largeEmoji = useMemo(

src/components/markdown/plugins/anchors.tsx

@@ -27,7 +27,11 @@ export function RenderAnchor({
             target="_blank"
             rel="noreferrer"
             onClick={(ev) =>
-                modalController.openLink(href) && ev.preventDefault()
+                modalController.openLink(
+                    href,
+                    undefined,
+                    ev.currentTarget.innerText !== href,
+                ) && ev.preventDefault()
             }
         />
     );

src/components/markdown/plugins/emoji.tsx

@@ -25,7 +25,7 @@ const Emoji = styled.img`
     }
 `;
 
-const RE_EMOJI = /:([a-zA-Z0-9_+]+):/g;
+const RE_EMOJI = /:([a-zA-Z0-9\-_]+):/g;
 const RE_ULID = /^[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$/;
 
 export function RenderEmoji({ match }: CustomComponentProps) {

src/components/settings/account/AccountManagement.tsx

@@ -39,7 +39,7 @@ export default function AccountManagement() {
             <CategoryButton
                 icon={<Block size={24} color="var(--error)" />}
                 description={
-                    "Disable your account. You won't be able to access it unless you contact support."
+                    <Text id="app.settings.pages.account.manage.disable_description" />
                 }
                 action="chevron"
                 onClick={callback("disable")}>
@@ -49,7 +49,7 @@ export default function AccountManagement() {
             <CategoryButton
                 icon={<Trash size={24} color="var(--error)" />}
                 description={
-                    "Your account will be queued for deletion, a confirmation email will be sent."
+                    <Text id="app.settings.pages.account.manage.delete_description" />
                 }
                 action="chevron"
                 onClick={callback("delete")}>

src/components/settings/account/EditAccount.tsx

@@ -37,7 +37,13 @@ export default observer(() => {
 
             {(
                 [
-                    ["username", client.user!.username, At],
+                    [
+                        "username",
+                        client.user!.username +
+                            "#" +
+                            client.user!.discriminator,
+                        At,
+                    ],
                     ["email", email, Envelope],
                     ["password", "•••••••••", Key],
                 ] as const

src/controllers/client/ClientController.tsx

@@ -159,7 +159,7 @@ class ClientController {
             })
             .catch((err) => {
                 const error = takeError(err);
-                if (error === "Forbidden" || error === "Unauthorized") {
+                if (error === "Unauthorized") {
                     this.sessions.delete(user_id);
                     this.current = null;
                     this.pickNextSession();
@@ -252,7 +252,7 @@ class ClientController {
         // Start client lifecycle
         this.addSession(
             {
-                session,
+                session: session as never,
             },
             "new",
         );

src/controllers/client/Session.tsx

@@ -3,6 +3,7 @@ import { API, Client } from "revolt.js";
 
 import { state } from "../../mobx/State";
 
+import { resetMemberSidebarFetched } from "../../components/navigation/right/MemberSidebar";
 import { modalController } from "../modals/ModalController";
 
 /**
@@ -97,6 +98,7 @@ export default class Session {
      * Called when the client signals it has received the Ready packet
      */
     private onReady() {
+        resetMemberSidebarFetched();
         this.emit({
             action: "SUCCESS",
         });

src/controllers/client/jsx/error.tsx

@@ -10,8 +10,9 @@ export function takeError(error: any): string {
             case 429:
                 return "TooManyRequests";
             case 401:
+                return "Unauthorized"
             case 403:
-                return "Unauthorized";
+                return "Forbidden";
             default:
                 return "UnknownError";
         }

src/controllers/client/jsx/legacy/FileUploads.tsx

@@ -12,7 +12,7 @@ import { IconButton, Preloader } from "@revoltchat/ui";
 import { determineFileSize } from "../../../../lib/fileSize";
 
 import { modalController } from "../../../modals/ModalController";
-import { useClient } from "../../ClientController";
+import { clientController, useClient } from "../../ClientController";
 import { takeError } from "../error";
 
 type BehaviourType =
@@ -67,9 +67,16 @@ export async function uploadFile(
     const formData = new FormData();
     formData.append("file", file);
 
+    const client = clientController.getActiveSession()?.client;
+    const sesToken =
+        typeof client?.session === "string"
+            ? client.session
+            : client?.session?.token;
+
     const res = await Axios.post(`${autumnURL}/${tag}`, formData, {
         headers: {
             "Content-Type": "multipart/form-data",
+            "X-Session-Token": sesToken,
         },
         ...config,
     });

src/controllers/modals/ModalController.tsx

@@ -18,6 +18,7 @@ import { history } from "../../context/history";
 import AddFriend from "./components/AddFriend";
 import BanMember from "./components/BanMember";
 import Changelog from "./components/Changelog";
+import ChangelogUsernames from "./components/ChangelogUsernames";
 import ChannelInfo from "./components/ChannelInfo";
 import Clipboard from "./components/Clipboard";
 import ConfirmLeave from "./components/ConfirmLeave";
@@ -39,8 +40,11 @@ import MFAEnableTOTP from "./components/MFAEnableTOTP";
 import MFAFlow from "./components/MFAFlow";
 import MFARecovery from "./components/MFARecovery";
 import ModifyAccount from "./components/ModifyAccount";
+import ModifyDisplayname from "./components/ModifyDisplayname";
 import OutOfDate from "./components/OutOfDate";
 import PendingFriendRequests from "./components/PendingFriendRequests";
+import ReportContent from "./components/Report";
+import ReportSuccess from "./components/ReportSuccess";
 import ServerIdentity from "./components/ServerIdentity";
 import ServerInfo from "./components/ServerInfo";
 import ShowToken from "./components/ShowToken";
@@ -204,12 +208,25 @@ class ModalControllerExtended extends ModalController<Modal> {
      * Safely open external or internal link
      * @param href Raw URL
      * @param trusted Whether we trust this link
+     * @param mismatch Whether to always open link warning
      * @returns Whether to cancel default event
      */
-    openLink(href?: string, trusted?: boolean) {
+    openLink(href?: string, trusted?: boolean, mismatch?: boolean) {
         const link = determineLink(href);
         const settings = getApplicationState().settings;
 
+        if (mismatch) {
+            if (href) {
+                modalController.push({
+                    type: "link_warning",
+                    link: href,
+                    callback: () => this.openLink(href, true) as true,
+                });
+            }
+
+            return true;
+        }
+
         switch (link.type) {
             case "navigate": {
                 history.push(link.path);
@@ -276,4 +293,9 @@ export const modalController = new ModalControllerExtended({
     sign_out_sessions: SignOutSessions,
     user_picker: UserPicker,
     user_profile: UserProfile,
+    report: ReportContent,
+    report_success: ReportSuccess,
+    modify_displayname: ModifyDisplayname,
+    changelog_usernames: ChangelogUsernames,
+    reset_bot_token: Confirmation
 });

src/controllers/modals/ModalRenderer.tsx

@@ -9,16 +9,17 @@ export default observer(() => {
     const history = useHistory();
 
     useEffect(() => {
-        function keyUp(event: KeyboardEvent) {
+        function keyDown(event: KeyboardEvent) {
             if (event.key === "Escape") {
                 modalController.pop("close");
             } else if (event.key === "Enter") {
+                if (event.target instanceof HTMLSelectElement) return;
                 modalController.pop("confirm");
             }
         }
 
-        document.addEventListener("keyup", keyUp);
-        return () => document.removeEventListener("keyup", keyUp);
+        document.addEventListener("keydown", keyDown);
+        return () => document.removeEventListener("keydown", keyDown);
     }, []);
 
     return (

src/controllers/modals/components/AddFriend.tsx

@@ -23,6 +23,7 @@ export default function AddFriend({ ...props }: ModalProps<"add_friend">) {
             data={{
                 username: {
                     field: "Username",
+                    placeholder: "username#1234",
                 },
             }}
             callback={({ username }) =>

src/controllers/modals/components/Changelog.tsx

@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import styled from "styled-components";
+import styled, { css } from "styled-components";
 
 import { Text } from "preact-i18n";
 import { useMemo, useState } from "preact/hooks";
@@ -14,10 +14,17 @@ import {
     changelogEntryArray,
     ChangelogPost,
 } from "../../../assets/changelogs";
+import Markdown from "../../../components/markdown/Markdown";
 import { ModalProps } from "../types";
 
-const Image = styled.img`
+const Image = styled.img<{ shadow?: boolean }>`
     border-radius: var(--border-radius);
+
+    ${(props) =>
+        props.shadow &&
+        css`
+            filter: drop-shadow(4px 4px 10px rgba(0, 0, 0, 0.5));
+        `}
 `;
 
 function RenderLog({ post }: { post: ChangelogPost }) {
@@ -25,9 +32,11 @@ function RenderLog({ post }: { post: ChangelogPost }) {
         <Column>
             {post.content.map((entry) =>
                 typeof entry === "string" ? (
-                    <span>{entry}</span>
+                    <Markdown content={entry} />
+                ) : entry.type === "element" ? (
+                    entry.element
                 ) : (
-                    <Image src={entry.src} />
+                    <Image src={entry.src} shadow={entry.shadow} />
                 ),
             )}
         </Column>

src/controllers/modals/components/ChangelogUsernames.tsx

@@ -0,0 +1,146 @@
+import Lottie, { LottieRefCurrentProps } from "lottie-react";
+
+import { useEffect, useRef } from "preact/hooks";
+
+import { Button, Column, InputBox, Modal, Row } from "@revoltchat/ui";
+
+import { useClient } from "../../client/ClientController";
+import { modalController } from "../ModalController";
+import { ModalProps } from "../types";
+import usernameAnim from "./legacy/usernameUpdateLottie.json";
+
+/**
+ * Changelog: Username update
+ */
+export default function ChangelogUsernames({
+    onClose,
+    signal,
+}: ModalProps<"changelog_usernames">) {
+    const client = useClient();
+
+    const lottieRef = useRef<LottieRefCurrentProps>();
+
+    useEffect(() => {
+        if (lottieRef.current) {
+            const timer = setTimeout(() => lottieRef.current!.play(), 2500);
+            return () => clearTimeout(timer);
+        }
+    }, [lottieRef]);
+
+    return (
+        <Modal onClose={onClose} signal={signal} transparent>
+            {
+                (
+                    <Column gap="0">
+                        <div
+                            style={{
+                                background: "black",
+                                borderStartStartRadius: "12px",
+                                borderStartEndRadius: "12px",
+                                display: "grid",
+                                placeItems: "center",
+                                padding: "1.5em",
+                            }}>
+                            <Lottie
+                                lottieRef={lottieRef as never}
+                                animationData={usernameAnim}
+                                autoplay={false}
+                                loop={false}
+                                style={{ width: "240px" }}
+                            />
+                        </div>
+                        <div
+                            style={{
+                                padding: "1em",
+                                background: "var(--secondary-header)",
+                                textAlign: "center",
+                            }}>
+                            <Column
+                                gap="6px"
+                                style={{
+                                    alignItems: "center",
+                                }}>
+                                <span
+                                    style={{
+                                        fontSize: "1.5em",
+                                        fontWeight: 700,
+                                        marginBottom: "12px",
+                                    }}>
+                                    Usernames are Changing
+                                </span>
+                                <span
+                                    style={{
+                                        color: "var(--secondary-foreground)",
+                                        fontSize: "0.9em",
+                                        fontWeight: 500,
+                                    }}>
+                                    We've changed how usernames work on Revolt.
+                                    Now you can set a display name in addition
+                                    to a username with a number tag for easier
+                                    sharing.
+                                </span>
+                                <span
+                                    style={{
+                                        color: "var(--secondary-foreground)",
+                                        fontSize: "0.9em",
+                                        fontWeight: 500,
+                                    }}>
+                                    Here's how your new username looks:
+                                </span>
+                                <InputBox
+                                    value={
+                                        client.user!.display_name ??
+                                        client.user!.username
+                                    }
+                                    style={{
+                                        maxWidth: "180px",
+                                    }}
+                                    disabled
+                                />
+                                <InputBox
+                                    value={
+                                        client.user.username +
+                                        "#" +
+                                        client.user.discriminator
+                                    }
+                                    style={{
+                                        maxWidth: "180px",
+                                    }}
+                                    disabled
+                                />
+                                <a
+                                    href="https://revolt.chat/posts/evolving-usernames"
+                                    target="_blank">
+                                    Read more about this change
+                                </a>
+                            </Column>
+                        </div>
+                        <Row
+                            style={{
+                                padding: "1em",
+                                borderEndStartRadius: "12px",
+                                borderEndEndRadius: "12px",
+                                background: "var(--secondary-background)",
+                                textAlign: "center",
+                                justifyContent: "end",
+                            }}>
+                            <Button palette="plain" onClick={onClose}>
+                                Skip for now
+                            </Button>
+                            <Button
+                                palette="accent"
+                                onClick={() => {
+                                    modalController.openLink(
+                                        "/settings/profile",
+                                    );
+                                    onClose();
+                                }}>
+                                Edit Profile
+                            </Button>
+                        </Row>
+                    </Column>
+                ) as any
+            }
+        </Modal>
+    );
+}

src/controllers/modals/components/Confirmation.tsx

@@ -20,6 +20,7 @@ export default function Confirmation(
         | "delete_bot"
         | "block_user"
         | "unfriend_user"
+        | "reset_bot_token"
     >,
 ) {
     const history = useHistory();
@@ -31,6 +32,7 @@ export default function Confirmation(
         delete_bot: ["confirm_delete", "delete"],
         unfriend_user: ["unfriend_user", "remove"],
         block_user: ["block_user", "block"],
+        reset_bot_token: ["reset_bot_token", "reset"],
     };
 
     const event = EVENTS[props.type];
@@ -88,6 +90,12 @@ export default function Confirmation(
                             .bots.delete(props.target);
                         props.cb?.();
                         break;
+                    case "reset_bot_token":
+                        clientController
+                            .getAvailableClient()
+                            .bots
+                            .edit(props.target.id, { remove: ["Token"] })
+                            .then(props.callback)
                 }
             }}
             submit={{

src/controllers/modals/components/ModifyAccount.tsx

@@ -3,7 +3,7 @@ import { SubmitHandler, useForm } from "react-hook-form";
 import { Text } from "preact-i18n";
 import { useState } from "preact/hooks";
 
-import { Category, Error, Modal } from "@revoltchat/ui";
+import { Category, Error, InputBox, Modal, Tip } from "@revoltchat/ui";
 
 import { noopTrue } from "../../../lib/js";
 
@@ -120,14 +120,34 @@ export default function ModifyAccount({
                     />
                 )}
                 {field === "username" && (
-                    <FormField
-                        type="username"
-                        name="new_username"
-                        register={register}
-                        showOverline
-                        error={errors.new_username?.message}
-                        disabled={processing}
-                    />
+                    <div
+                        style={{
+                            display: "flex",
+                            alignItems: "end",
+                            gap: "8px",
+                        }}>
+                        <div style={{ flexGrow: 1 }}>
+                            <FormField
+                                type="username"
+                                name="new_username"
+                                register={register}
+                                showOverline
+                                error={errors.new_username?.message}
+                                disabled={processing}
+                            />
+                        </div>
+                        <div
+                            style={{
+                                flexShrink: 0,
+                                width: "80px",
+                                textAlign: "center",
+                            }}>
+                            <InputBox
+                                disabled
+                                value={"#" + client.user.discriminator}
+                            />
+                        </div>
+                    </div>
                 )}
                 <FormField
                     type="current_password"
@@ -141,11 +161,24 @@ export default function ModifyAccount({
                     <Category compact>
                         <Error
                             error={
-                                <Text id="app.special.modals.account.failed" />
+                                <>
+                                    <Text id="app.special.modals.account.failed" />{" "}
+                                    <Text id={`error.${error}`}>{error}</Text>
+                                </>
                             }
                         />
                     </Category>
                 )}
+
+                {field === "username" && (
+                    <div style={{ marginTop: "8px" }}>
+                        <Tip palette="warning">
+                            Changing your username may change your number tag.
+                            You can freely change the case of your username.
+                            Your number tag may change at most once a day.
+                        </Tip>
+                    </div>
+                )}
             </form>
         </Modal>
     );

src/controllers/modals/components/ModifyDisplayname.tsx

@@ -0,0 +1,47 @@
+import { Text } from "preact-i18n";
+
+import { ModalForm } from "@revoltchat/ui";
+
+import { useClient } from "../../client/ClientController";
+import { ModalProps } from "../types";
+
+/**
+ * Modify display name modal
+ */
+export default function ModifyDisplayname({
+    ...props
+}: ModalProps<"modify_displayname">) {
+    const client = useClient();
+
+    return (
+        <ModalForm
+            {...props}
+            title="Update display name"
+            schema={{
+                display_name: "text",
+            }}
+            defaults={{
+                display_name: (
+                    client.user as unknown as { display_name: string }
+                )?.display_name as string,
+            }}
+            data={{
+                display_name: {
+                    field: "Display Name",
+                },
+            }}
+            callback={({ display_name }) =>
+                display_name && display_name !== client.user!.username
+                    ? client.users.edit({
+                          display_name,
+                      } as never)
+                    : client.users.edit({
+                          remove: ["DisplayName"],
+                      } as never)
+            }
+            submit={{
+                children: <Text id="app.special.modals.actions.save" />,
+            }}
+        />
+    );
+}

src/controllers/modals/components/Report.tsx

@@ -0,0 +1,148 @@
+import { API, Message as MessageInterface, User } from "revolt.js";
+import styled from "styled-components";
+
+import { Text } from "preact-i18n";
+
+import { ModalForm, Row } from "@revoltchat/ui";
+
+import Message from "../../../components/common/messaging/Message";
+import UserShort from "../../../components/common/user/UserShort";
+import { useClient } from "../../client/ClientController";
+import { modalController } from "../ModalController";
+import { ModalProps } from "../types";
+
+const CONTENT_REASONS: API.ContentReportReason[] = [
+    "NoneSpecified",
+    "Illegal",
+    "PromotesHarm",
+    "SpamAbuse",
+    "Malware",
+    "Harassment",
+];
+
+const USER_REASONS: API.UserReportReason[] = [
+    "NoneSpecified",
+    "SpamAbuse",
+    "InappropriateProfile",
+    "Impersonation",
+    "BanEvasion",
+    "Underage",
+];
+
+/**
+ * Add padding to the message container
+ */
+const MessageContainer = styled.div`
+    margin-block-end: 16px;
+`;
+
+/**
+ * Report creation modal
+ */
+export default function ReportContent({
+    target,
+    messageId,
+    ...props
+}: ModalProps<"report">) {
+    const client = useClient();
+
+    return (
+        <ModalForm
+            {...props}
+            title={
+                target instanceof MessageInterface ? (
+                    <Text id="app.special.modals.report.message" />
+                ) : (
+                    <Text
+                        id="app.special.modals.report.by_name"
+                        fields={{
+                            name:
+                                target instanceof User
+                                    ? target.username
+                                    : target.name,
+                        }}
+                    />
+                )
+            }
+            schema={{
+                selected: "custom",
+                reason: "combo",
+                additional_context: "text",
+            }}
+            data={{
+                selected: {
+                    element:
+                        target instanceof MessageInterface ? (
+                            <MessageContainer>
+                                <Message message={target} head attachContext />
+                            </MessageContainer>
+                        ) : target instanceof User ? (
+                            <Row centred>
+                                <UserShort user={target} size={32} />
+                            </Row>
+                        ) : (
+                            <></>
+                        ),
+                },
+                reason: {
+                    field: (
+                        <Text id="app.special.modals.report.reason" />
+                    ) as React.ReactChild,
+                    options: (target instanceof User
+                        ? USER_REASONS
+                        : CONTENT_REASONS
+                    ).map((value) => ({
+                        name: (
+                            <Text
+                                id={
+                                    value === "NoneSpecified"
+                                        ? "app.special.modals.report.no_reason"
+                                        : `app.special.modals.report.${
+                                              target instanceof User
+                                                  ? "user"
+                                                  : "content"
+                                          }_reason.${value}`
+                                }
+                            />
+                        ),
+                        value,
+                    })),
+                },
+                additional_context: {
+                    field: (
+                        <Text id="app.special.modals.report.additional_context" />
+                    ) as React.ReactChild,
+                },
+            }}
+            callback={async ({ reason, additional_context }) => {
+                await client.api.post("/safety/report", {
+                    content: {
+                        id: target._id,
+                        type:
+                            target instanceof MessageInterface
+                                ? "Message"
+                                : target instanceof User
+                                ? "User"
+                                : "Server",
+                        report_reason: reason as any,
+                        message_id: messageId,
+                    },
+                    additional_context,
+                });
+
+                modalController.push({
+                    type: "report_success",
+                    user:
+                        target instanceof MessageInterface
+                            ? target.author
+                            : target instanceof User
+                            ? target
+                            : undefined,
+                });
+            }}
+            submit={{
+                children: <Text id="app.special.modals.actions.report" />,
+            }}
+        />
+    );
+}

src/controllers/modals/components/ReportSuccess.tsx

@@ -0,0 +1,65 @@
+import { Text } from "preact-i18n";
+
+import { Modal } from "@revoltchat/ui";
+
+import { noopTrue } from "../../../lib/js";
+
+import { ModalProps } from "../types";
+
+/**
+ * Report success modal
+ */
+export default function ReportSuccess({
+    user,
+    ...props
+}: ModalProps<"report_success">) {
+    return (
+        <Modal
+            {...props}
+            title={<Text id="app.special.modals.report.reported" />}
+            description={
+                <>
+                    <Text id="app.special.modals.report.thank_you" />
+                    {user && (
+                        <>
+                            <br />
+                            <br />
+                            <Text id="app.special.modals.report.block_user" />
+                        </>
+                    )}
+                </>
+            }
+            actions={
+                user
+                    ? [
+                          {
+                              palette: "plain",
+                              onClick: async () => {
+                                  user.blockUser();
+                                  return true;
+                              },
+                              children: (
+                                  <Text id="app.special.modals.actions.block" />
+                              ),
+                          },
+                          {
+                              palette: "plain-secondary",
+                              onClick: noopTrue,
+                              children: (
+                                  <Text id="app.special.modals.actions.dont_block" />
+                              ),
+                          },
+                      ]
+                    : [
+                          {
+                              palette: "plain",
+                              onClick: noopTrue,
+                              children: (
+                                  <Text id="app.special.modals.actions.done" />
+                              ),
+                          },
+                      ]
+            }
+        />
+    );
+}

src/controllers/modals/components/ServerInfo.tsx

@@ -5,6 +5,7 @@ import { Text } from "preact-i18n";
 import { Column, H1, IconButton, Modal, Row } from "@revoltchat/ui";
 
 import Markdown from "../../../components/markdown/Markdown";
+import { useClient } from "../../client/ClientController";
 import { report } from "../../safety";
 import { modalController } from "../ModalController";
 import { ModalProps } from "../types";
@@ -13,6 +14,49 @@ export default function ServerInfo({
     server,
     ...props
 }: ModalProps<"server_info">) {
+    const client = useClient();
+    const isOwner = server.owner === client.user?._id;
+
+    const actions = [
+        {
+            onClick: () => {
+                modalController.push({
+                    type: "server_identity",
+                    member: server.member!,
+                });
+                return true;
+            },
+            children: "Edit Identity",
+            palette: "primary",
+        },
+    ];
+
+    if (!isOwner) {
+        actions.push({
+            onClick: () => {
+                modalController.push({
+                    type: "leave_server",
+                    target: server,
+                });
+                return true;
+            },
+            children: "Leave Server",
+            palette: "error",
+        });
+    }
+
+    actions.push({
+        onClick: () => {
+            modalController.push({
+                type: "report",
+                target: server,
+            });
+            return true;
+        },
+        children: <Text id="app.special.modals.actions.report" />,
+        palette: "error",
+    });
+
     return (
         <Modal
             {...props}
@@ -26,22 +70,7 @@ export default function ServerInfo({
                     </IconButton>
                 </Row>
             }
-            actions={[
-                {
-                    onClick: () =>
-                        modalController.push({
-                            type: "server_identity",
-                            member: server.member!,
-                        }),
-                    children: "Edit Identity",
-                    palette: "primary",
-                },
-                {
-                    onClick: () => report(server),
-                    children: <Text id="app.special.modals.actions.report" />,
-                    palette: "error",
-                },
-            ]}>
+            actions={actions}>
             <Markdown content={server.description!} />
         </Modal>
     );

src/controllers/modals/components/legacy/Onboarding.tsx

@@ -71,6 +71,10 @@ export function OnboardingModal({
                                         error={error}
                                     />
                                 </div>
+                                <p>
+                                    You will be automatically assigned a number
+                                    tag which you can find from settings.
+                                </p>
                                 <Button palette="accent">
                                     {"Looks good!"}
                                 </Button>

src/controllers/modals/components/legacy/UserProfile.module.scss

@@ -46,13 +46,28 @@
             text-overflow: ellipsis;
         }
 
-        .username {
+        .usernameDetail {
+            display: flex;
+            flex-direction: column;
+            margin-bottom: 4px;
+        }
+
+        .displayname {
             font-size: 22px;
             font-weight: 600;
         }
 
+        .username {
+            display: block;
+            font-size: 13px;
+            font-weight: 600;
+            width: fit-content;
+            color: var(--secondary-foreground);
+        }
+
         .status {
             font-size: 13px;
+            color: var(--secondary-foreground);
 
             > div {
                 display: inline !important;

src/controllers/modals/components/legacy/UserProfile.tsx

@@ -6,6 +6,7 @@ import {
     UserX,
     Group,
     InfoCircle,
+    Flag,
 } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { Link, useHistory } from "react-router-dom";
@@ -163,16 +164,33 @@ export const UserProfile = observer(
                             }
                         />
                         <div className={styles.details}>
-                            <Localizer>
+                            <div className={styles.usernameDetail}>
                                 <span
-                                    className={styles.username}
+                                    className={styles.displayname}
                                     onClick={() =>
                                         modalController.writeText(user.username)
                                     }>
-                                    {"@"}
-                                    {user.username}
+                                    {user.display_name ?? user.username}
                                 </span>
-                            </Localizer>
+                                <span
+                                    className={styles.username}
+                                    onClick={() =>
+                                        modalController.writeText(
+                                            user.username +
+                                                "#" +
+                                                user.discriminator,
+                                        )
+                                    }>
+                                    <Localizer>
+                                        <Tooltip
+                                            content={
+                                                <Text id="app.special.copy_username" />
+                                            }>
+                                            {user.username}#{user.discriminator}
+                                        </Tooltip>
+                                    </Localizer>
+                                </span>
+                            </div>
                             {user.status?.text && (
                                 <span className={styles.status}>
                                     <UserStatus user={user} tooltip />
@@ -229,7 +247,40 @@ export const UserProfile = observer(
                                 <UserX size={28} />
                             </IconButton>
                         )}
+                        {!user.bot && flags != 2 && flags != 4 && (
+                            <Localizer>
+                                <Tooltip
+                                    content={
+                                        <Text id="app.context_menu.report_user" />
+                                    }>
+                                    <IconButton
+                                        onClick={() =>
+                                            modalController.push({
+                                                type: "report",
+                                                target: user,
+                                            })
+                                        }>
+                                        <Flag size={28} />
+                                    </IconButton>
+                                </Tooltip>
+                            </Localizer>
+                        )}
                     </div>
+                    {badges > 0 && (
+                        <div
+                            style={{
+                                marginInline: "1em",
+                                padding: "0.5em",
+                                background: "var(--primary-background)",
+                                borderRadius: "8px",
+                                width: "fit-content",
+                                backgroundColor:
+                                    "rgba(var(--primary-header-rgb), max(var(--min-opacity), 0.65))",
+                                backdropFilter: "blur(20px)",
+                            }}>
+                            <UserBadges badges={badges} uid={user._id} />
+                        </div>
+                    )}
                     <div className={styles.tabs}>
                         <div
                             data-active={tab === "profile"}
@@ -261,10 +312,7 @@ export const UserProfile = observer(
                 </div>
                 <div className={styles.content}>
                     {tab === "profile" &&
-                        (profile?.content ||
-                        badges > 0 ||
-                        flags > 0 ||
-                        user.bot ? (
+                        (profile?.content || flags > 0 || user.bot ? (
                             <div>
                                 {flags & 1 ? (
                                     /** ! FIXME: i18n this area */
@@ -314,17 +362,6 @@ export const UserProfile = observer(
                                         </div>
                                     </>
                                 ) : undefined}
-                                {badges > 0 && (
-                                    <div className={styles.category}>
-                                        <Text id="app.special.popovers.user_profile.sub.badges" />
-                                    </div>
-                                )}
-                                {badges > 0 && (
-                                    <UserBadges
-                                        badges={badges}
-                                        uid={user._id}
-                                    />
-                                )}
                                 {profile?.content && (
                                     <>
                                         <div className={styles.category}>

src/controllers/modals/types.ts

@@ -9,6 +9,7 @@ export type Modal = {
               | "create_group"
               | "create_server"
               | "custom_status"
+              | "modify_displayname"
               | "add_friend";
       }
     | ({
@@ -40,6 +41,7 @@ export type Modal = {
           type: "changelog";
           initial?: number;
       }
+    | { type: "changelog_usernames" }
     | {
           type: "sign_out_sessions";
           client: Client;
@@ -179,6 +181,20 @@ export type Modal = {
     | {
           type: "import_theme";
       }
+    | {
+          type: "report";
+          target: Server | User | Message;
+          messageId?: string;
+      }
+    | {
+          type: "report_success";
+          user?: User;
+      }
+    | {
+          type: "reset_bot_token";
+          target: { name: string, id: string },
+          callback: () => Promise<void>;
+    }
 );
 
 export type ModalProps<T extends Modal["type"]> = Modal & { type: T } & {

src/lib/ContextMenus.tsx

@@ -2,32 +2,29 @@ import { ChevronRight, Trash } from "@styled-icons/boxicons-regular";
 import { Cog, UserVoice } from "@styled-icons/boxicons-solid";
 import { isFirefox } from "react-device-detect";
 import { useHistory } from "react-router-dom";
-import {
-    Channel,
-    Message,
-    Server,
-    User,
-    API,
-    Permission,
-    UserPermission,
-    Member,
-} from "revolt.js";
+import { Channel, Message, Server, User, API, Permission, UserPermission, Member } from "revolt.js";
 
-import {
-    ContextMenuWithData,
-    MenuItem,
-    openContextMenu,
-} from "preact-context-menu";
+
+
+import { ContextMenuWithData, MenuItem, openContextMenu } from "preact-context-menu";
 import { Text } from "preact-i18n";
 
-import { IconButton, LineDivider } from "@revoltchat/ui";
+
+
+import { Column, IconButton, LineDivider } from "@revoltchat/ui";
+
+
 
 import { useApplicationState } from "../mobx/State";
 import { QueuedMessage } from "../mobx/stores/MessageQueue";
 import { NotificationState } from "../mobx/stores/NotificationOptions";
 
+
+
 import CMNotifications from "./contextmenu/CMNotifications";
 
+
+
 import Tooltip from "../components/common/Tooltip";
 import UserStatus from "../components/common/user/UserStatus";
 import { useSession } from "../controllers/client/ClientController";
@@ -36,6 +33,7 @@ import { modalController } from "../controllers/modals/ModalController";
 import { internalEmit } from "./eventEmitter";
 import { getRenderer } from "./renderer/Singleton";
 
+
 interface ContextMenuData {
     user?: string;
     server?: string;
@@ -47,10 +45,13 @@ interface ContextMenuData {
     unread?: boolean;
     queued?: QueuedMessage;
     contextualChannel?: string;
+    contextualMessage?: string;
 }
 
 type Action =
     | { action: "copy_id"; id: string }
+    | { action: "admin"; id: string; type: "channel" | "message" | "user" }
+    | { action: "admin_system"; id: string }
     | { action: "copy_message_link"; message: Message }
     | { action: "copy_selection" }
     | { action: "copy_text"; content: string }
@@ -111,7 +112,8 @@ type Action =
           action: "set_notification_state";
           key: string;
           state?: NotificationState;
-      };
+      }
+    | { action: "report"; target: User | Server | Message; messageId?: string };
 
 // ! FIXME: I dare someone to re-write this
 // Tip: This should just be split into separate context menus per logical area.
@@ -131,6 +133,18 @@ export default function ContextMenus() {
                 case "copy_id":
                     modalController.writeText(data.id);
                     break;
+                case "admin":
+                    window.open(
+                        `https://admin.revolt.chat/panel/inspect/${data.type}/${data.id}`,
+                        "_blank",
+                    );
+                    break;
+                case "admin_system":
+                    window.open(
+                        `https://admin.revolt.chat/panel/inspect/user/${data.id}`,
+                        "_blank",
+                    );
+                    break;
                 case "copy_message_link":
                     {
                         let pathname = `/channel/${data.message.channel_id}/${data.message._id}`;
@@ -274,11 +288,7 @@ export default function ContextMenus() {
                         window.open(
                             // ! FIXME: do this from revolt.js
                             client
-                                .generateFileURL(data.attachment)
-                                ?.replace(
-                                    "attachments",
-                                    "attachments/download",
-                                ),
+                                .generateFileURL(data.attachment),
                             isFirefox || window.native ? "_blank" : "_self",
                         );
                     }
@@ -449,6 +459,13 @@ export default function ContextMenus() {
                 case "open_server_settings":
                     history.push(`/server/${data.id}/settings`);
                     break;
+                case "report":
+                    modalController.push({
+                        type: "report",
+                        target: data.target,
+                        messageId: data.messageId,
+                    });
+                    break;
             }
         })().catch((err) => {
             modalController.push({
@@ -471,6 +488,7 @@ export default function ContextMenus() {
                     queued,
                     unread,
                     contextualChannel: cxid,
+                    contextualMessage,
                 }: ContextMenuData) => {
                     const elements: Children[] = [];
                     let lastDivider = false;
@@ -486,11 +504,17 @@ export default function ContextMenus() {
                         elements.push(
                             <MenuItem data={action} disabled={disabled}>
                                 <span style={{ color }}>
-                                    <Text
-                                        id={`app.context_menu.${
-                                            locale ?? action.action
-                                        }`}
-                                    />
+                                    {locale === "admin" ? (
+                                        "Open in Admin Panel"
+                                    ) : locale === "admin_system" ? (
+                                        "Open User in Admin Panel"
+                                    ) : (
+                                        <Text
+                                            id={`app.context_menu.${
+                                                locale ?? action.action
+                                            }`}
+                                        />
+                                    )}
                                 </span>
                                 {tip && <div className="tip">{tip}</div>}
                             </MenuItem>,
@@ -669,6 +693,20 @@ export default function ContextMenus() {
                                 } as unknown as Action);
                             }
                         }
+
+                        if (user._id !== userId) {
+                            generateAction(
+                                {
+                                    action: "report",
+                                    target: user,
+                                    messageId: contextualMessage,
+                                },
+                                "report_user",
+                                undefined,
+                                undefined,
+                                "var(--error)",
+                            );
+                        }
                     }
 
                     if (contextualChannel) {
@@ -795,14 +833,33 @@ export default function ContextMenus() {
                             });
                         }
 
+                        if (message.author_id !== userId) {
+                            generateAction(
+                                {
+                                    action: "report",
+                                    target: message,
+                                },
+                                "report_message",
+                                undefined,
+                                undefined,
+                                "var(--error)",
+                            );
+                        }
+
                         if (
                             message.author_id === userId ||
                             channelPermissions & Permission.ManageMessages
                         ) {
-                            generateAction({
-                                action: "delete_message",
-                                target: message,
-                            });
+                            generateAction(
+                                {
+                                    action: "delete_message",
+                                    target: message,
+                                },
+                                undefined,
+                                undefined,
+                                undefined,
+                                "var(--error)",
+                            );
                         }
 
                         if (
@@ -1035,6 +1092,17 @@ export default function ContextMenus() {
                                     "var(--error)",
                                 );
                             } else {
+                                generateAction(
+                                    {
+                                        action: "report",
+                                        target: server,
+                                    },
+                                    "report_server",
+                                    undefined,
+                                    undefined,
+                                    "var(--error)",
+                                );
+
                                 generateAction(
                                     { action: "leave_server", target: server },
                                     "leave_server",
@@ -1053,6 +1121,37 @@ export default function ContextMenus() {
                         }
 
                         if (!hideIDButton) {
+                            if (state.experiments.isEnabled("admin_beta")) {
+                                generateAction(
+                                    {
+                                        action: "admin",
+                                        id,
+                                        type: cid
+                                            ? "channel"
+                                            : message
+                                            ? "message"
+                                            : "user",
+                                    },
+                                    "admin",
+                                );
+
+                                switch (message?.system?.type) {
+                                    case "user_added":
+                                    case "user_remove":
+                                    case "user_joined":
+                                    case "user_left":
+                                    case "user_kicked":
+                                    case "user_banned":
+                                        generateAction(
+                                            {
+                                                action: "admin_system",
+                                                id: message.system.id,
+                                            },
+                                            "admin_system",
+                                        );
+                                }
+                            }
+
                             generateAction(
                                 { action: "copy_id", id },
                                 cid
@@ -1088,7 +1187,21 @@ export default function ContextMenus() {
                                             content={
                                                 <Text id="app.special.copy_username" />
                                             }>
-                                            @{user.username}
+                                            <Column gap="0">
+                                                <span>
+                                                    {user.display_name ??
+                                                        user.username}
+                                                </span>
+                                                <span
+                                                    style={{
+                                                        fontSize: "0.8em",
+                                                    }}>
+                                                    {user.username}
+                                                    {"#"}
+                                                    {user.discriminator ??
+                                                        "0000"}
+                                                </span>
+                                            </Column>
                                         </Tooltip>
                                     </div>
                                     <div

src/lib/links.ts

@@ -17,6 +17,7 @@ const ALLOWED_ORIGINS = [
     "app.revolt.chat",
     "nightly.revolt.chat",
     "local.revolt.chat",
+    "rolt.chat",
 ];
 
 /**

src/mobx/stores/Changelog.ts

@@ -1,6 +1,6 @@
 import { action, makeAutoObservable, runInAction } from "mobx";
 
-import { latestChangelog } from "../../assets/changelogs";
+import { changelogEntries, latestChangelog } from "../../assets/changelogs";
 import { modalController } from "../../controllers/modals/ModalController";
 import Persistent from "../interfaces/Persistent";
 import Store from "../interfaces/Store";
@@ -58,10 +58,21 @@ export default class Changelog implements Store, Persistent<Data>, Syncable {
      */
     checkForUpdates() {
         if (this.viewed < latestChangelog) {
-            modalController.push({
-                type: "changelog",
-                initial: latestChangelog,
-            });
+            const expires = new Date(+changelogEntries[latestChangelog].date);
+            expires.setDate(expires.getDate() + 7);
+
+            if (+new Date() < +expires) {
+                if (latestChangelog === 3) {
+                    modalController.push({
+                        type: "changelog_usernames",
+                    });
+                } else {
+                    modalController.push({
+                        type: "changelog",
+                        initial: latestChangelog,
+                    });
+                }
+            }
 
             runInAction(() => {
                 this.viewed = latestChangelog;

src/mobx/stores/Draft.ts

@@ -5,7 +5,7 @@ import { mapToRecord } from "../../lib/conversion";
 import Persistent from "../interfaces/Persistent";
 import Store from "../interfaces/Store";
 
-interface DraftObject {
+export interface DraftObject {
     content?: string;
     masquerade?: {
         avatar: string;
@@ -59,10 +59,12 @@ export default class Draft implements Store, Persistent<Data> {
      * @param channel Channel ID
      */
     @computed has(channel: string) {
-        return (
-            this.drafts.has(channel) &&
-            this.drafts.get(channel)!.content!.length > 0
-        );
+        if (!this.drafts.has(channel)) return false;
+        // fetch the draft object
+        const potentialDraft = this.drafts.get(channel)?.content;
+        // if it doesn't have any content return false
+        if (!potentialDraft) return false;
+        return potentialDraft.length > 0;
     }
 
     /**

src/mobx/stores/Experiments.ts

@@ -10,7 +10,7 @@ import Store from "../interfaces/Store";
 /**
  * Union type of available experiments.
  */
-export type Experiment = "dummy" | "offline_users" | "plugins" | "picker";
+export type Experiment = "dummy" | "offline_users" | "plugins" | "admin_beta";
 
 /**
  * Currently active experiments.
@@ -19,7 +19,7 @@ export const AVAILABLE_EXPERIMENTS: Experiment[] = [
     "dummy",
     "offline_users",
     "plugins",
-    "picker",
+    "admin_beta",
 ];
 
 /**
@@ -42,10 +42,10 @@ export const EXPERIMENTS: {
         description:
             "This will enable the experimental plugin API. Only touch this if you know what you're doing.",
     },
-    picker: {
-        title: "Custom Emoji",
+    admin_beta: {
+        title: "Admin Panel Shortcuts",
         description:
-            "This will enable a work-in-progress emoji picker, custom emoji settings and a reaction picker.",
+            "Adds context menu entries to quickly jump to Revolt Admin Panel. This is intended for use by the team.",
     },
 };
 

src/pages/RevoltApp.tsx

@@ -28,7 +28,7 @@ const AppContainer = styled.div`
     background-position: center center !important;
 `;
 
-const StatusBar = styled.div`
+export const StatusBar = styled.div`
     height: 40px;
     width: 100%;
     display: flex;

src/pages/channels/Channel.tsx

@@ -1,5 +1,6 @@
 import { Hash } from "@styled-icons/boxicons-regular";
 import { Ghost } from "@styled-icons/boxicons-solid";
+import dayjs from "dayjs";
 import { reaction } from "mobx";
 import { observer } from "mobx-react-lite";
 import { Redirect, useParams } from "react-router-dom";
@@ -163,6 +164,7 @@ const TextChannel = observer(({ channel }: { channel: ChannelI }) => {
 
         const checkUnread = () =>
             channel.unread &&
+            document.hasFocus() &&
             channel.client.unreads!.markRead(
                 channel._id,
                 channel.last_message_id!,
@@ -176,6 +178,46 @@ const TextChannel = observer(({ channel }: { channel: ChannelI }) => {
         );
     }, [channel]);
 
+    useEffect(() => {
+        let lastSubscribed: number | undefined;
+        function subscribe() {
+            if (document.hasFocus()) {
+                if (
+                    !lastSubscribed ||
+                    dayjs().subtract(10, "minutes").isAfter(lastSubscribed)
+                ) {
+                    lastSubscribed = +new Date();
+                    channel.server?.subscribe();
+                }
+            }
+        }
+
+        // Trigger logic every minute
+        const subTimer = setInterval(subscribe, 60e3);
+        subscribe();
+
+        function onFocus() {
+            // Mark channel as read if it's unread
+            if (channel.unread) {
+                channel.client.unreads!.markRead(
+                    channel._id,
+                    channel.last_message_id!,
+                    true,
+                );
+            }
+
+            // Subscribe to channel if expired
+            subscribe();
+        }
+
+        addEventListener("focus", onFocus);
+
+        return () => {
+            removeEventListener("focus", onFocus);
+            clearInterval(subTimer);
+        };
+    }, [channel]);
+
     return (
         <AgeGate
             type="channel"

src/pages/channels/voice/VoiceHeader.tsx

@@ -29,6 +29,7 @@ const VoiceBase = styled.div`
     margin-top: 48px;
     padding: 20px;
     background: var(--secondary-background);
+    flex-grow: 1;
 
     .status {
         flex: 1 0;
@@ -54,8 +55,6 @@ const VoiceBase = styled.div`
     display: flex;
     flex-direction: column;
 
-    overflow-y: scroll;
-
     .participants {
         margin: 40px 20px;
         justify-content: center;

src/pages/friends/Friend.tsx

@@ -136,7 +136,7 @@ export const Friend = observer(({ user }: Props) => {
             })}>
             <UserIcon target={user} size={36} status />
             <div className={styles.name}>
-                <span>{user.username}</span>
+                <span>{user.display_name ?? user.username}</span>
                 {subtext && <span className={styles.subtext}>{subtext}</span>}
             </div>
             <div className={styles.actions}>{actions}</div>

src/pages/home/Home.module.scss

@@ -34,7 +34,7 @@
 
             a {
                 width: 100%;
-
+                height: 6em;
                 div {
                     margin: 0;
                 }
@@ -54,3 +54,4 @@
 [data-light="true"] .home svg {
     filter: invert(100%);
 }
+

src/pages/home/Home.tsx

@@ -51,9 +51,9 @@ export default observer(() => {
         state.settings.set("appearance:seasonal", !seasonalTheme);
 
     const isDecember = !isTouchscreenDevice && new Date().getMonth() === 11;
-    const isOctober = !isTouchscreenDevice && new Date().getMonth() === 9
+    const isOctober = !isTouchscreenDevice && new Date().getMonth() === 9;
     const snowflakes = useMemo(() => {
-        const flakes = [];
+        const flakes: string[] = [];
 
         if (isDecember) {
             for (let i = 0; i < 15; i++) {
@@ -175,7 +175,7 @@ export default observer(() => {
                                 </CategoryButton>
                             </Link>
                             <a
-                                href="https://insrt.uk/donate"
+                                href="https://wiki.revolt.chat/notes/project/financial-support/"
                                 target="_blank"
                                 rel="noreferrer">
                                 <CategoryButton

src/pages/login/Login.tsx

@@ -1,17 +1,19 @@
 import { Twitter, Github, Mastodon } from "@styled-icons/boxicons-logos";
 import { observer } from "mobx-react-lite";
 import { Helmet } from "react-helmet";
-import { Route, Switch } from "react-router-dom";
+import { Link, Route, Switch } from "react-router-dom";
 
 import styles from "./Login.module.scss";
 import { Text } from "preact-i18n";
 
 import { useApplicationState } from "../../mobx/State";
 
-import LocaleSelector from "../../components/common/LocaleSelector";
 import wideSVG from "/assets/wide.svg";
 
+import LocaleSelector from "../../components/common/LocaleSelector";
 import { Titlebar } from "../../components/native/Titlebar";
+import { useSystemAlert } from "../../updateWorker";
+import { StatusBar } from "../RevoltApp";
 import { FormCreate } from "./forms/FormCreate";
 import { FormLogin } from "./forms/FormLogin";
 import { FormReset, FormSendReset } from "./forms/FormReset";
@@ -21,11 +23,31 @@ export default observer(() => {
     const state = useApplicationState();
     const theme = state.settings.theme;
 
+    const alert = useSystemAlert();
+
     return (
         <>
             {window.isNative && !window.native.getConfig().frame && (
                 <Titlebar overlay />
             )}
+            {alert && (
+                <StatusBar>
+                    <div className="title">{alert.text}</div>
+                    <div className="actions">
+                        {alert.actions?.map((action) =>
+                            action.type === "internal" ? null : action.type ===
+                              "external" ? (
+                                <a
+                                    href={action.href}
+                                    target="_blank"
+                                    rel="noreferrer">
+                                    <div className="button">{action.text}</div>{" "}
+                                </a>
+                            ) : null,
+                        )}
+                    </div>
+                </StatusBar>
+            )}
             <div className={styles.login}>
                 <Helmet>
                     <meta
@@ -77,17 +99,20 @@ export default observer(() => {
                             <div className={styles.socials}>
                                 <a
                                     href="https://github.com/revoltchat"
-                                    target="_blank" rel="noreferrer">
+                                    target="_blank"
+                                    rel="noreferrer">
                                     <Github size={24} />
                                 </a>
                                 <a
                                     href="https://twitter.com/revoltchat"
-                                    target="_blank" rel="noreferrer">
+                                    target="_blank"
+                                    rel="noreferrer">
                                     <Twitter size={24} />
                                 </a>
                                 <a
                                     href="https://mastodon.social/@revoltchat"
-                                    target="_blank" rel="noreferrer">
+                                    target="_blank"
+                                    rel="noreferrer">
                                     <Mastodon size={24} />
                                 </a>
                             </div>
@@ -116,7 +141,8 @@ export default observer(() => {
                         <a
                             className={styles.attribution}
                             href="https://unsplash.com/@fakurian"
-                            target="_blank" rel="noreferrer">
+                            target="_blank"
+                            rel="noreferrer">
                             <Text id="general.image_by" /> &lrm;@fakurian &rlm;·
                             unsplash.com
                         </a>

src/pages/login/forms/Form.tsx

@@ -202,11 +202,9 @@ export const Form = observer(({ page, callback }: Props) => {
                     />
                 )}
                 {error && (
-                    <Category>
-                        <I18nError error={error}>
-                            <Text id={`login.error.${page}`} />
-                        </I18nError>
-                    </Category>
+                    <p style={{ fontSize: "0.8em", color: "var(--error)" }}>
+                        <Text id={`error.${error}`} children={error} />
+                    </p>
                 )}
                 <Button>
                     <Text
@@ -259,7 +257,7 @@ export const Form = observer(({ page, callback }: Props) => {
                                 <span>
                                     <Text id="login.unofficial_instance" />{" "}
                                     <a
-                                        href="https://developers.revolt.chat/faq/instances#what-is-a-third-party-instance"
+                                        href="https://developers.revolt.chat/faq.html"
                                         style={{ color: "var(--accent)" }}
                                         target="_blank"
                                         rel="noreferrer">

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>
     );
 }

src/pages/settings/ServerSettings.tsx

@@ -79,7 +79,6 @@ export default observer(() => {
                     id: "emojis",
                     icon: <HappyBeaming size={20} />,
                     title: <Text id="app.settings.server_pages.emojis.title" />,
-                    hidden: !state.experiments.isEnabled("picker"),
                 },
                 {
                     category: (

src/pages/settings/Settings.tsx

@@ -80,10 +80,15 @@ const AccountHeader = styled.div`
             font-size: 12px;
             gap: 2px;
 
-            > span {
+            .new {
                 font-size: 20px;
                 font-weight: 600;
             }
+
+            .full {
+                font-size: 14px;
+                font-weight: 600;
+            }
         }
     }
 
@@ -276,7 +281,7 @@ export default observer(() => {
                         </ButtonItem>
                     </a>
                     <a
-                        href="https://insrt.uk/donate"
+                        href="https://wiki.revolt.chat/notes/project/financial-support/"
                         target="_blank"
                         rel="noreferrer">
                         <ButtonItem className={styles.donate} compact>
@@ -336,7 +341,15 @@ export default observer(() => {
                             onClick={() => openContextMenu("Status")}
                         />
                         <div className="details">
-                            <Username user={client.user!} prefixAt />
+                            <span className="new">
+                                {client.user.display_name ??
+                                    client.user.username}
+                            </span>
+                            <span className="full">
+                                {client.user.username}
+                                {"#"}
+                                {client.user.discriminator}
+                            </span>
                             <UserStatus user={client.user!} />
                         </div>
                     </div>

src/pages/settings/panes/Audio.tsx

@@ -94,6 +94,33 @@ export function Audio() {
     return (
         <>
             <div className={styles.audio}>
+                <Tip palette="warning">
+                    <span>
+                        We are currently{" "}
+                        <a
+                            style={{ color: "inherit", fontWeight: "600" }}
+                            href="https://github.com/revoltchat/frontend/issues/14"
+                            target="_blank"
+                            rel="noreferrer">
+                            rebuilding the client
+                        </a>{" "}
+                        and{" "}
+                        <a
+                            style={{ color: "inherit", fontWeight: "600" }}
+                            href="https://trello.com/c/Ay6KdiOV/1-voice-overhaul-and-video-calling"
+                            target="_blank"
+                            rel="noreferrer">
+                            the voice server
+                        </a>{" "}
+                        from scratch.
+                        <br />
+                        <br />
+                        The old voice should work in most cases, but it may
+                        inexplicably not connect in some scenarios and / or
+                        exhibit weird behaviour.
+                    </span>
+                </Tip>
+
                 {!permission && (
                     <Tip palette="error">
                         <Text id="app.settings.pages.audio.tip_grant_permission" />

src/pages/settings/panes/Feedback.tsx

@@ -5,60 +5,76 @@ import { Link } from "react-router-dom";
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 
-import { CategoryButton } from "@revoltchat/ui";
+import { CategoryButton, Column, Tip } from "@revoltchat/ui";
 
 export function Feedback() {
     return (
-        <div className={styles.feedback}>
-            <a
-                href="https://github.com/revoltchat/revolt/discussions"
-                target="_blank"
-                rel="noreferrer">
-                <CategoryButton
-                    action="external"
-                    icon={<Github size={24} />}
-                    description={
-                        <Text id="app.settings.pages.feedback.suggest_desc" />
-                    }>
-                    <Text id="app.settings.pages.feedback.suggest" />
-                </CategoryButton>
-            </a>
-            <a
-                href="https://github.com/revoltchat/revite/issues/new/choose"
-                target="_blank"
-                rel="noreferrer">
-                <CategoryButton
-                    action="external"
-                    icon={<ListOl size={24} />}
-                    description={
-                        <Text id="app.settings.pages.feedback.issue_desc" />
-                    }>
-                    <Text id="app.settings.pages.feedback.issue" />
-                </CategoryButton>
-            </a>
-            <a
-                href="https://github.com/orgs/revoltchat/projects/3"
-                target="_blank"
-                rel="noreferrer">
-                <CategoryButton
-                    action="external"
-                    icon={<BugAlt size={24} />}
-                    description={
-                        <Text id="app.settings.pages.feedback.bug_desc" />
-                    }>
-                    <Text id="app.settings.pages.feedback.bug" />
-                </CategoryButton>
-            </a>
-            <Link to="/invite/Testers">
-                <a>
+        <Column>
+            <Tip palette="warning">
+                <span>
+                    We are currently rebuilding the client from scratch. You can{" "}
+                    <a
+                        style={{ color: "inherit", fontWeight: "600" }}
+                        href="https://github.com/revoltchat/frontend/issues/14"
+                        target="_blank"
+                        rel="noreferrer">
+                        view our progress here
+                    </a>
+                    ; in the meantime, we are only accepting and fixing critical
+                    bugs with the current client.
+                </span>
+            </Tip>
+            <div className={styles.feedback}>
+                <a
+                    href="https://github.com/revoltchat/revolt/discussions"
+                    target="_blank"
+                    rel="noreferrer">
                     <CategoryButton
-                        action="chevron"
-                        icon={<Group size={24} />}
-                        description="You can report issues and discuss improvements with us directly here.">
-                        {"Join the Revolt Lounge"}
+                        action="external"
+                        icon={<Github size={24} />}
+                        description={
+                            <Text id="app.settings.pages.feedback.suggest_desc" />
+                        }>
+                        <Text id="app.settings.pages.feedback.suggest" />
                     </CategoryButton>
                 </a>
-            </Link>
-        </div>
+                <a
+                    href="https://github.com/revoltchat/revite/issues/new/choose"
+                    target="_blank"
+                    rel="noreferrer">
+                    <CategoryButton
+                        action="external"
+                        icon={<ListOl size={24} />}
+                        description={
+                            <Text id="app.settings.pages.feedback.issue_desc" />
+                        }>
+                        <Text id="app.settings.pages.feedback.issue" />
+                    </CategoryButton>
+                </a>
+                <a
+                    href="https://github.com/orgs/revoltchat/projects/3"
+                    target="_blank"
+                    rel="noreferrer">
+                    <CategoryButton
+                        action="external"
+                        icon={<BugAlt size={24} />}
+                        description={
+                            <Text id="app.settings.pages.feedback.bug_desc" />
+                        }>
+                        <Text id="app.settings.pages.feedback.bug" />
+                    </CategoryButton>
+                </a>
+                <Link to="/invite/Testers">
+                    <a>
+                        <CategoryButton
+                            action="chevron"
+                            icon={<Group size={24} />}
+                            description="You can report issues and discuss improvements with us directly here.">
+                            {"Join the Revolt Lounge"}
+                        </CategoryButton>
+                    </a>
+                </Link>
+            </div>
+        </Column>
     );
 }

src/pages/settings/panes/MyBots.tsx

@@ -35,6 +35,7 @@ import { modalController } from "../../../controllers/modals/ModalController";
 
 interface Data {
     _id: string;
+    token: string;
     username: string;
     public: boolean;
     interactions_url?: string;
@@ -74,6 +75,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
     const [user, setUser] = useState<User>(client.users.get(bot._id)!);
     const [data, setData] = useState<Data>({
         _id: bot._id,
+        token: bot.token,
         username: user.username,
         public: bot.public,
         interactions_url: bot.interactions_url as any,
@@ -94,7 +96,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
     const refreshProfile = useCallback(() => {
         client.api
             .get(`/users/${bot._id as ""}/profile`, undefined, {
-                headers: { "x-bot-token": bot.token },
+                headers: { "x-bot-token": data.token },
             })
             .then((profile) => setProfile(profile ?? {}));
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -149,7 +151,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
             "/users/@me",
             avatar ? { avatar } : { remove: ["Avatar"] },
             {
-                headers: { "x-bot-token": bot.token },
+                headers: { "x-bot-token": data.token },
             },
         );
 
@@ -168,7 +170,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
                 ? { profile: { background } }
                 : { remove: ["ProfileBackground"] },
             {
-                headers: { "x-bot-token": bot.token },
+                headers: { "x-bot-token": data.token },
             },
         );
 
@@ -184,7 +186,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
             "/users/@me",
             content ? { profile: { content } } : { remove: ["ProfileContent"] },
             {
-                headers: { "x-bot-token": bot.token },
+                headers: { "x-bot-token": data.token },
             },
         );
 
@@ -312,6 +314,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
                         if (editMode) {
                             setData({
                                 _id: bot._id,
+                                token: data.token,
                                 username: user!.username,
                                 public: bot.public,
                                 interactions_url: bot.interactions_url as any,
@@ -334,7 +337,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
                 <CategoryButton
                     account
                     icon={<Key size={24} />}
-                    onClick={() => modalController.writeText(bot.token)}
+                    onClick={() => modalController.writeText(data.token)}
                     description={
                         <>
                             {"••••• "}
@@ -344,7 +347,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
                                         ev,
                                         modalController.push({
                                             type: "show_token",
-                                            token: bot.token,
+                                            token: data.token,
                                             name: user!.username,
                                         }),
                                     )
@@ -490,6 +493,25 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
                             }>
                             <Text id="app.settings.pages.bots.add" />
                         </Button>
+                        <Button
+                        palette="error"
+                            onClick={ async () => {
+                                    modalController.push({
+                                        type: "reset_bot_token",
+                                        target: { name: user.username, id: bot._id },
+                                        callback: async () => {
+                                            const updatedBot = await client.bots.fetch(bot._id);
+                                            setData({
+                                                ...data,
+                                                token: updatedBot.bot.token
+                                            })
+                                        }
+                                    })
+
+                            }
+                            }>
+                                <Text id="app.settings.pages.bots.reset_token" />
+                        </Button>
                     </>
                 )}
             </div>

src/pages/settings/panes/Native.tsx

@@ -66,7 +66,7 @@ export function Native() {
                 title="Enable Discord status"
                 description="Rep Revolt on your Discord status."
             />
-            <Checkbox
+            {/* <Checkbox
                 value={config.build === "nightly"}
                 onChange={(nightly) => {
                     const build = nightly ? "nightly" : "stable";
@@ -79,7 +79,7 @@ export function Native() {
                 }}
                 title="Revolt Nightly"
                 description="Use the beta branch of Revolt."
-            />
+            /> */}
 
             <h3>Titlebar</h3>
             <Checkbox
@@ -144,7 +144,7 @@ export function Native() {
                 </Button>
             </p>
             <h3 style={{ marginTop: "4em" }}>Local Development Mode</h3>
-            {config.build === "dev" ? (
+            {/*config.build === "dev" ? (
                 <>
                     <h5>Development mode is currently on.</h5>
                     <Button
@@ -197,7 +197,7 @@ export function Native() {
                         </Button>
                     </p>
                 </>
-            )}
+            )*/}
             <hr />
             <CategoryButton
                 icon={<img src={RLogo} draggable={false} />}

src/pages/settings/panes/Panes.module.scss

@@ -694,3 +694,23 @@
 section {
     margin-bottom: 20px;
 }
+
+.titleNew {
+    display: flex;
+    margin: 15px 0;
+    gap: 8px;
+    align-items: center;
+
+    font-size: 0.8125rem;
+    font-weight: 700;
+    text-transform: uppercase;
+    color: var(--secondary-foreground);
+
+    .new {
+        font-size: 10px;
+        background: var(--accent);
+        padding: 3px 5px;
+        border-radius: 20px;
+        color: white;
+    }
+}

src/pages/settings/panes/Profile.tsx

@@ -1,4 +1,5 @@
 import { Markdown } from "@styled-icons/boxicons-logos";
+import { UserCircle } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
 import { API } from "revolt.js";
@@ -7,7 +8,7 @@ import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 import { useCallback, useContext, useEffect, useState } from "preact/hooks";
 
-import { Button, LineDivider, Tip } from "@revoltchat/ui";
+import { Button, LineDivider, Tip, CategoryButton } from "@revoltchat/ui";
 
 import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
 import { useTranslation } from "../../../lib/i18n";
@@ -17,6 +18,7 @@ import AutoComplete, {
 } from "../../../components/common/AutoComplete";
 import { useSession } from "../../../controllers/client/ClientController";
 import { FileUploader } from "../../../controllers/client/jsx/legacy/FileUploads";
+import { modalController } from "../../../controllers/modals/ModalController";
 import { UserProfile } from "../../../controllers/modals/components/legacy/UserProfile";
 
 export const Profile = observer(() => {
@@ -77,6 +79,19 @@ export const Profile = observer(() => {
                     {...({} as any)}
                 />
             </div>
+            <div className={styles.titleNew}>
+                Display Name
+                <div className={styles.new}>NEW</div>
+            </div>
+            <CategoryButton
+                onClick={() =>
+                    modalController.push({ type: "modify_displayname" })
+                }
+                icon={<UserCircle size={24} />}
+                action="chevron"
+                description={"Change your display name to whatever you like"}>
+                Display Name
+            </CategoryButton>
             {/*<h3>Badges</h3>
             <div className={styles.badgePicker}>
                 <div className={styles.overlay} />

src/pages/settings/panes/Sessions.tsx

@@ -38,7 +38,9 @@ dayjs.extend(relativeTime);
 export function Sessions() {
     const client = useClient();
     const deviceId =
-        typeof client.session === "object" ? client.session._id : undefined;
+        typeof client.session === "object"
+            ? (client.session as unknown as { _id: string })._id
+            : undefined;
 
     const [sessions, setSessions] = useState<API.SessionInfo[] | undefined>(
         undefined,

src/pages/settings/server/Categories.tsx

@@ -340,11 +340,13 @@ function ListElement({
 
     const save = useCallback(() => {
         setEditing(undefined);
-        setTitle!(editing!);
+        if (editing !== "") {
+            setTitle!(editing!);
+        }
     }, [editing, setTitle]);
 
     useEffect(() => {
-        if (!editing) return;
+        if (editing === undefined) return;
 
         function onClick(ev: MouseEvent) {
             if ((ev.target as HTMLElement)?.id !== category.id) {
@@ -367,8 +369,10 @@ function ListElement({
                     <KanbanList last={false} key={category.id}>
                         <div className="inner">
                             <Row>
-                                <KanbanListHeader {...provided.dragHandleProps}>
-                                    {editing ? (
+                                <KanbanListHeader 
+                                    {...provided.dragHandleProps}
+                                    onClick={startEditing}>
+                                    {editing !== undefined ? (
                                         <input
                                             value={editing}
                                             onChange={(e) =>
@@ -382,7 +386,7 @@ function ListElement({
                                             id={category.id}
                                         />
                                     ) : (
-                                        <span onClick={startEditing}>
+                                        <span>
                                             {category.title}
                                         </span>
                                     )}

src/pages/settings/server/Emojis.tsx

@@ -4,7 +4,7 @@ import styled from "styled-components";
 
 import { Text } from "preact-i18n";
 
-import { Button, Column, Row, Stacked } from "@revoltchat/ui";
+import { Button, Column, Row, Stacked, Tip } from "@revoltchat/ui";
 
 import UserShort from "../../../components/common/user/UserShort";
 import { EmojiUploader } from "../../../components/settings/customisation/EmojiUploader";
@@ -33,6 +33,22 @@ export const Emojis = observer(({ server }: Props) => {
 
     return (
         <Column>
+            <Tip palette="warning">
+                <span>
+                    This UI was never finished and will be polished in the{" "}
+                    <a
+                        style={{ color: "inherit", fontWeight: "600" }}
+                        href="https://github.com/revoltchat/frontend/issues/14"
+                        target="_blank"
+                        rel="noreferrer">
+                        new client
+                    </a>
+                    .<br />
+                    <br />
+                    Also please note that emoji names must be lowercase
+                    alphanumeric!
+                </span>
+            </Tip>
             {server.havePermission("ManageCustomisation") && (
                 <EmojiUploader server={server} />
             )}

src/pages/settings/server/Members.tsx

@@ -103,10 +103,43 @@ export const Members = ({ server }: Props) => {
     const [query, setQuery] = useState("");
 
     useEffect(() => {
-        server
-            .fetchMembers()
-            .then((data) => data.members)
-            .then(setData);
+        function fetch() {
+            server
+                .fetchMembers()
+                .then((data) => data.members)
+                .then(setData);
+        }
+
+        fetch();
+
+        // Members may be invalidated if we stop receiving events
+        // This is not very accurate, this should be tracked within
+        // revolt.js so we know the true validity.
+        let valid = true,
+            invalidationTimer: number;
+
+        function waitToInvalidate() {
+            invalidationTimer = setTimeout(() => {
+                valid = false;
+            }, 15 * 60e3) as never; // 15 minutes
+        }
+
+        function cancelInvalidation() {
+            if (!valid) {
+                fetch();
+                valid = true;
+            }
+
+            clearTimeout(invalidationTimer);
+        }
+
+        addEventListener("blur", waitToInvalidate);
+        addEventListener("focus", cancelInvalidation);
+
+        return () => {
+            removeEventListener("blur", waitToInvalidate);
+            removeEventListener("focus", cancelInvalidation);
+        };
     }, [server, setData]);
 
     const members = useMemo(

src/pages/settings/server/Roles.tsx

@@ -70,6 +70,10 @@ export const Roles = observer(({ server }: Props) => {
         }
     `;
 
+    const DeleteRoleButton = styled(Button)`
+        margin: 16px 0;
+    `;
+
     return (
         <PermissionsLayout
             server={server}
@@ -266,12 +270,12 @@ export const Roles = observer(({ server }: Props) => {
                                 <h1>
                                     <Text id="app.settings.categories.danger_zone" />
                                 </h1>
-                                <Button
+                                <DeleteRoleButton
                                     palette="error"
                                     compact
                                     onClick={deleteRole}>
                                     <Text id="app.settings.permissions.delete_role" />
-                                </Button>
+                                </DeleteRoleButton>
                             </>
                         )}
                     </div>

src/updateWorker.ts

@@ -78,7 +78,7 @@ export function useSystemAlert() {
  */
 async function checkVersion() {
     const { version, poll_rate, alert } = (await fetch(
-        "https://api.revolt.chat/release",
+        "https://health.revolt.chat/api/health",
     ).then((res) => res.json())) as {
         version: string;
         poll_rate?: number;
@@ -111,7 +111,10 @@ async function checkVersion() {
     }
 }
 
-if (import.meta.env.VITE_API_URL === "https://api.revolt.chat") {
+if (
+    import.meta.env.VITE_API_URL === "https://api.revolt.chat" ||
+    import.meta.env.VITE_API_URL === "https://app.revolt.chat/api"
+) {
     // Check for critical updates hourly
     schedule();
     checkVersion();

tsconfig.json

@@ -14,6 +14,7 @@
         "isolatedModules": true,
         "noEmit": true,
         "jsx": "preserve",
+        "jsxImportSource": "preact",
         "jsxFactory": "h",
         "jsxFragmentFactory": "Fragment",
         "types": ["vite-plugin-pwa/client"],

yarn.lock

@@ -2299,6 +2299,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@revoltchat/rehype-katex@npm:6.0.3-patch.1":
+  version: 6.0.3-patch.1
+  resolution: "@revoltchat/rehype-katex@npm:6.0.3-patch.1"
+  dependencies:
+    "@types/hast": ^2.0.0
+    "@types/katex": ^0.14.0
+    hast-util-from-html-isomorphic: ^1.0.0
+    hast-util-to-text: ^3.1.0
+    katex: ^0.16.7
+    unist-util-visit: ^4.0.0
+  checksum: 1b7e57ddafa300e96396a5f5d64dad947c201b514562b1d581ac1a683252bc074fcb620fb271c136dd8b84c069dad23cd98ef0b01585be426bb2ce3f5dde004f
+  languageName: node
+  linkType: hard
+
 "@revoltchat/ui@portal:external/components::locator=client%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@revoltchat/ui@portal:external/components::locator=client%40workspace%3A."
@@ -2627,6 +2641,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/katex@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "@types/katex@npm:0.14.0"
+  checksum: 330e0d0337ba48c87f5b793965fbad673653789bf6e50dfe8d726a7b0cbefd37195055e31503aae629814aa79447e4f23a4b87ad1ac565c0d9a9d9978836f39b
+  languageName: node
+  linkType: hard
+
 "@types/lodash.defaultsdeep@npm:^4.6.6":
   version: 4.6.6
   resolution: "@types/lodash.defaultsdeep@npm:4.6.6"
@@ -3688,6 +3709,7 @@ __metadata:
     "@hcaptcha/react-hcaptcha": ^1.4.4
     "@insertish/vite-plugin-babel-macros": ^1.0.5
     "@preact/preset-vite": ^2.0.0
+    "@revoltchat/rehype-katex": 6.0.3-patch.1
     "@revoltchat/ui": ^1.0.77
     "@rollup/plugin-replace": ^2.4.2
     "@styled-icons/boxicons-logos": ^10.38.0
@@ -3732,6 +3754,7 @@ __metadata:
     lodash.defaultsdeep: ^4.6.1
     lodash.isequal: ^4.5.0
     long: ^5.2.0
+    lottie-react: ^2.4.0
     mdast-util-to-hast: ^12.1.2
     mediasoup-client: "npm:@insertish/mediasoup-client@3.6.36-esnext"
     mobx: ^6.6.0
@@ -3750,7 +3773,6 @@ __metadata:
     react-router-dom: ^5.2.0
     react-scroll: ^1.8.2
     react-virtuoso: ^2.12.0
-    rehype-katex: ^6.0.2
     rehype-prism: ^2.1.3
     rehype-react: ^7.1.1
     remark-breaks: ^3.0.2
@@ -3875,7 +3897,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^8.0.0":
+"commander@npm:^8.0.0, commander@npm:^8.3.0":
   version: 8.3.0
   resolution: "commander@npm:8.3.0"
   checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
@@ -4232,6 +4254,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -5324,6 +5353,41 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hast-util-from-dom@npm:^4.0.0":
+  version: 4.2.0
+  resolution: "hast-util-from-dom@npm:4.2.0"
+  dependencies:
+    hastscript: ^7.0.0
+    web-namespaces: ^2.0.0
+  checksum: 0eac72cfb2bad20cf70ad978332be8c746dba27576fea3c3b123d7d1a52a8e10a88a25622b60f45255994163845e3f784fcd7c013b1301f2df4b81e3d0b1b973
+  languageName: node
+  linkType: hard
+
+"hast-util-from-html-isomorphic@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "hast-util-from-html-isomorphic@npm:1.0.0"
+  dependencies:
+    "@types/hast": ^2.0.0
+    hast-util-from-dom: ^4.0.0
+    hast-util-from-html: ^1.0.0
+    unist-util-remove-position: ^4.0.0
+  checksum: a72786d6757a1a38d76cf74ba86fecfaf0690d465dcae477bfa7199ec03d364ba964f658331406ee7e62e912186df6d4ff38fc3ad050e0e3d8bc33a653df060d
+  languageName: node
+  linkType: hard
+
+"hast-util-from-html@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "hast-util-from-html@npm:1.0.2"
+  dependencies:
+    "@types/hast": ^2.0.0
+    hast-util-from-parse5: ^7.0.0
+    parse5: ^7.0.0
+    vfile: ^5.0.0
+    vfile-message: ^3.0.0
+  checksum: 81cbda7dfa4c02fcb4e4359a48e25ebee7bef133dc607c2c036c53df27efacdfa22313a86398391ef22b31decda98c7110f1b441c5a48f419514be6b5d4b5603
+  languageName: node
+  linkType: hard
+
 "hast-util-from-parse5@npm:^7.0.0":
   version: 7.1.0
   resolution: "hast-util-from-parse5@npm:7.1.0"
@@ -5341,12 +5405,12 @@ __metadata:
   linkType: hard
 
 "hast-util-is-element@npm:^2.0.0":
-  version: 2.1.2
-  resolution: "hast-util-is-element@npm:2.1.2"
+  version: 2.1.3
+  resolution: "hast-util-is-element@npm:2.1.3"
   dependencies:
     "@types/hast": ^2.0.0
     "@types/unist": ^2.0.0
-  checksum: c5fe9f7cde3775d4cbe19a9a55631a80b7a4ea0131fc2e3d097ebe228a35f09b9219f64b788b7a9cf819e6dcb6d1fc7830fd2f10ad536649e436e8c83da41e00
+  checksum: 9d988f6839a50566a895a3dd19222e6ab1591243f6a3c36bba835b7e9339a2845f1ff1c583425afd602de1a57a76c5bae8a6dc0ab1d6e5d1e252b422cdeadbb7
   languageName: node
   linkType: hard
 
@@ -5360,13 +5424,14 @@ __metadata:
   linkType: hard
 
 "hast-util-to-text@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "hast-util-to-text@npm:3.1.1"
+  version: 3.1.2
+  resolution: "hast-util-to-text@npm:3.1.2"
   dependencies:
     "@types/hast": ^2.0.0
+    "@types/unist": ^2.0.0
     hast-util-is-element: ^2.0.0
     unist-util-find-after: ^4.0.0
-  checksum: 2312a818c8ec7b02307b04175357e5a7a9918f48624d05366668ba60918734ca62b0ee21006a2a448e0e5a198654cd1fa4ba8c813702b465cb487e2320db523a
+  checksum: d17cf3344c1d584ddd811cbb78d25b6c9819e62c8edb9643b53be38083fd978a6fa9a5bf6e6cd7b5ea48d30d9edc2859acae40b8bb89e166bebcda6017d4703d
   languageName: node
   linkType: hard
 
@@ -6004,14 +6069,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"katex@npm:^0.15.0":
-  version: 0.15.6
-  resolution: "katex@npm:0.15.6"
+"katex@npm:^0.16.7":
+  version: 0.16.7
+  resolution: "katex@npm:0.16.7"
   dependencies:
-    commander: ^8.0.0
+    commander: ^8.3.0
   bin:
     katex: cli.js
-  checksum: 2da808bbd1d3be27715006cd86767dd3fcce3e317fb3bbd64d407328d2d90de17b5d83062b2cfd0e0d0de32e340efbac214862bc96892a5d1492462e553728d4
+  checksum: 6c3f61e28820ecba074a149d17be6d731d8a950cdd7826851e16f2b0f3627c4119acd8c6e4fb86950063c4e99a6e478720ea6cca3dc82e59bbca81001ee00b70
   languageName: node
   linkType: hard
 
@@ -6205,6 +6270,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lottie-react@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "lottie-react@npm:2.4.0"
+  dependencies:
+    lottie-web: ^5.10.2
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: e9ea4a89be90a29bde4a83956f76a80d1f8031882f18ea38ef5271d2aafd8e68348ae6297f185ed85b149ca4896fe33aee7faf9780b88a1b289b8e146f477448
+  languageName: node
+  linkType: hard
+
+"lottie-web@npm:^5.10.2":
+  version: 5.12.0
+  resolution: "lottie-web@npm:5.12.0"
+  checksum: 77c35be880e484d1a766f21f789ede7c7be59e957579580a18c2dfec08c4812c03e1d652e453166c31fd80556446d6b857fb490d901e34154105532519bc5ef5
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^6.0.0":
   version: 6.0.0
   resolution: "lru-cache@npm:6.0.0"
@@ -7268,6 +7352,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5@npm:^7.0.0":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
+  dependencies:
+    entities: ^4.4.0
+  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
+  languageName: node
+  linkType: hard
+
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
@@ -7794,23 +7887,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rehype-katex@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "rehype-katex@npm:6.0.2"
-  dependencies:
-    "@types/hast": ^2.0.0
-    "@types/katex": ^0.11.0
-    hast-util-to-text: ^3.1.0
-    katex: ^0.15.0
-    rehype-parse: ^8.0.0
-    unified: ^10.0.0
-    unist-util-remove-position: ^4.0.0
-    unist-util-visit: ^4.0.0
-  checksum: ac8b3486441697b8e22cb7ebf6ec58e06d190240f45b128fe60422b9eb887599f38406581e6e3356af967eb1d45d631b0c09387f060190641f402f56c78fa771
-  languageName: node
-  linkType: hard
-
-"rehype-parse@npm:^7 || ^ 8, rehype-parse@npm:^8.0.0":
+"rehype-parse@npm:^7 || ^ 8":
   version: 8.0.4
   resolution: "rehype-parse@npm:8.0.4"
   dependencies:
@@ -8016,14 +8093,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"revolt-api@npm:0.5.5-4":
-  version: 0.5.5-4
-  resolution: "revolt-api@npm:0.5.5-4"
+"revolt-api@npm:0.6.0":
+  version: 0.6.0
+  resolution: "revolt-api@npm:0.6.0"
   dependencies:
     "@insertish/oapi": 0.1.18
     axios: ^0.26.1
     lodash.defaultsdeep: ^4.6.1
-  checksum: dfb374d58f1b8b5a6de2e7fa05e386b3df3ffb85a450a6894f23c6b9760af8bff0d198d8352063c33084f0dbc6ff84a234300efb0c62c7b27f709887402787f1
+  checksum: 94865aa1aee5b05682ffe4e40a0fe431809f879437399943fc429d078160a5fe24686011b43639d6fae88e9a7a43fbe4bb9beb9bbe1bb3070965636f0ec051fd
   languageName: node
   linkType: hard
 
@@ -8040,7 +8117,7 @@ __metadata:
     lodash.isequal: ^4.5.0
     long: ^5.2.0
     mobx: ^6.3.2
-    revolt-api: 0.5.5-4
+    revolt-api: 0.6.0
     ulid: ^2.3.0
     ws: ^8.2.2
   languageName: node
@@ -9120,12 +9197,12 @@ __metadata:
   linkType: hard
 
 "unist-util-find-after@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "unist-util-find-after@npm:4.0.0"
+  version: 4.0.1
+  resolution: "unist-util-find-after@npm:4.0.1"
   dependencies:
     "@types/unist": ^2.0.0
     unist-util-is: ^5.0.0
-  checksum: 8381ef0bad18a0b1fa1c7ee47f94a2578ab6bf572eb126a1f179526b9dca47584fc070976f2d83bbe381161fa33b9164a894d0279a30ec83e65433356d43df57
+  checksum: bed7e7a1a87539bea0b33ddc9ce8e2f3fdd4a7c87e143a848ed5bbb4cf9c563ade7ecf80b3ee5a38f9ad9e6af29cdb8cdde9001eea92542cbb14784f5add7019
   languageName: node
   linkType: hard
 
@@ -9160,12 +9237,12 @@ __metadata:
   linkType: hard
 
 "unist-util-remove-position@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "unist-util-remove-position@npm:4.0.1"
+  version: 4.0.2
+  resolution: "unist-util-remove-position@npm:4.0.2"
   dependencies:
     "@types/unist": ^2.0.0
     unist-util-visit: ^4.0.0
-  checksum: 7d2808662ac65f2b2f615822b78060419f738fb3b074b10cec77c596ea966b8f5c47553d2d322822a5975c49d2b21cdd64c198ae9fb02a9d54d1afa6342cdd6a
+  checksum: 989831da913d09a82a99ed9b47b78471b6409bde95942cde47e09da54b7736516f17e3c7e026af468684c1efcec5fb52df363381b2f9dc7fd96ce791c5a2fa4a
   languageName: node
   linkType: hard