From 6cf0ef95ad8c9500f6a5780da8309695d9055282 Mon Sep 17 00:00:00 2001 From: Sophie L Date: Thu, 16 May 2024 15:29:53 +0100 Subject: [PATCH 1/5] 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. --- src/assets/emojis.ts | 210 ++++++++++++++++---------------- src/components/common/Emoji.tsx | 10 +- 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/src/assets/emojis.ts b/src/assets/emojis.ts index ed033e467..49d2ddfc0 100644 --- a/src/assets/emojis.ts +++ b/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", + // }, }; diff --git a/src/components/common/Emoji.tsx b/src/components/common/Emoji.tsx index b20ca7ae2..d3b354cf8 100644 --- 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}`; From dfd96c449aba3b7b5908ec4b1c58952797426d2b Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Sun, 9 Jun 2024 13:55:52 +0100 Subject: [PATCH 2/5] chore: synchronise locales --- external/lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/lang b/external/lang index 56ea80169..3195d642c 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 56ea80169f11f3a6c8f8065c7aafa95d31bea6dd +Subproject commit 3195d642cd766cb62d34eb2a57ce3a09e775e91f From 2722d0a8544a81f1c44e6afbce45e7c10dd7a095 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Sun, 9 Jun 2024 13:57:36 +0100 Subject: [PATCH 3/5] chore: remove this so people don't click it --- src/pages/settings/panes/Native.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/panes/Native.tsx b/src/pages/settings/panes/Native.tsx index ab1c39aca..e0720bfc3 100644 --- a/src/pages/settings/panes/Native.tsx +++ b/src/pages/settings/panes/Native.tsx @@ -144,7 +144,7 @@ export function Native() {

Local Development Mode

- {config.build === "dev" ? ( + {/*config.build === "dev" ? ( <>
Development mode is currently on.