From 6a88c5d09751230be685915f534e7f6392e34ba4 Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 5 Mar 2026 21:40:56 +0100 Subject: [PATCH 1/4] renamed gcolor, gfont, gpronoun to scolor, sfont, spronoun respectively to better indicate what these commands actually do --- .../common-settings/cosmetics/Cosmetics.tsx | 8 +++--- src/app/hooks/useCommands.ts | 27 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx index 463468548..70c4cacd0 100644 --- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx +++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx @@ -83,7 +83,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { title={isSpace ? 'Space-Wide Colors' : 'Room Colors'} description={ isSpace - ? 'Allow everyone to use /gcolor in this space.' + ? 'Allow everyone to use /scolor in this space.' : 'Allow everyone to use /color in this room.' } after={ @@ -107,7 +107,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { title={isSpace ? 'Space-Wide Fonts' : 'Room Fonts'} description={ isSpace - ? 'Allow everyone to use /gfont in this space.' + ? 'Allow everyone to use /sfont in this space.' : 'Allow everyone to use /font in this room.' } after={ @@ -131,7 +131,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { title={isSpace ? 'Space-Wide Pronouns' : 'Room Pronouns'} description={ isSpace - ? 'Allow everyone to use /gpronoun in this space.' + ? 'Allow everyone to use /spronoun in this space.' : 'Allow everyone to use /pronoun in this room.' } after={ @@ -191,7 +191,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { gap="400" > diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index 4322c62b5..7de36934f 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -225,12 +225,12 @@ export enum Command { Acl = 'acl', // Sable commands Color = 'color', - GColor = 'gcolor', + SColor = 'scolor', Font = 'font', - GFont = 'gfont', + SFont = 'sfont', AddWidget = 'addwidget', Pronoun = 'pronoun', - GPronoun = 'gpronoun', + SPronoun = 'spronoun', Rainbow = 'rainbow', RawMsg = 'rawmsg', Raw = 'raw', @@ -664,10 +664,10 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { } }, }, - [Command.GColor]: { - name: Command.GColor, + [Command.SColor]: { + name: Command.SColor, description: - 'Set your global color for the current Space. Example: /gcolor #ff00ff | /gcolor reset', + 'Set your color for the current Space. Example: /scolor #ff00ff | /scolor reset', exe: async (payload) => { const input = payload.trim().toLowerCase(); const userId = mx.getSafeUserId(); @@ -767,10 +767,9 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { } }, }, - [Command.GFont]: { - name: Command.GFont, - description: - 'Set a global font for the current Space. Example: /gfont Courier New | /gfont reset', + [Command.SFont]: { + name: Command.SFont, + description: 'Set a font for the current Space. Example: /sfont Courier New | /sfont reset', exe: async (payload) => { const input = payload .trim() @@ -782,7 +781,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { const localNotice = new MatrixEvent({ type: 'm.room.message', content: { msgtype: 'm.notice', body: msg }, - event_id: `~gfont-${Date.now()}`, + event_id: `~sfont-${Date.now()}`, room_id: room.roomId, sender: userId, }); @@ -937,10 +936,10 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { } }, }, - [Command.GPronoun]: { - name: Command.GPronoun, + [Command.SPronoun]: { + name: Command.SPronoun, description: - 'Set your global pronouns for this space. Example: /gpronoun "they/them, it/its" | /gpronoun reset', + 'Set your pronouns for this space. Example: /spronoun "they/them, it/its" | /spronoun reset', exe: async (payload) => { const match = payload.trim().match(/^"(.*)"$/); const rawInput = match ? match[1].trim() : payload.trim(); From 8e96a604d3f5b2d77c05f330f482eca114dd3eb4 Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 5 Mar 2026 21:48:48 +0100 Subject: [PATCH 2/4] add changeset documentation --- ...r_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md diff --git a/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md b/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md new file mode 100644 index 000000000..2c390bfec --- /dev/null +++ b/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +change gcolor, gfont, gpronoun to scolor, sfont, spronoun respectively From 0c28a5c9070b1d02f6e1d1bde96a9122cb05b1f6 Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 5 Mar 2026 22:20:01 +0100 Subject: [PATCH 3/4] resolved merge conflict --- src/app/hooks/useCommands.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index dd803e7bf..de8303541 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -941,11 +941,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { [Command.SPronoun]: { name: Command.SPronoun, description: -<<<<<<< fix-naming-space-commands - 'Set your pronouns for this space. Example: /spronoun "they/them, it/its" | /spronoun reset', -======= - 'Set your global pronouns for this space. Example: /gpronoun "en:they/them, de:sie/ihr" | /gpronoun reset', ->>>>>>> dev + 'Set your pronouns for this space. Example: /spronoun "en:they/them, de:sie/ihr" | /spronoun reset', exe: async (payload) => { const match = payload.trim().match(/^"(.*)"$/); const rawInput = match ? match[1].trim() : payload.trim(); From 24171b28bdfcbfe1a9fd280c0bb7e717f5f54d93 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Thu, 5 Mar 2026 15:27:22 -0600 Subject: [PATCH 4/4] Rename gcolor, gfont, and gpronoun commands --- ...olor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md b/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md index 2c390bfec..5179ed1e0 100644 --- a/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md +++ b/.changeset/change_gcolor_gfont_gpronoun_to_scolor_sfont_spronoun_respectively.md @@ -2,4 +2,4 @@ sable: patch --- -change gcolor, gfont, gpronoun to scolor, sfont, spronoun respectively +Rename gcolor, gfont, and gpronoun commands to scolor, sfont, and spronoun respectively.