merge: pull request #1143 from Asraye/fix/member-sidebar

merge: pull request #1109 from Docteh/smaller3
merge: pull request #1141 from Asraye/fixemoji-pack
2026-03-07 09:25:27 +00:00 · 2025-09-07 13:09:46 +01:00 · 2025-09-07 13:06:39 +01:00 · 2025-09-07 13:05:41 +01:00 · 2025-09-07 13:04:47 +01:00 · 2025-09-07 13:04:05 +01:00
48 changed files with 1102 additions and 510 deletions
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # VITE_API_URL=https://api.revolt.chat
-VITE_API_URL=https://app.revolt.chat/api
+# VITE_API_URL=https://app.revolt.chat/api
 # VITE_API_URL=http://local.revolt.chat:8000
-# VITE_API_URL=https://revolt.chat/api
+VITE_API_URL=https://app.revolt.chat/api
 VITE_THEMES_URL=https://themes.revolt.chat
--- a/.github/pull_request_template.md
+++ b/.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)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,82 +30,44 @@ 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
+              uses: docker/metadata-action@v5
              with:
                  images: revoltchat/client, ghcr.io/revoltchat/client
+              env:
+                  DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
            - 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
-                  platforms: linux/amd64
+                  push: ${{ github.event_name != 'pull_request' }}
+                  platforms: linux/amd64,linux/arm64
                  tags: ${{ steps.meta.outputs.tags }}
+                  annotations: ${{ steps.meta.outputs.annotations }}
                  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
