Merge branch 'revoltchat:master' into master

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.

external/lang

@@ -1 +1 @@
-Subproject commit 56ea80169f11f3a6c8f8065c7aafa95d31bea6dd
+Subproject commit 3195d642cd766cb62d34eb2a57ce3a09e775e91f

external/revolt.js

@@ -1 +1 @@
-Subproject commit 783c8d1a3e3ad6071d268b18077569262ea61602
+Subproject commit cd9e84a337c72709b82bb4eca794ec7474a0ee7e

src/assets/emojis.ts

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

src/components/common/Emoji.tsx

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

src/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

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} />}