From acbf9bf16cd63236a26a735d04b2e299971d612f Mon Sep 17 00:00:00 2001 From: 7w1 Date: Mon, 16 Feb 2026 23:49:58 -0600 Subject: [PATCH] Name colors! Cosmetics tab in settings for controlling permissions. Some brand swappage to Sable. --- .vscode/settings.json | 8 +- config.json | 6 +- index.html | 126 +++++------------- package.json | 2 +- public/favicon.ico | Bin 33310 -> 0 bytes public/favicon.png | Bin 0 -> 8546 bytes public/manifest.json | 6 +- .../components/splash-screen/SplashScreen.tsx | 2 +- .../common-settings/cosmetics/Cosmetics.tsx | 108 +++++++++++++++ .../features/room-settings/RoomSettings.tsx | 9 ++ src/app/features/room/message/Message.tsx | 25 +++- src/app/features/settings/about/About.tsx | 4 +- .../notifications/SystemNotification.tsx | 2 +- .../features/space-settings/SpaceSettings.tsx | 9 ++ src/app/hooks/useCommands.ts | 94 ++++++++++++- src/app/pages/auth/AuthFooter.tsx | 4 +- src/app/pages/auth/AuthLayout.tsx | 4 +- .../pages/auth/login/PasswordLoginForm.tsx | 6 +- src/app/pages/auth/login/TokenLogin.tsx | 2 +- .../auth/register/PasswordRegisterForm.tsx | 4 +- src/app/pages/client/WelcomePage.tsx | 10 +- src/app/state/roomSettings.ts | 2 + src/app/state/spaceSettings.ts | 2 + src/types/matrix/accountData.ts | 2 + src/types/matrix/room.ts | 4 + 25 files changed, 322 insertions(+), 119 deletions(-) delete mode 100644 public/favicon.ico create mode 100644 public/favicon.png create mode 100644 src/app/features/common-settings/cosmetics/Cosmetics.tsx diff --git a/.vscode/settings.json b/.vscode/settings.json index 8272ea1e4..5723fa3f7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,11 @@ { "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", - "typescript.tsdk": "node_modules/typescript/lib" + "typescript.tsdk": "node_modules/typescript/lib", + "[typescript]": { + "editor.defaultFormatter": "vscode.typescript-language-features" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "vscode.typescript-language-features" + } } diff --git a/config.json b/config.json index 644f0eb61..ce9af001e 100644 --- a/config.json +++ b/config.json @@ -1,8 +1,9 @@ { "defaultHomeserver": 1, "homeserverList": [ - "converser.eu", + "sable.moe", "matrix.org", + "converser.eu", "mozilla.org", "unredacted.org", "xmr.se" @@ -12,6 +13,7 @@ "featuredCommunities": { "openAsDefault": false, "spaces": [ + "#bdsystem:sable.moe", "#cinny-space:matrix.org", "#community:matrix.org", "#space:unredacted.org", @@ -27,7 +29,7 @@ "#PrivSec.dev:arcticfoxes.net", "#disroot:aria-net.org" ], - "servers": [ "matrix.org", "mozilla.org", "unredacted.org" ] + "servers": [ "sable.moe", "matrix.org", "mozilla.org", "unredacted.org" ] }, "hashRouter": { diff --git a/index.html b/index.html index 2eefeee2c..4a2788709 100644 --- a/index.html +++ b/index.html @@ -1,96 +1,42 @@ - - - - - Cinny - - - - - - - - - + + + + + Sable Client + + + + - + + + + + - - - - - - + - - - - - - - - - - - - - -
-
- - - + + + + + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/package.json b/package.json index 601323adf..29ad4bbf6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cinny", "version": "4.10.3", - "description": "Yet another matrix client", + "description": "Yet another matrix client fork", "main": "index.js", "type": "module", "engines": { diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index 916713065b069f0e59a63d520178ea8101818913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33310 zcmds=39uDKmWD41Zh#;vi?Te&jSgf)fe5#7iEs_K7-bc0ca0fVQQL(<(1~z#P}xOo zffki;3)exq8(Txi1sUl<9R+3_z%4`&ci_Dz@8N_@)vbGhJ`v|--mH`7 zoII6#o~&0Wv?{bIbnIAASXb!Xx=2=oYpw6#Dh^e;-mP z{JBS=aPrCiZ-rYY~UjHYwh?%PzZ^Hf`E0QrzRAupr%Lj~h3Ry!A~@O{Srt zf&Au^Pd+J%ug!1u*a{C{53=_kFkrwokvDGJwyg*%ZqXce*kLwbm`@{R!5*^J%sF%B zAg<`kEeiN;(B+IX&an9j;Xz1Q3^v_opMBQNm@xx#FB6#s{Py75Yp?b4OP1vm=)rrD z&FgpFbyqWV=+NSqUw-LjR2hur@xlu)*nH?~sB*r)F{)hUq5s3!3P&* zdoRCVuV#^7_VjFW=9y;}*RNk6$euQBnpwPfvAOQL>&&gU-da5R=%dlWqupbVJ-j-} zyHHvKc2HP6<&;y34?XmddFrXB%-wh2ZQ8bN>!tHdNZfmW3cdQQ=d-C3`n}cXVd)9I zI5PZqZtD+vTWCj}^z94pCSegfDcuW2h|UeA^;hjIXg{*cY-ETo5_yKMdfu%4gm@Gr zbAamAEZ&P`H-NsKBik?igu0r7x)ZPeQBWwT&q)bAML$Zimgt?Vkqx(i#Fh3(JsT

2R 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 literal 0 HcmV?d00001 diff --git a/public/manifest.json b/public/manifest.json index acdcd0042..a4fda1116 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,7 +1,7 @@ { - "name": "Cinny", - "short_name": "Cinny", - "description": "Yet another matrix client", + "name": "Sable", + "short_name": "Sable", + "description": "Yet another matrix client fork", "dir": "auto", "lang": "en-US", "display": "standalone", diff --git a/src/app/components/splash-screen/SplashScreen.tsx b/src/app/components/splash-screen/SplashScreen.tsx index 27adadbad..7ef878ec5 100644 --- a/src/app/components/splash-screen/SplashScreen.tsx +++ b/src/app/components/splash-screen/SplashScreen.tsx @@ -21,7 +21,7 @@ export function SplashScreen({ children }: SplashScreenProps) { justifyContent="Center" > - Cinny + Sable diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx new file mode 100644 index 000000000..b68c11129 --- /dev/null +++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx @@ -0,0 +1,108 @@ +import React, { useCallback } from 'react'; +import { + Box, + Text, + IconButton, + Icon, + Icons, + Scroll, + Switch, +} from 'folds'; +import { Page, PageContent, PageHeader } from '../../../components/page'; +import { SequenceCard } from '../../../components/sequence-card'; +import { SequenceCardStyle } from '../styles.css'; +import { SettingTile } from '../../../components/setting-tile'; +import { useRoom } from '../../../hooks/useRoom'; +import { usePowerLevels } from '../../../hooks/usePowerLevels'; +import { useMatrixClient } from '../../../hooks/useMatrixClient'; +import { StateEvent } from '../../../../types/matrix/room'; +import { useRoomCreators } from '../../../hooks/useRoomCreators'; +import { useRoomPermissions } from '../../../hooks/useRoomPermissions'; + +type CosmeticsProps = { + requestClose: () => void; +}; + +export function Cosmetics({ requestClose }: CosmeticsProps) { + const mx = useMatrixClient(); + const room = useRoom(); + const creators = useRoomCreators(room); + const powerLevels = usePowerLevels(room); + const isSpace = room.isSpaceRoom(); + + const permissions = useRoomPermissions(creators, powerLevels); + const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId()); + + const currentLevel = (powerLevels as any).events?.[StateEvent.RoomCosmeticsColor] ?? 50; + + const handleToggle = useCallback(async (enabled: boolean) => { + const newLevel = enabled ? 0 : 50; + + const newContent = { + ...powerLevels, + events: { + ...((powerLevels as any).events || {}), + [StateEvent.RoomCosmeticsColor]: newLevel, + }, + }; + + try { + await mx.sendStateEvent(room.roomId, StateEvent.RoomPowerLevels as any, newContent, ""); + } catch (e) { + console.error("Failed to update cosmetic permissions:", e); + } + }, [mx, room.roomId, powerLevels]); + + return ( + + + + + + Cosmetics + + + + + + + + + + + + + + + Settings + + + } + /> + + + + + + + + ); +} \ No newline at end of file diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx index 32b5df9c6..1cdd67164 100644 --- a/src/app/features/room-settings/RoomSettings.tsx +++ b/src/app/features/room-settings/RoomSettings.tsx @@ -17,6 +17,7 @@ import { Permissions } from './permissions'; import { RoomSettingsPage } from '../../state/roomSettings'; import { useRoom } from '../../hooks/useRoom'; import { DeveloperTools } from '../common-settings/developer-tools'; +import { Cosmetics } from '../common-settings/cosmetics/Cosmetics'; type RoomSettingsMenuItem = { page: RoomSettingsPage; @@ -42,6 +43,11 @@ const useRoomSettingsMenuItems = (): RoomSettingsMenuItem[] => name: 'Permissions', icon: Icons.Lock, }, + { + page: RoomSettingsPage.CosmeticsPage, + name: 'Cosmetics', + icon: Icons.Alphabet, + }, { page: RoomSettingsPage.EmojisStickersPage, name: 'Emojis & Stickers', @@ -161,6 +167,9 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) { {activePage === RoomSettingsPage.PermissionsPage && ( )} + {activePage === RoomSettingsPage.CosmeticsPage && ( + + )} {activePage === RoomSettingsPage.EmojisStickersPage && ( )} diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 9324e1c29..303941968 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -32,7 +32,7 @@ import React, { } from 'react'; import FocusTrap from 'focus-trap-react'; import { useHover, useFocusWithin } from 'react-aria'; -import { MatrixEvent, Room } from 'matrix-js-sdk'; +import { EventTimeline, MatrixEvent, Room } from 'matrix-js-sdk'; import { Relations } from 'matrix-js-sdk/lib/models/relations'; import classNames from 'classnames'; import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types'; @@ -79,6 +79,7 @@ import { MemberPowerTag, StateEvent } from '../../../../types/matrix/room'; import { PowerIcon } from '../../../components/power'; import colorMXID from '../../../../util/colorMXID'; import { getPowerTagIconSrc } from '../../../hooks/useMemberPowerTag'; +import { AccountDataEvent } from '../../../../types/matrix/accountData'; export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void; @@ -741,7 +742,27 @@ export const Message = as<'div', MessageProps>( ? getPowerTagIconSrc(mx, useAuthentication, memberPowerTag.icon) : undefined; - const usernameColor = legacyUsernameColor ? colorMXID(senderId) : tagColor; + // Sable cosmetic username colors + const localColor = room?.getLiveTimeline() + .getState(EventTimeline.FORWARDS) + ?.getStateEvents(StateEvent.RoomCosmeticsColor, senderId) + ?.getContent()?.color; + + const parents = room?.getLiveTimeline() + .getState(EventTimeline.FORWARDS) + ?.getStateEvents(StateEvent.SpaceParent); + + let spaceColor; + if (parents && parents.length > 0) { + const parentSpaceId = parents[0].getStateKey(); + const parentSpace = mx.getRoom(parentSpaceId); + spaceColor = parentSpace?.getLiveTimeline() + .getState(EventTimeline.FORWARDS) + ?.getStateEvents(StateEvent.RoomCosmeticsColor, senderId) + ?.getContent()?.color; + } + + const usernameColor = localColor || spaceColor || (legacyUsernameColor ? colorMXID(senderId) : tagColor); const headerJSX = !collapse && ( - Cinny + Sable v4.10.3 - Yet another matrix client. + Yet another matrix client fork. diff --git a/src/app/features/settings/notifications/SystemNotification.tsx b/src/app/features/settings/notifications/SystemNotification.tsx index e0df06df9..b83fe1d36 100644 --- a/src/app/features/settings/notifications/SystemNotification.tsx +++ b/src/app/features/settings/notifications/SystemNotification.tsx @@ -27,7 +27,7 @@ function EmailNotification() { device_display_name: email, lang: 'en', data: { - brand: 'Cinny', + brand: 'Sable', }, append: true, }); diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx index e565fb92c..6343e49f9 100644 --- a/src/app/features/space-settings/SpaceSettings.tsx +++ b/src/app/features/space-settings/SpaceSettings.tsx @@ -17,6 +17,7 @@ import { Members } from '../common-settings/members'; import { DeveloperTools } from '../common-settings/developer-tools'; import { General } from './general'; import { Permissions } from './permissions'; +import { Cosmetics } from '../common-settings/cosmetics/Cosmetics'; type SpaceSettingsMenuItem = { page: SpaceSettingsPage; @@ -42,6 +43,11 @@ const useSpaceSettingsMenuItems = (): SpaceSettingsMenuItem[] => name: 'Permissions', icon: Icons.Lock, }, + { + page: SpaceSettingsPage.CosmeticsPage, + name: 'Cosmetics', + icon: Icons.Alphabet, + }, { page: SpaceSettingsPage.EmojisStickersPage, name: 'Emojis & Stickers', @@ -162,6 +168,9 @@ export function SpaceSettings({ initialPage, requestClose }: SpaceSettingsProps) {activePage === SpaceSettingsPage.PermissionsPage && ( )} + {activePage === SpaceSettingsPage.CosmeticsPage && ( + + )} {activePage === SpaceSettingsPage.EmojisStickersPage && ( )} diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index c02b0e94e..1c5e56f14 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -3,6 +3,7 @@ import { EventTimeline, IContextResponse, MatrixClient, + MatrixEvent, Method, Preset, Room, @@ -27,6 +28,7 @@ import { Membership, StateEvent } from '../../types/matrix/room'; import { getStateEvent } from '../utils/room'; import { splitWithSpace } from '../utils/common'; import { createRoomEncryptionState } from '../components/create-room'; +import { AccountDataEvent } from '../../types/matrix/accountData'; export const SHRUG = '¯\\_(ツ)_/¯'; export const TABLEFLIP = '(╯°□°)╯︵ ┻━┻'; @@ -138,6 +140,7 @@ export const parseTimestampFlag = (input: string): number | undefined => { export type CommandExe = (payload: string) => Promise; export enum Command { + // Cinny commands Me = 'me', Notice = 'notice', Shrug = 'shrug', @@ -159,6 +162,9 @@ export enum Command { UnFlip = 'unflip', Delete = 'delete', Acl = 'acl', + // Sable commands + Color = 'color', + GColor = 'gcolor' } export type CommandContent = { @@ -174,6 +180,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { const commands: CommandRecord = useMemo( () => ({ + // Cinny commands [Command.Me]: { name: Command.Me, description: 'Send action message', @@ -483,7 +490,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { [Command.Acl]: { name: Command.Acl, description: - 'Manage server access control list. Example /acl [-a servername1] [-d servername2] [-ra servername1] [-rd servername2]', + 'Manage server access control list. Example: /acl [-a servername1] [-d servername2] [-ra servername1] [-rd servername2]', exe: async (payload) => { const [, flags] = splitPayloadContentAndFlags(payload); @@ -531,6 +538,91 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { await mx.sendStateEvent(room.roomId, StateEvent.RoomServerAcl as any, aclContent); }, }, + // Sable commands + [Command.Color]: { + name: Command.Color, + description: 'Set a room-specific color. Example: /color #ff00ff | /color reset', + exe: async (payload) => { + const input = payload.trim().toLowerCase(); + const userId = mx.getSafeUserId(); + + const sendFeedback = (msg: string) => { + const localNotice = new (window as any).matrixcs.MatrixEvent({ + type: 'm.room.message', + content: { msgtype: 'm.notice', body: msg }, + event_id: `~sable-${Date.now()}`, + room_id: room.roomId, + sender: userId, + }); + (room as any).addLiveEvents([localNotice], { duplicateStrategy: 'ignore' } as any); + }; + + try { + if (input === 'reset' || input === 'clear') { + await mx.sendStateEvent(room.roomId, StateEvent.RoomCosmeticsColor as any, {}, userId); + sendFeedback('Room color has been reset.'); + return; + } + + if (/^#[0-9A-F]{6}$/i.test(input)) { + await mx.sendStateEvent(room.roomId, StateEvent.RoomCosmeticsColor as any, { color: input }, userId); + sendFeedback(`Room color set to ${input}.`); + } else { + sendFeedback('Invalid format. Use #RRGGBB.'); + } + } catch (e: any) { + if (e.errcode === 'M_FORBIDDEN') { + sendFeedback('Permission Denied. An admin must enable "Room Colors" in Settings > Cosmetics in app.sable.moe or another supported client.'); + } + } + } + }, + [Command.GColor]: { + name: Command.GColor, + description: 'Set your global color for the current Space. Example: /gcolor #ff00ff | /gcolor reset', + exe: async (payload) => { + const input = payload.trim().toLowerCase(); + const userId = mx.getSafeUserId(); + + const sendFeedback = (msg: string) => { + const localNotice = new (window as any).matrixcs.MatrixEvent({ + type: 'm.room.message', + content: { msgtype: 'm.notice', body: msg }, + event_id: `~sable-g-${Date.now()}`, + room_id: room.roomId, + sender: userId, + }); + (room as any).addLiveEvents([localNotice], { duplicateStrategy: 'ignore' } as any); + }; + + const parents = room.getLiveTimeline() + .getState(EventTimeline.FORWARDS) + ?.getStateEvents(StateEvent.SpaceParent); + + const targetSpaceId = parents && parents.length > 0 + ? parents[0].getStateKey() + : room.roomId; + + try { + if (input === 'reset' || input === 'clear') { + await mx.sendStateEvent(targetSpaceId as any, StateEvent.RoomCosmeticsColor as any, {}, userId); + sendFeedback('Global Space color reset.'); + return; + } + + if (/^#[0-9A-F]{6}$/i.test(input)) { + await mx.sendStateEvent(targetSpaceId as any, StateEvent.RoomCosmeticsColor as any, { color: input }, userId); + sendFeedback(`Global Space color set to ${input}.`); + } else { + sendFeedback('Invalid format. Use #RRGGBB.'); + } + } catch (e: any) { + if (e.errcode === 'M_FORBIDDEN') { + sendFeedback('Permission Denied. An admin must enable "Space-Wide Colors" in Settings > Cosmetics in app.sable.moe or another supported client.'); + } + } + }, + }, }), [mx, room, navigateRoom] ); diff --git a/src/app/pages/auth/AuthFooter.tsx b/src/app/pages/auth/AuthFooter.tsx index 124b0384c..1bba9adc3 100644 --- a/src/app/pages/auth/AuthFooter.tsx +++ b/src/app/pages/auth/AuthFooter.tsx @@ -5,13 +5,13 @@ import * as css from './styles.css'; export function AuthFooter() { return ( - + About diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx index 3943f42d1..d4000cc39 100644 --- a/src/app/pages/auth/AuthLayout.tsx +++ b/src/app/pages/auth/AuthLayout.tsx @@ -20,7 +20,7 @@ import { } from '../../hooks/useClientConfig'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '../paths'; -import CinnySVG from '../../../../public/res/svg/cinny.svg'; +import CinnySVG from '../../../../public/favicon.png'; import { ServerPicker } from './ServerPicker'; import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api'; import { SpecVersionsLoader } from '../../components/SpecVersionsLoader'; @@ -135,7 +135,7 @@ export function AuthLayout() {

Cinny Logo - Cinny + Sable
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx index 62f46dd2c..8d015b9d3 100644 --- a/src/app/pages/auth/login/PasswordLoginForm.tsx +++ b/src/app/pages/auth/login/PasswordLoginForm.tsx @@ -133,7 +133,7 @@ export function PasswordLoginForm({ defaultUsername, defaultEmail }: PasswordLog user: username, }, password, - initial_device_display_name: 'Cinny Web', + initial_device_display_name: 'Sable Web', }); }; @@ -151,7 +151,7 @@ export function PasswordLoginForm({ defaultUsername, defaultEmail }: PasswordLog user: mxIdUsername, }, password, - initial_device_display_name: 'Cinny Web', + initial_device_display_name: 'Sable Web', }); }; const handleEmailLogin = (email: string, password: string) => { @@ -163,7 +163,7 @@ export function PasswordLoginForm({ defaultUsername, defaultEmail }: PasswordLog address: email, }, password, - initial_device_display_name: 'Cinny Web', + initial_device_display_name: 'Sable Web', }); }; diff --git a/src/app/pages/auth/login/TokenLogin.tsx b/src/app/pages/auth/login/TokenLogin.tsx index 761d5dc53..f0a08f105 100644 --- a/src/app/pages/auth/login/TokenLogin.tsx +++ b/src/app/pages/auth/login/TokenLogin.tsx @@ -57,7 +57,7 @@ export function TokenLogin({ token }: TokenLoginProps) { startLogin(baseUrl, { type: 'm.login.token', token, - initial_device_display_name: 'Cinny Web', + initial_device_display_name: 'Sable Web', }); }, [baseUrl, token, startLogin]); diff --git a/src/app/pages/auth/register/PasswordRegisterForm.tsx b/src/app/pages/auth/register/PasswordRegisterForm.tsx index 9f1734229..464b95613 100644 --- a/src/app/pages/auth/register/PasswordRegisterForm.tsx +++ b/src/app/pages/auth/register/PasswordRegisterForm.tsx @@ -109,7 +109,7 @@ function RegisterUIAFlow({ auth: authDict, password, username, - initial_device_display_name: 'Cinny Web', + initial_device_display_name: 'Sable Web', }); }, [onRegister, formData] @@ -250,7 +250,7 @@ export function PasswordRegisterForm({ auth: { session: authData.session, }, - initial_device_display_name: 'Cinny Web', + initial_device_display_name: 'Sable Web', }); }; diff --git a/src/app/pages/client/WelcomePage.tsx b/src/app/pages/client/WelcomePage.tsx index 969a5cd4f..559a2d356 100644 --- a/src/app/pages/client/WelcomePage.tsx +++ b/src/app/pages/client/WelcomePage.tsx @@ -15,12 +15,12 @@ export function WelcomePage() { } - title="Welcome to Cinny" + title="Welcome to Sable" subTitle={ - Yet another matrix client.{' '} + Yet another matrix client fork.{' '} @@ -33,7 +33,7 @@ export function WelcomePage() {