--- a/.github/workflows/mirroring.yml
+++ b/.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 }}
--- a/.github/workflows/triage_pr.yml
+++ b/.github/workflows/triage_pr.yml
@@ -15,7 +15,7 @@ jobs:
          gh api graphql -f query='
            query {
              organization(login: "revoltchat"){
-                projectV2(number: 3) {
+                projectV2(number: 5) {
                  id
                  fields(first:20) {
                    nodes {
@@ -35,7 +35,7 @@ jobs:

          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=="Incoming PRs") |.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:
--- a/9
+++ b/9
@@ -1,4 +1,5 @@
-FROM node:16-buster AS builder
+# syntax=docker.io/docker/dockerfile:1.7-labs
+FROM --platform=$BUILDPLATFORM node:16-buster AS builder

 WORKDIR /usr/src/app
 COPY . .
@@ -10,9 +11,11 @@ RUN yarn build:deps
 RUN yarn build:highmem
 RUN yarn workspaces focus --production --all

-FROM node:16-alpine
+FROM node:24-alpine
 WORKDIR /usr/src/app
-COPY --from=builder /usr/src/app .
+COPY docker/package.json docker/yarn.lock .
+RUN yarn install --frozen-lockfile
+COPY --from=builder --exclude=package.json --exclude=yarn.lock --exclude=.yarn* --exclude=.git --exclude=external --exclude=node_modules /usr/src/app .

 EXPOSE 5000
 CMD [ "yarn", "start:inject" ]
--- a/README.md
+++ b/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
--- a/default.nix
+++ b/default.nix
@@ -0,0 +1,8 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell rec {
+  buildInputs = [
+    pkgs.nodejs
+    pkgs.nodejs.pkgs.yarn
+  ];
+}
--- a/docker/package.json
+++ b/docker/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "inject-and-sirv",
+  "version": "0.0.1",
+  "scripts": {
+    "start:inject": "node scripts/inject.js && sirv dist_injected --port 5000 --cors --single --host"
+  },
+  "private": true,
+  "dependencies": {
+    "fs-extra": "^11.3.0",
+    "klaw": "^4.1.0",
+    "sirv-cli": "^3.0.1"
+  },
+  "engines": {
+    "node": ">=18"
+  }
+}
--- a/docker/yarn.lock
+++ b/docker/yarn.lock
@@ -0,0 +1,116 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.29"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.29.tgz#5a40109a1ab5f84d6fd8fc928b19f367cbe7e7b1"
+  integrity sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==
+
+console-clear@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/console-clear/-/console-clear-1.1.1.tgz#995e20cbfbf14dd792b672cde387bd128d674bf7"
+  integrity sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ==
+
+fs-extra@^11.3.0:
+  version "11.3.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.0.tgz#0daced136bbaf65a555a326719af931adc7a314d"
+  integrity sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+klaw@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-4.1.0.tgz#5df608067d8cb62bbfb24374f8e5d956323338f3"
+  integrity sha512-1zGZ9MF9H22UnkpVeuaGKOjfA2t6WrfdrJmGjy16ykcjnKQDmHVX+KI477rpbGevz/5FD4MC3xf1oxylBgcaQw==
+
+kleur@^4.1.4:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
+  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
+
+local-access@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/local-access/-/local-access-1.1.0.tgz#e007c76ba2ca83d5877ba1a125fc8dfe23ba4798"
+  integrity sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw==
+
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
+mrmime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.1.tgz#bc3e87f7987853a54c9850eeb1f1078cd44adddc"
+  integrity sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==
+
+sade@^1.6.0:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
+semiver@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/semiver/-/semiver-1.1.0.tgz#9c97fb02c21c7ce4fcf1b73e2c7a24324bdddd5f"
+  integrity sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==
+
+sirv-cli@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/sirv-cli/-/sirv-cli-3.0.1.tgz#9a53e4fa85fdc08d54a76fd76a7c866cd4c3988b"
+  integrity sha512-ICXaF2u6IQhLZ0EXF6nqUF4YODfSQSt+mGykt4qqO5rY+oIiwdg7B8w2PVDBJlQulaS2a3J8666CUoDoAuCGvg==
+  dependencies:
+    console-clear "^1.1.0"
+    get-port "^5.1.1"
+    kleur "^4.1.4"
+    local-access "^1.0.1"
+    sade "^1.6.0"
+    semiver "^1.0.0"
+    sirv "^3.0.0"
+    tinydate "^1.0.0"
+
+sirv@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-3.0.1.tgz#32a844794655b727f9e2867b777e0060fbe07bf3"
+  integrity sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==
+  dependencies:
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
+    totalist "^3.0.0"
+
+tinydate@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tinydate/-/tinydate-1.3.0.tgz#e6ca8e5a22b51bb4ea1c3a2a4fd1352dbd4c57fb"
+  integrity sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==
+
+totalist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
+
+universalify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
--- a/external/lang
+++ b/external/lang
--- a/external/revolt.js
+++ b/external/revolt.js
--- a/public/disabled-js.svg
+++ b/public/disabled-js.svg
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -8,10 +8,10 @@ if [ -z "$REMOTE" ]; then
 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
--- a/src/assets/emojis.ts
+++ b/src/assets/emojis.ts
@@ -1848,107 +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",
-        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",
+    // },
 };
--- a/src/components/common/AgeGate.tsx
+++ b/src/components/common/AgeGate.tsx
@@ -4,9 +4,9 @@ import { Channel } from "revolt.js";
 import styled from "styled-components/macro";

 import { Text } from "preact-i18n";
-import { useState } from "preact/hooks";
+import { useEffect, useState } from "preact/hooks";

-import { Button, Checkbox } from "@revoltchat/ui";
+import { Button, Checkbox, Preloader } from "@revoltchat/ui";

 import { useApplicationState } from "../../mobx/State";
 import { SECTION_NSFW } from "../../mobx/stores/Layout";
@@ -45,14 +45,36 @@ type Props = {
    channel: Channel;
 };

+let geoBlock:
+    | undefined
+    | {
+          countryCode: string;
+          isAgeRestrictedGeo: true;
+      };
+
 export default observer((props: Props) => {
    const history = useHistory();
    const layout = useApplicationState().layout;
+    const [geoLoaded, setGeoLoaded] = useState(typeof geoBlock !== "undefined");
    const [ageGate, setAgeGate] = useState(false);

-    if (ageGate || !props.gated) {
+    useEffect(() => {
+        if (!geoLoaded) {
+            fetch("https://geo.revolt.chat")
+                .then((res) => res.json())
+                .then((data) => {
+                    geoBlock = data;
+                    setGeoLoaded(true);
+                });
+        }
+    }, []);
+
+    if (!geoBlock) return <Preloader type="spinner" />;
+
+    if ((ageGate && !geoBlock.isAgeRestrictedGeo) || !props.gated) {
        return <>{props.children}</>;
    }
+
    if (
        !(
            props.channel.channel_type === "Group" ||
@@ -76,23 +98,40 @@ export default observer((props: Props) => {
                </a>
            </span>

-            <Checkbox
-                title={<Text id="app.main.channel.nsfw.confirm" />}
-                value={layout.getSectionState(SECTION_NSFW, false)}
-                onChange={() => layout.toggleSectionState(SECTION_NSFW, false)}
-            />
-            <div className="actions">
-                <Button palette="secondary" onClick={() => history.goBack()}>
-                    <Text id="app.special.modals.actions.back" />
-                </Button>
-                <Button
-                    palette="secondary"
-                    onClick={() =>
-                        layout.getSectionState(SECTION_NSFW) && setAgeGate(true)
-                    }>
-                    <Text id={`app.main.channel.nsfw.${props.type}.confirm`} />
-                </Button>
-            </div>
+            {geoBlock.isAgeRestrictedGeo ? (
+                <div style={{ maxWidth: "420px", textAlign: "center" }}>
+                    {geoBlock.countryCode === "GB"
+                        ? "This channel is not available in your region while we review options on legal compliance."
+                        : "This content is not available in your region."}
+                </div>
+            ) : (
+                <>
+                    <Checkbox
+                        title={<Text id="app.main.channel.nsfw.confirm" />}
+                        value={layout.getSectionState(SECTION_NSFW, false)}
+                        onChange={() =>
+                            layout.toggleSectionState(SECTION_NSFW, false)
+                        }
+                    />
+                    <div className="actions">
+                        <Button
+                            palette="secondary"
+                            onClick={() => history.goBack()}>
+                            <Text id="app.special.modals.actions.back" />
+                        </Button>
+                        <Button
+                            palette="secondary"
+                            onClick={() =>
+                                layout.getSectionState(SECTION_NSFW) &&
+                                setAgeGate(true)
+                            }>
+                            <Text
+                                id={`app.main.channel.nsfw.${props.type}.confirm`}
+                            />
+                        </Button>
+                    </div>
+                </>
+            )}
        </Base>
    );
 });
--- a/src/components/common/Emoji.tsx
+++ b/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}`;
--- a/src/components/common/messaging/MessageBox.tsx
+++ b/src/components/common/messaging/MessageBox.tsx
@@ -305,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}`);
            }
        }

@@ -324,7 +324,7 @@ export default observer(({ channel }: Props) => {
            return;

        const content = state.draft.get(channel._id)?.content?.trim() ?? "";
-        if (uploadState.type === "attached") return sendFile(content);
+        if (uploadState.type !== "none") return sendFile(content);
        if (content.length === 0) return;

        internalEmit("NewMessages", "hide");
@@ -406,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;

--- a/src/components/common/messaging/attachments/AttachmentActions.tsx
+++ b/src/components/common/messaging/attachments/AttachmentActions.tsx
@@ -26,8 +26,8 @@ export default function AttachmentActions({ attachment }: Props) {
    const { filename, metadata, size } = attachment;

    const url = client.generateFileURL(attachment);
-    const open_url = `${url}/${filename}`;
-    const download_url = url?.replace("attachments", "attachments/download");
+    const open_url = url;
+    const download_url = `${url}/${filename}`;

    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} />
--- a/src/components/common/messaging/embed/EmbedInvite.tsx
+++ b/src/components/common/messaging/embed/EmbedInvite.tsx
@@ -126,8 +126,16 @@ export function EmbedInvite({ code }: Props) {
                    <EmbedInviteName>{invite.server_name}</EmbedInviteName>
                    <EmbedInviteMemberCount>
                        <Group size={12} />
-                        {invite.member_count.toLocaleString()}{" "}
-                        {invite.member_count === 1 ? "member" : "members"}
+                        {invite.member_count != null ? (
+                            <>
+                                {invite.member_count.toLocaleString()}{" "}
+                                {invite.member_count === 1
+                                    ? "member"
+                                    : "members"}
+                            </>
+                        ) : (
+                            "N/A"
+                        )}
                    </EmbedInviteMemberCount>
                </EmbedInviteDetails>
                {processing ? (
--- a/src/components/common/user/UserBadges.tsx
+++ b/src/components/common/user/UserBadges.tsx
@@ -119,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",
                                );
                            }}
--- a/src/components/markdown/RemarkRenderer.tsx
+++ b/src/components/markdown/RemarkRenderer.tsx
@@ -185,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
@@ -247,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(
--- a/src/components/markdown/plugins/emoji.tsx
+++ b/src/components/markdown/plugins/emoji.tsx
@@ -34,7 +34,7 @@ export function RenderEmoji({ match }: CustomComponentProps) {
        ? `${
              clientController.getAvailableClient().configuration?.features
                  .autumn.url
-          }/emojis/${match}`
+          }/emojis/${match}/original`
        : parseEmoji(
              match in emojiDictionary
                  ? emojiDictionary[match as keyof typeof emojiDictionary]
--- a/src/components/navigation/left/ServerSidebar.tsx
+++ b/src/components/navigation/left/ServerSidebar.tsx
@@ -50,8 +50,10 @@ const ServerList = styled.div`
 export default observer(() => {
    const client = useClient();
    const state = useApplicationState();
-    const { server: server_id, channel: channel_id } =
-        useParams<{ server: string; channel?: string }>();
+    const { server: server_id, channel: channel_id } = useParams<{
+        server: string;
+        channel?: string;
+    }>();

    const server = client.servers.get(server_id);
    if (!server) return <Redirect to="/" />;
@@ -119,14 +121,18 @@ export default observer(() => {
                channels.push(addChannel(id));
            }

-            elements.push(
-                <CollapsibleSection
-                    id={`category_${category.id}`}
-                    defaultValue
-                    summary={<Category>{category.title}</Category>}>
-                    {channels}
-                </CollapsibleSection>,
-            );
+            if (category.title === "Default") {
+                elements.push(...channels);
+            } else {
+                elements.push(
+                    <CollapsibleSection
+                        id={`category_${category.id}`}
+                        defaultValue
+                        summary={<Category>{category.title}</Category>}>
+                        {channels}
+                    </CollapsibleSection>,
+                );
+            }
        }
    }

--- a/src/components/navigation/right/MemberSidebar.tsx
+++ b/src/components/navigation/right/MemberSidebar.tsx
@@ -76,17 +76,25 @@ function useEntries(

        keys.forEach((key) => {
            let u;
+            let member;
+
            if (isServer) {
                const { server, user } = JSON.parse(key);
                if (server !== channel.server_id) return;
+
                u = client.users.get(user);
+                member = client.members.get(key);
+
+                if (!member?.hasPermission(channel, "ViewChannel")) {
+                    return;
+                }
            } else {
                u = client.users.get(key);
+                member = client.members.get(key);
            }

            if (!u) return;

-            const member = client.members.get(key);
            const sort = member?.nickname ?? u.username;
            const entry = [u, sort] as [User, string];

--- a/src/components/settings/account/AccountManagement.tsx
+++ b/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")}>
--- a/src/controllers/client/ClientController.tsx
+++ b/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();
--- a/src/controllers/client/jsx/error.tsx
+++ b/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";
        }
--- a/src/controllers/client/jsx/legacy/FileUploads.tsx
+++ b/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,
    });
--- a/src/controllers/modals/ModalController.tsx
+++ b/src/controllers/modals/ModalController.tsx
@@ -297,4 +297,5 @@ export const modalController = new ModalControllerExtended({
    report_success: ReportSuccess,
    modify_displayname: ModifyDisplayname,
    changelog_usernames: ChangelogUsernames,
+    reset_bot_token: Confirmation
 });
--- a/src/controllers/modals/components/Confirmation.tsx
+++ b/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={{
--- a/src/controllers/modals/components/ServerInfo.tsx
+++ b/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,30 +70,7 @@ export default function ServerInfo({
                    </IconButton>
                </Row>
            }
-            actions={[
-                {
-                    onClick: () => {
-                        modalController.push({
-                            type: "server_identity",
-                            member: server.member!,
-                        });
-                        return true;
-                    },
-                    children: "Edit Identity",
-                    palette: "primary",
-                },
-                {
-                    onClick: () => {
-                        modalController.push({
-                            type: "report",
-                            target: server,
-                        });
-                        return true;
-                    },
-                    children: <Text id="app.special.modals.actions.report" />,
-                    palette: "error",
-                },
-            ]}>
+            actions={actions}>
            <Markdown content={server.description!} />
        </Modal>
    );
--- a/src/controllers/modals/components/legacy/UserProfile.tsx
+++ b/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";
@@ -246,6 +247,24 @@ 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
--- a/src/controllers/modals/types.ts
+++ b/src/controllers/modals/types.ts
@@ -190,6 +190,11 @@ export type Modal = {
          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 } & {
--- a/src/lib/ContextMenus.tsx
+++ b/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 { 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;
@@ -53,6 +51,7 @@ interface ContextMenuData {
 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 }
@@ -140,6 +139,12 @@ export default function ContextMenus() {
                        "_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}`;
@@ -283,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",
                        );
                    }
@@ -505,6 +506,8 @@ export default function ContextMenus() {
                                <span style={{ color }}>
                                    {locale === "admin" ? (
                                        "Open in Admin Panel"
+                                    ) : locale === "admin_system" ? (
+                                        "Open User in Admin Panel"
                                    ) : (
                                        <Text
                                            id={`app.context_menu.${
@@ -1131,6 +1134,22 @@ export default function ContextMenus() {
                                    },
                                    "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(
--- a/src/mobx/stores/Settings.ts
+++ b/src/mobx/stores/Settings.ts
@@ -66,11 +66,16 @@ export default class Settings
    }

    @action hydrate(data: ISettings) {
-        Object.keys(data).forEach(
-            (key) =>
-                typeof (data as any)[key] !== "undefined" &&
-                this.data.set(key, (data as any)[key]),
-        );
+        Object.keys(data).forEach((key) => {
+            const val = (data as any)[key];
+            if (typeof val !== "undefined") {
+                if (key === "appearance:emoji") {
+                    setGlobalEmojiPack(val);
+                }
+
+                this.data.set(key, val);
+            }
+        });
    }

    /**
--- a/src/pages/channels/Channel.tsx
+++ b/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"
--- a/src/pages/home/Home.module.scss
+++ b/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%);
 }
+
--- a/src/pages/home/Home.tsx
+++ b/src/pages/home/Home.tsx
@@ -51,7 +51,7 @@ 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: string[] = [];

@@ -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
--- a/src/pages/invite/InviteBot.tsx
+++ b/src/pages/invite/InviteBot.tsx
@@ -10,6 +10,22 @@ import UserIcon from "../../components/common/user/UserIcon";
 import Markdown from "../../components/markdown/Markdown";
 import { useClient } from "../../controllers/client/ClientController";

+const Page = styled.div`
+    padding: 6em;
+    min-height: 100vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+    box-sizing: border-box;
+
+    @media (max-width: 768px) {
+        padding: 2em;
+    }
+
+    @media (max-width: 480px) {
+        padding: 1em;
+    }
+`;
+
 const BotInfo = styled.div`
    gap: 12px;
    display: flex;
@@ -42,7 +58,7 @@ export default function InviteBot() {
    const [group, setGroup] = useState("none");

    return (
-        <div style={{ padding: "6em" }}>
+        <Page>
            <Tip palette="warning">This section is under construction.</Tip>
            {typeof data === "undefined" && <Preloader type="spinner" />}
            {data && (
@@ -106,6 +122,7 @@ export default function InviteBot() {
                    </Option>
                </>
            )}
-        </div>
+        </Page>
    );
 }
+    
--- a/src/pages/login/forms/Form.tsx
+++ b/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">
--- a/src/pages/settings/Settings.tsx
+++ b/src/pages/settings/Settings.tsx
@@ -281,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>
--- a/src/pages/settings/panes/MyBots.tsx
+++ b/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>
--- a/src/pages/settings/panes/Native.tsx
+++ b/src/pages/settings/panes/Native.tsx
@@ -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} />}
--- a/src/pages/settings/server/Categories.tsx
+++ b/src/pages/settings/server/Categories.tsx
@@ -369,7 +369,9 @@ function ListElement({
                    <KanbanList last={false} key={category.id}>
                        <div className="inner">
                            <Row>
-                                <KanbanListHeader {...provided.dragHandleProps}>
+                                <KanbanListHeader 
+                                    {...provided.dragHandleProps}
+                                    onClick={startEditing}>
                                    {editing !== undefined ? (
                                        <input
                                            value={editing}
@@ -384,7 +386,7 @@ function ListElement({
                                            id={category.id}
                                        />
                                    ) : (
-                                        <span onClick={startEditing}>
+                                        <span>
                                            {category.title}
                                        </span>
                                    )}
--- a/src/pages/settings/server/Members.tsx
+++ b/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(
--- a/src/pages/settings/server/Roles.tsx
+++ b/src/pages/settings/server/Roles.tsx
@@ -1,4 +1,8 @@
-import { HelpCircle } from "@styled-icons/boxicons-solid";
+import {
+    HelpCircle,
+    ChevronUp,
+    ChevronDown,
+} from "@styled-icons/boxicons-solid";
 import isEqual from "lodash.isequal";
 import { observer } from "mobx-react-lite";
 import { Server } from "revolt.js";
@@ -16,17 +20,208 @@ import {
    ColourSwatches,
    InputBox,
    Category,
+    Row,
 } from "@revoltchat/ui";

 import Tooltip from "../../../components/common/Tooltip";
 import { PermissionList } from "../../../components/settings/roles/PermissionList";
 import { RoleOrDefault } from "../../../components/settings/roles/RoleSelection";
+import { useSession } from "../../../controllers/client/ClientController";
 import { modalController } from "../../../controllers/modals/ModalController";

 interface Props {
    server: Server;
 }

+const RoleReorderContainer = styled.div`
+    margin: 16px 0;
+`;
+
+const RoleItem = styled.div`
+    display: flex;
+    align-items: center;
+    padding: 12px 16px;
+    margin: 12px 0;
+    background: var(--secondary-background);
+    border-radius: var(--border-radius);
+`;
+
+const RoleInfo = styled.div`
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+`;
+
+const RoleName = styled.div`
+    font-weight: 600;
+    color: var(--foreground);
+`;
+
+const RoleRank = styled.div`
+    font-size: 12px;
+    color: var(--secondary-foreground);
+`;
+
+const RoleControls = styled.div`
+    display: flex;
+    gap: 4px;
+`;
+
+const MoveButton = styled(Button)`
+    padding: 4px 8px;
+    min-width: auto;
+`;
+
+/**
+ * Hook to memo-ize role information with proper ordering
+ * @param server Target server
+ * @returns Role array with default at bottom
+ */
+export function useRolesForReorder(server: Server) {
+    return useMemo(() => {
+        const roles = [...server.orderedRoles] as RoleOrDefault[];
+
+        roles.push({
+            id: "default",
+            name: "Default",
+            permissions: server.default_permissions,
+        });
+
+        return roles;
+    }, [server.roles, server.default_permissions]);
+}
+
+/**
+ * Role reordering component
+ */
+const RoleReorderPanel = observer(
+    ({ server, onExit }: Props & { onExit: () => void }) => {
+        const initialRoles = useRolesForReorder(server);
+        const [roles, setRoles] = useState(initialRoles);
+        const [isReordering, setIsReordering] = useState(false);
+
+        // Update local state when server roles change
+        useMemo(() => {
+            setRoles(useRolesForReorder(server));
+        }, [server.roles, server.default_permissions]);
+
+        const moveRoleUp = (index: number) => {
+            if (index === 0 || roles[index].id === "default") return;
+
+            const newRoles = [...roles];
+            [newRoles[index - 1], newRoles[index]] = [
+                newRoles[index],
+                newRoles[index - 1],
+            ];
+            setRoles(newRoles);
+        };
+
+        const moveRoleDown = (index: number) => {
+            // Can't move down if it's the last non-default role or if it's default
+            if (index >= roles.length - 2 || roles[index].id === "default")
+                return;
+
+            const newRoles = [...roles];
+            [newRoles[index], newRoles[index + 1]] = [
+                newRoles[index + 1],
+                newRoles[index],
+            ];
+            setRoles(newRoles);
+        };
+
+        const saveReorder = async () => {
+            setIsReordering(true);
+            try {
+                const nonDefaultRoles = roles.filter(
+                    (role) => role.id !== "default",
+                );
+                const roleIds = nonDefaultRoles.map((role) => role.id);
+
+                const session = useSession()!;
+                const client = session.client!;
+
+                // Make direct API request since it's not in r.js as of writing
+                await client.api.patch(`/servers/${server._id}/roles/ranks`, {
+                    ranks: roleIds,
+                });
+
+                console.log("Roles reordered successfully");
+            } catch (error) {
+                console.error("Failed to reorder roles:", error);
+                setRoles(initialRoles);
+            } finally {
+                setIsReordering(false);
+            }
+        };
+
+        const hasChanges = !isEqual(
+            roles.filter((r) => r.id !== "default").map((r) => r.id),
+            initialRoles.filter((r) => r.id !== "default").map((r) => r.id),
+        );
+
+        return (
+            <div>
+                <SpaceBetween>
+                    <H1>
+                        <Text id="app.settings.permissions.role_ranking" />
+                    </H1>
+                    <Row>
+                        <Button
+                            palette="secondary"
+                            onClick={onExit}
+                            style={{ marginBottom: "16px" }}>
+                            <Text id="app.special.modals.actions.back" />
+                        </Button>
+                        <Button
+                            palette="secondary"
+                            disabled={!hasChanges || isReordering}
+                            onClick={saveReorder}>
+                            <Text id="app.special.modals.actions.save" />
+                        </Button>
+                    </Row>
+                </SpaceBetween>
+
+                <RoleReorderContainer>
+                    {roles.map((role, index) => (
+                        <RoleItem key={role.id}>
+                            <RoleInfo>
+                                <RoleName>{role.name}</RoleName>
+                                <RoleRank>
+                                    {role.id === "default" ? (
+                                        <Text id="app.settings.permissions.default_desc" />
+                                    ) : (
+                                        <>
+                                            <Text id="app.settings.permissions.role_ranking" />{" "}
+                                            {index}
+                                        </>
+                                    )}
+                                </RoleRank>
+                            </RoleInfo>
+
+                            {role.id !== "default" && (
+                                <RoleControls>
+                                    <MoveButton
+                                        palette="secondary"
+                                        disabled={index === 0}
+                                        onClick={() => moveRoleUp(index)}>
+                                        <ChevronUp size={16} />
+                                    </MoveButton>
+                                    <MoveButton
+                                        palette="secondary"
+                                        disabled={index >= roles.length - 2}
+                                        onClick={() => moveRoleDown(index)}>
+                                        <ChevronDown size={16} />
+                                    </MoveButton>
+                                </RoleControls>
+                            )}
+                        </RoleItem>
+                    ))}
+                </RoleReorderContainer>
+            </div>
+        );
+    },
+);
+
 /**
 * Hook to memo-ize role information.
 * @param server Target server
@@ -50,9 +245,11 @@ export function useRoles(server: Server) {
 }

 /**
- * Roles settings menu
+ * Updated Roles settings menu with reordering panel
 */
 export const Roles = observer(({ server }: Props) => {
+    const [showReorderPanel, setShowReorderPanel] = useState(false);
+
    // Consolidate all permissions that we can change right now.
    const currentRoles = useRoles(server);

@@ -74,213 +271,219 @@ export const Roles = observer(({ server }: Props) => {
        margin: 16px 0;
    `;

+    const ReorderButton = styled(Button)`
+        margin-inline: auto 8px;
+    `;
+
+    if (showReorderPanel) {
+        return (
+            <div>
+                <RoleReorderPanel
+                    server={server}
+                    onExit={() => setShowReorderPanel(false)}
+                />
+            </div>
+        );
+    }
+
    return (
-        <PermissionsLayout
-            server={server}
-            rank={server.member?.ranking ?? Infinity}
-            onCreateRole={(callback) =>
-                modalController.push({
-                    type: "create_role",
-                    server,
-                    callback,
-                })
-            }
-            editor={({ selected }) => {
-                const currentRole = currentRoles.find(
-                    (x) => x.id === selected,
-                )!;
+        <div>
+            <PermissionsLayout
+                server={server}
+                rank={server.member?.ranking ?? Infinity}
+                onCreateRole={(callback) =>
+                    modalController.push({
+                        type: "create_role",
+                        server,
+                        callback,
+                    })
+                }
+                editor={({ selected }) => {
+                    const currentRole = currentRoles.find(
+                        (x) => x.id === selected,
+                    )!;

-                if (!currentRole) return null;
+                    if (!currentRole) return null;

-                // Keep track of whatever role we're editing right now.
-                const [value, setValue] = useState<Partial<RoleOrDefault>>({});
+                    const [value, setValue] = useState<Partial<RoleOrDefault>>(
+                        {},
+                    );

-                const currentRoleValue = { ...currentRole, ...value };
+                    const currentRoleValue = { ...currentRole, ...value };

-                // Calculate permissions we have access to on this server.
-                const current = server.permission;
+                    function save() {
+                        const { permissions: permsCurrent, ...current } =
+                            currentRole;
+                        const { permissions: permsValue, ...value } =
+                            currentRoleValue;

-                // Upload new role information to server.
-                function save() {
-                    const { permissions: permsCurrent, ...current } =
-                        currentRole;
-                    const { permissions: permsValue, ...value } =
-                        currentRoleValue;
+                        if (!isEqual(permsCurrent, permsValue)) {
+                            server.setPermissions(
+                                selected,
+                                typeof permsValue === "number"
+                                    ? permsValue
+                                    : {
+                                          allow: permsValue.a,
+                                          deny: permsValue.d,
+                                      },
+                            );
+                        }

-                    if (!isEqual(permsCurrent, permsValue)) {
-                        server.setPermissions(
-                            selected,
-                            typeof permsValue === "number"
-                                ? permsValue
-                                : {
-                                      allow: permsValue.a,
-                                      deny: permsValue.d,
-                                  },
-                        );
+                        if (!isEqual(current, value)) {
+                            server.editRole(selected, value);
+                        }
                    }

-                    if (!isEqual(current, value)) {
-                        server.editRole(selected, value);
+                    function deleteRole() {
+                        server.deleteRole(selected);
                    }
-                }

-                // Delete the role from this server.
-                function deleteRole() {
-                    server.deleteRole(selected);
-                }
-
-                return (
-                    <div>
-                        <SpaceBetween>
-                            <H1>
-                                <Text
-                                    id="app.settings.actions.edit"
-                                    fields={{ name: currentRole.name }}
-                                />
-                            </H1>
-                            <Button
-                                palette="secondary"
-                                disabled={isEqual(
-                                    currentRole,
-                                    currentRoleValue,
-                                )}
-                                onClick={save}>
-                                <Text id="app.special.modals.actions.save" />
-                            </Button>
-                        </SpaceBetween>
-                        <hr />
-                        {selected !== "default" && (
-                            <>
-                                <section>
-                                    <Category>
-                                        <Text id="app.settings.permissions.role_name" />
-                                    </Category>
-                                    <p>
-                                        <InputBox
-                                            value={currentRoleValue.name}
-                                            onChange={(e) =>
-                                                setValue({
-                                                    ...value,
-                                                    name: e.currentTarget.value,
-                                                })
-                                            }
-                                            palette="secondary"
-                                        />
-                                    </p>
-                                </section>
-                                <section>
-                                    <Category>{"Role ID"}</Category>
-                                    <RoleId>
-                                        <Tooltip
-                                            content={
-                                                "This is a unique identifier for this role."
-                                            }>
-                                            <HelpCircle size={16} />
-                                        </Tooltip>
-                                        <Tooltip
-                                            content={
-                                                <Text id="app.special.copy" />
-                                            }>
-                                            <a
-                                                onClick={() =>
-                                                    modalController.writeText(
-                                                        currentRole.id,
-                                                    )
+                    return (
+                        <div>
+                            <SpaceBetween>
+                                <H1>
+                                    <Text
+                                        id="app.settings.actions.edit"
+                                        fields={{ name: currentRole.name }}
+                                    />
+                                </H1>
+                                <ReorderButton
+                                    palette="secondary"
+                                    onClick={() => setShowReorderPanel(true)}>
+                                    <Text id="app.settings.permissions.role_ranking" />
+                                </ReorderButton>
+                                <Button
+                                    palette="secondary"
+                                    disabled={isEqual(
+                                        currentRole,
+                                        currentRoleValue,
+                                    )}
+                                    onClick={save}>
+                                    <Text id="app.special.modals.actions.save" />
+                                </Button>
+                            </SpaceBetween>
+                            <hr />
+                            {selected !== "default" && (
+                                <>
+                                    <section>
+                                        <Category>
+                                            <Text id="app.settings.permissions.role_name" />
+                                        </Category>
+                                        <p>
+                                            <InputBox
+                                                value={currentRoleValue.name}
+                                                onChange={(e) =>
+                                                    setValue({
+                                                        ...value,
+                                                        name: e.currentTarget
+                                                            .value,
+                                                    })
+                                                }
+                                                palette="secondary"
+                                            />
+                                        </p>
+                                    </section>
+                                    <section>
+                                        <Category>{"Role ID"}</Category>
+                                        <RoleId>
+                                            <Tooltip
+                                                content={
+                                                    "This is a unique identifier for this role."
                                                }>
-                                                {currentRole.id}
-                                            </a>
-                                        </Tooltip>
-                                    </RoleId>
-                                </section>
-                                <section>
-                                    <Category>
-                                        <Text id="app.settings.permissions.role_colour" />
-                                    </Category>
-                                    <p>
-                                        <ColourSwatches
-                                            value={
-                                                currentRoleValue.colour ??
-                                                "gray"
-                                            }
-                                            onChange={(colour) =>
-                                                setValue({ ...value, colour })
-                                            }
-                                        />
-                                    </p>
-                                </section>
-                                <section>
-                                    <Category>
-                                        <Text id="app.settings.permissions.role_options" />
-                                    </Category>
-                                    <p>
-                                        <Checkbox
-                                            value={
-                                                currentRoleValue.hoist ?? false
-                                            }
-                                            onChange={(hoist) =>
-                                                setValue({ ...value, hoist })
-                                            }
-                                            title={
-                                                <Text id="app.settings.permissions.hoist_role" />
-                                            }
-                                            description={
-                                                <Text id="app.settings.permissions.hoist_desc" />
-                                            }
-                                        />
-                                    </p>
-                                </section>
-                                <section>
-                                    <Category>
-                                        <Text id="app.settings.permissions.role_ranking" />
-                                    </Category>
-                                    <p>
-                                        <InputBox
-                                            type="number"
-                                            value={currentRoleValue.rank ?? 0}
-                                            onChange={(e) =>
-                                                setValue({
-                                                    ...value,
-                                                    rank: parseInt(
-                                                        e.currentTarget.value,
-                                                    ),
-                                                })
-                                            }
-                                            palette="secondary"
-                                        />
-                                    </p>
-                                </section>
-                            </>
-                        )}
-                        <h1>
-                            <Text id="app.settings.permissions.edit_title" />
-                        </h1>
-                        <PermissionList
-                            value={currentRoleValue.permissions}
-                            onChange={(permissions) =>
-                                setValue({
-                                    ...value,
-                                    permissions,
-                                } as RoleOrDefault)
-                            }
-                            target={server}
-                        />
-                        {selected !== "default" && (
-                            <>
-                                <hr />
-                                <h1>
-                                    <Text id="app.settings.categories.danger_zone" />
-                                </h1>
-                                <DeleteRoleButton
-                                    palette="error"
-                                    compact
-                                    onClick={deleteRole}>
-                                    <Text id="app.settings.permissions.delete_role" />
-                                </DeleteRoleButton>
-                            </>
-                        )}
-                    </div>
-                );
-            }}
-        />
+                                                <HelpCircle size={16} />
+                                            </Tooltip>
+                                            <Tooltip
+                                                content={
+                                                    <Text id="app.special.copy" />
+                                                }>
+                                                <a
+                                                    onClick={() =>
+                                                        modalController.writeText(
+                                                            currentRole.id,
+                                                        )
+                                                    }>
+                                                    {currentRole.id}
+                                                </a>
+                                            </Tooltip>
+                                        </RoleId>
+                                    </section>
+                                    <section>
+                                        <Category>
+                                            <Text id="app.settings.permissions.role_colour" />
+                                        </Category>
+                                        <p>
+                                            <ColourSwatches
+                                                value={
+                                                    currentRoleValue.colour ??
+                                                    "gray"
+                                                }
+                                                onChange={(colour) =>
+                                                    setValue({
+                                                        ...value,
+                                                        colour,
+                                                    })
+                                                }
+                                            />
+                                        </p>
+                                    </section>
+                                    <section>
+                                        <Category>
+                                            <Text id="app.settings.permissions.role_options" />
+                                        </Category>
+                                        <p>
+                                            <Checkbox
+                                                value={
+                                                    currentRoleValue.hoist ??
+                                                    false
+                                                }
+                                                onChange={(hoist) =>
+                                                    setValue({
+                                                        ...value,
+                                                        hoist,
+                                                    })
+                                                }
+                                                title={
+                                                    <Text id="app.settings.permissions.hoist_role" />
+                                                }
+                                                description={
+                                                    <Text id="app.settings.permissions.hoist_desc" />
+                                                }
+                                            />
+                                        </p>
+                                    </section>
+                                </>
+                            )}
+                            <h1>
+                                <Text id="app.settings.permissions.edit_title" />
+                            </h1>
+                            <PermissionList
+                                value={currentRoleValue.permissions}
+                                onChange={(permissions) =>
+                                    setValue({
+                                        ...value,
+                                        permissions,
+                                    } as RoleOrDefault)
+                                }
+                                target={server}
+                            />
+                            {selected !== "default" && (
+                                <>
+                                    <hr />
+                                    <h1>
+                                        <Text id="app.settings.categories.danger_zone" />
+                                    </h1>
+                                    <DeleteRoleButton
+                                        palette="error"
+                                        compact
+                                        onClick={deleteRole}>
+                                        <Text id="app.settings.permissions.delete_role" />
+                                    </DeleteRoleButton>
+                                </>
+                            )}
+                        </div>
+                    );
+                }}
+            />
+        </div>
    );
 });
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,7 @@
        "isolatedModules": true,
        "noEmit": true,
        "jsx": "preserve",
+        "jsxImportSource": "preact",
        "jsxFactory": "h",
        "jsxFragmentFactory": "Fragment",
        "types": ["vite-plugin-pwa/client"],
Author	SHA1	Message	Date
Paul Makles	41f47a1a3f	merge: pull request #1143 from Asraye/fix/member-sidebar	2025-09-07 13:09:46 +01:00
Paul Makles	c6130a19bf	merge: pull request #1109 from Docteh/smaller3	2025-09-07 13:06:39 +01:00
Paul Makles	3c7cb2a222	merge: pull request #1141 from Asraye/fixemoji-pack	2025-09-07 13:05:41 +01:00
Paul Makles	2625b37f70	merge: pull request #1142 from Asraye/ignore-default-category	2025-09-07 13:04:47 +01:00
Paul Makles	ca3613725a	merge: pull request #1137 from Asraye/master	2025-09-07 13:04:05 +01:00
Paul Makles	707d0a2d7d	merge: pull request #1146 from Asraye/fix/attachment-actions	2025-09-07 13:01:20 +01:00
Asraye	33e686ab1b	fix: correct open/download link behaviour	2025-09-04 04:23:09 +10:00
Asraye	f22e6fa9fe	fix: correct open/download link behaviour	2025-09-04 04:22:20 +10:00
Asraye	2e2886f01b	fix: filter out members without ViewChannel Small fix to add a ViewChannel check when rendering members in the sidebar	2025-09-02 16:14:10 +10:00
Asraye	cbdeb1ba6d	FIX: Ignore Default category (parity with beta) Just a little change so people still using Revite don't need to see an ugly "Default" category.	2025-08-31 03:47:43 +10:00
Asraye	608b0a3ef2	FIX: Emoji pack now persists on reload	2025-08-29 21:55:56 +10:00
Asraye	59226959ba	Add scroll on mobile	2025-08-21 16:40:51 +10:00
izzy	9d82873d2a	chore: make sure role ordering updates are instantenous	2025-08-07 16:57:20 +02:00
izzy	56af4b9423	chore: add default.nix	2025-08-07 12:04:45 +02:00
izzy	cce94d2e0e	chore: bump lang submodule	2025-08-07 12:03:54 +02:00
izzy	8ba7a769b3	merge: remote-tracking branch 'origin/role-reordering'	2025-08-07 12:03:35 +02:00
Paul Makles	92e84309ec	merge: pull request #1123 from Asraye/patch	2025-08-04 18:03:53 +01:00
Paul Makles	dd5548c5e6	merge: pull request #1126 from solunareclipse1/master	2025-08-04 17:44:49 +01:00
Declan Chidlow	e7d7420d5b	feat: Finish crappy role ranking implementation that works but is full of sin	2025-08-04 22:28:24 +08:00
izzy	ee3b54b373	docs: shorten age gate message	2025-07-25 20:34:45 +01:00
izzy	3dc9f6b045	feat: geoblock age restricted content https://www.ofcom.org.uk/online-safety/protecting-children/online-age-checks-must-be-in-force-from-tomorrow https://petition.parliament.uk/petitions/722903 https://wikimediafoundation.org/news/2025/07/17/wikimedia-foundation-challenges-uk-online-safety-act-regulations/	2025-07-25 19:49:00 +01:00
izzy	2a1f7cb8bb	chore: bump lang submodule	2025-07-25 19:48:16 +01:00
solunareclipse1	1136e8e31b	fix: Make animated WebP emotes properly animate Signed-off-by: solunareclipse1 <sol@solunareclipse1.net>	2025-07-10 23:41:57 -05:00
Asraye	5337031359	Update EmbedInvite.tsx	2025-06-12 16:26:09 +10:00
Asraye	670c4e5f6e	Update EmbedInvite.tsx	2025-06-12 15:46:07 +10:00
Declan Chidlow	20c8dde197	feat: Add role re-ordering Doesn't currently update order in UI	2025-06-12 12:33:39 +08:00
Declan Chidlow	ddaca7b0c4	feat: remove legacy role ranking	2025-06-12 09:59:57 +08:00
Asraye	94fab0852f	Ugly ahh patch	2025-06-11 18:08:33 +10:00
Kyle Kienapfel	2c41c5789c	feat: drastically shrink the docker image Right now the generated docker container contains a copy of the development environment used to compile the revite interface. This PR loses about 440MB compressed, or around 800MB uncompressed from the final image size. node in the final image has been bumped from 16 to 24, sirv-cli, and the dependencies for inject.js have been updated	2025-05-18 01:59:51 -07:00
Kyle Kienapfel	184754ca0f	chore: have GHA generate ARM64 image, add description to images The box where githubs container website complains about a lack a description is really big. Okay its not important.	2025-05-18 01:29:54 -07:00
Kyle Kienapfel	6bacbfbb56	fix: move disabled-js.svg to proper location	2025-05-18 01:29:17 -07:00
Paul Makles	9e293e0a30	merge: pull request #1108 from Zomatree/feat/reset-bot-password	2025-05-17 13:27:04 +01:00
Paul Makles	d957fbd5dc	merge: pull request #1103 from Docteh/automation	2025-05-17 13:26:33 +01:00
Zomatree	0a8b70c8ed	chore: update submodule	2025-05-17 13:10:11 +01:00
Zomatree	07d74a4ef4	feat: reset bot token button	2025-05-17 12:59:39 +01:00
Kyle Kienapfel	38ab8a7801	chore: update link to contribution guide in PR template [skip ci]	2025-05-12 16:14:26 -07:00
Paul Makles	bccf1eebae	merge: pull request #1102 from Docteh/docky	2025-05-12 11:16:25 +01:00
Kyle Kienapfel	135dbe2da4	fix: Remove caching from GitHub actions to allow compilation of docker container The GitHub action `actions/cache@v2` is no longer available. Last successful docker build was 2024-11-15 I've removed the caching, as merely upgrading the version of the cache script did not fix the problem. Since the revoltchat/revite is deprecated I believe that the lack of caching in builds shouldn't be an undue burden on GitHub. Only 9 commits have been made here since builds stopped working The logic for publishing Docker containers has been shuffled so that the build is executed only once when publishing. I have tested building to GitHub's container registry, but not to dockerhub, I do not forsee any issues there. Main reason for doing this, is that a fix for attachment downloads (https://github.com/revoltchat/revite/pull/1067) is not easily available to anyone running self-hosted.	2025-05-11 13:21:08 -07:00
izzy	f95d3d27d8	chore: remove the extra string	2025-05-09 08:48:41 +01:00
izzy	3d41a016cf	fix: login error messages not rendering properly	2025-05-09 08:42:58 +01:00
Paul Makles	f9c2fcec56	chore: bump language submodule	2025-01-29 13:42:20 +00:00
Paul Makles	18243f0207	chore: always target blank for download button	2025-01-29 13:41:54 +00:00
Declan Chidlow	7750276554	fix: remove /download from attachments (#1067 )	2025-01-29 13:39:17 +00:00
Declan Chidlow	97a6c7d399	fix: remove ability for owners to leave server from ServerInfo modal (#1070 ) Co-authored-by: Declan Chidlow <git.rh92c@8shield.net>	2025-01-29 13:39:03 +00:00
Paul Makles	ac2beaf549	chore: update URL to FAQ	2024-12-17 17:35:55 +00:00
Amy	bf951e59ee	fix: appending mention to draft content (#1065 )	2024-12-17 17:29:57 +00:00
Paul Makles	03f9f7673d	merge: pull request #1050 from JackDotJS/fix-blank-category-name	2024-12-17 17:29:16 +00:00
Paul Makles	478d375125	fix: add try-catch block around md renderer fix: update recursive match to block numbered lists	2024-11-15 13:09:40 +00:00
Paul Makles	cb6296a96e	chore: update languages submodule	2024-11-06 09:51:44 +00:00
Paul Makles	48a9d7d370	chore: update donation links	2024-11-06 09:51:35 +00:00
Paul Makles	5de18192b2	chore: delete .env.production	2024-10-27 22:31:42 +00:00
Paul Makles	ef4218d12b	merge branch: 'insert/member-subscriptions'	2024-10-27 22:00:22 +00:00
Paul Makles	df4f6578f7	feat: add session token to file uploads	2024-10-27 21:59:16 +00:00
JackDotJS	28c897ac3d	fix(settings): fixed inability to rename categories when they have blank names Signed-off-by: JackDotJS <jackdotjs@proton.me>	2024-10-27 11:14:04 -07:00
Paul Makles	86e8424e46	merge: pull request #1035 from DeclanChidlow/server-leave-mobile	2024-10-16 12:53:00 +01:00
Declan Chidlow	5e66bc8dc4	fix: Add ability to leave server through server info screen	2024-10-15 20:23:36 +08:00
Paul Makles	00e6ead9bd	chore: bump revolt.js submodule	2024-07-27 15:18:23 +02:00
Paul Makles	0f0808aa56	feat: add report button to user profiles	2024-06-23 12:23:42 +01:00
Paul Makles	c972e6813f	fix: should always call subscribe	2024-06-19 18:16:30 +01:00
Paul Makles	61304f18c2	feat: implement support for Subscribe event	2024-06-19 17:40:59 +01:00
Paul Makles	2722d0a854	chore: remove this so people don't click it	2024-06-09 13:57:36 +01:00
Paul Makles	dfd96c449a	chore: synchronise locales	2024-06-09 13:55:52 +01:00
Paul Makles	9eca58dda1	merge: pull request #967 from revoltchat/rexo/fix/remove-deprecated-emoji	2024-06-09 13:51:11 +01:00
Sophie L	6cf0ef95ad	fix: remove (broken/deprecated) built-in custom emoji these have been broken for a while due to the data loss when insert's server failed, and were also deprecated upon the addition of custom server emoji. they were meant to be temporary anyway, and other clients (including the new web app) don't implement them, so let's remove them to avoid confusion.	2024-05-16 15:29:53 +01:00
insertish	d3661170a4	ci: synced local '.github/workflows/triage_pr.yml' with remote 'workflows/triage_pr.yml' [skip ci]	2024-03-28 13:37:37 +00:00
Paul Makles	5b6546b761	fix: allow retrying sending files	2024-03-15 19:50:17 +00:00
Sophie L	c25ecc12b2	chore: rm mirroring script	2024-03-13 23:51:56 +00:00
Paul Makles	60fdb5c091	docs: legacy release procedure	2024-03-13 23:41:54 +00:00
Bob Bobs	472e6e07b5	fix: only delete session if error is Unauthorized	2024-03-13 22:55:12 +00:00
Paul Makles	15e8e10151	merge: pull request #864 fix(home): inconsistent discover button height	2023-11-11 19:16:59 +00:00
Paul Makles	782a9b54ba	chore: update dest directory	2023-10-04 19:22:54 +01:00
Paul Makles	f52ede1c21	chore: bump languages submodule	2023-10-04 19:18:57 +01:00
Lea	7fef354fe6	fix: appeal to monkey brain	2023-10-04 19:13:07 +01:00
Lea	d4e0f19f95	feat: admin panel link for system message user	2023-10-04 19:13:07 +01:00
wangdejiang	fe63c6633f	chore: resolve ts-to-JSX type hints	2023-08-25 18:44:57 +01:00
Sophie L	be3565871c	feat: translate account management options	2023-08-25 18:44:34 +01:00
Ashley	e8989fcffa	add a blank space to re run CI	2023-03-22 18:40:24 +03:00
Ashley	06dea9300c	fix inconsonant height in buttons	2023-03-20 18:11:10 +03:00