8 Commits
Author SHA1 Message Date
litruv 7689433376 Page the open issue list so dedupe sees every check issue.
Checks / checks (push) Successful in 1m58s
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-01 03:32:37 +11:00
litruv 6e6d4322c5 Port the ESLint config to flat format and file check findings as Gitea issues.
Checks / checks (push) Successful in 2m38s
Trigger cinny-mobile / dispatch (push) Successful in 2s
2026-11-01 03:20:19 +11:00
litruv bb27305b70 Add a developer tools view for public profile fields.
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-01 02:03:29 +11:00
litruv fcbd9b4b66 Remove the unused joinNames helper from the typing indicator. 2026-11-01 02:03:23 +11:00
litruv 14f31f57c1 Add a per-user custom typing verb to the typing indicator.
The verb is a profile field (im.paarrot.typing_verb) read through the shared profile cache. The sentence builder replaces the four hardcoded branches, and the profile settings page has presets, a text input, and a live preview.
2026-11-01 01:24:59 +11:00
litruv b294bb0c06 Revert reporting the activity bar against the message in the viewport.
Trigger cinny-mobile / dispatch (push) Successful in 1s
The activity bar shows readers of the latest rendered event again. The scroll listener and the extra prop are gone.
2026-10-31 23:51:34 +11:00
litruv a6fac786b3 Fetch the TikTok oEmbed through the main process in Electron and drop the thumbnail crossOrigin.
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-10-15 23:12:55 +11:00
litruv a4e96dd01f Remove the Paarrot delivery receipt.
Trigger cinny-mobile / dispatch (push) Successful in 2s
Delivery markers (com.paarrot.received) are no longer sent or rendered; the activity bar shows only read receipts. Markers already sent to servers remain there.
2026-10-13 19:04:54 +11:00
20 changed files with 876 additions and 301 deletions
-72
View File
@@ -1,72 +0,0 @@
module.exports = {
env: {
browser: true,
es2021: true,
},
extends: [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
'airbnb',
'prettier',
],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: 'latest',
sourceType: 'module',
},
"globals": {
JSX: "readonly"
},
plugins: [
'react',
'@typescript-eslint'
],
rules: {
'linebreak-style': 0,
'no-underscore-dangle': 0,
"no-shadow": "off",
"import/prefer-default-export": "off",
"import/extensions": "off",
"import/no-unresolved": "off",
"import/no-extraneous-dependencies": [
"error",
{
devDependencies: true,
},
],
'react/no-unstable-nested-components': [
'error',
{ allowAsProps: true },
],
"react/jsx-filename-extension": [
"error",
{
extensions: [".tsx", ".jsx"],
},
],
"react/require-default-props": "off",
"react/jsx-props-no-spreading": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-shadow": "error"
},
overrides: [
{
files: ['*.ts'],
rules: {
'no-undef': 'off',
},
},
],
};
+42
View File
@@ -0,0 +1,42 @@
name: Checks
on:
push:
branches:
- main
jobs:
checks:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
cache: 'npm'
- name: Install dependencies
run: npm ci --prefer-offline
# ci-checks.sh always exits 0: findings become issues, not failed builds.
- name: Run checks
env:
API_BASE: ${{ github.server_url }}/api/v1
REPO: ${{ github.repository }}
# Prefer a PAT with issue write scope (secret: GITEA_TOKEN).
# Default GITHUB_TOKEN is usually scoped to this repo only.
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
TOKEN="${GITEA_TOKEN:-${GITHUB_TOKEN:-}}"
if [ -z "$TOKEN" ]; then
echo "No GITEA_TOKEN/GITHUB_TOKEN available to file issues"
exit 0
fi
export TOKEN
bash scripts/ci-checks.sh
+90
View File
@@ -0,0 +1,90 @@
import { createRequire } from 'node:module';
import { fixupConfigRules } from '@eslint/compat';
import globals from 'globals';
import js from '@eslint/js';
import airbnb from 'eslint-config-airbnb';
import prettier from 'eslint-config-prettier';
import tsParser from '@typescript-eslint/parser';
import tsPlugin from '@typescript-eslint/eslint-plugin';
import importPlugin from 'eslint-plugin-import';
import jsxAllyPlugin from 'eslint-plugin-jsx-a11y';
import reactPlugin from 'eslint-plugin-react';
import reactHooksPlugin from 'eslint-plugin-react-hooks';
const require = createRequire(import.meta.url);
// Config entries without `files` only match .js/.mjs, so every entry needs the same file set.
const files = ['**/*.js', '**/*.mjs', '**/*.cjs', '**/*.ts', '**/*.tsx'];
// eslint-config-airbnb 19 is legacy-only: `extends` are paths to rule modules and flat config
// rejects `extends`/`env`/`parserOptions`, so take their rules and set the env here instead.
const airbnbRules = (config) => (config.extends || []).flatMap((p) => airbnbRules(require(p))).concat(config);
// Plugins are registered once (redefining a plugin is an error) and fixed up so the legacy
// rules that call context.getFilename still work.
export default [
...fixupConfigRules([
{
files,
plugins: {
react: reactPlugin,
'react-hooks': reactHooksPlugin,
'@typescript-eslint': tsPlugin,
import: importPlugin,
'jsx-a11y': jsxAllyPlugin,
},
languageOptions: {
parser: tsParser,
ecmaVersion: 'latest',
sourceType: 'module',
globals: { ...globals.browser, ...globals.es2021, JSX: 'readonly' },
},
},
]),
...[
js.configs.recommended,
reactPlugin.configs.flat.recommended,
reactHooksPlugin.configs.flat.recommended,
tsPlugin.configs['flat/eslint-recommended'],
tsPlugin.configs['flat/recommended'],
...airbnbRules(airbnb),
prettier,
{
rules: {
'linebreak-style': 0,
'no-underscore-dangle': 0,
"no-shadow": "off",
"import/prefer-default-export": "off",
"import/extensions": "off",
"import/no-unresolved": "off",
"import/no-extraneous-dependencies": [
"error",
{
devDependencies: true,
},
],
'react/no-unstable-nested-components': [
'error',
{ allowAsProps: true },
],
"react/jsx-filename-extension": [
"error",
{
extensions: [".tsx", ".jsx"],
},
],
"react/require-default-props": "off",
"react/jsx-props-no-spreading": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-shadow": "error"
},
},
].flatMap((config) => (Array.isArray(config) ? config : [config]).map((config) => ({ files, rules: config.rules || {}, ...(config.settings ? { settings: config.settings } : {}) }))),
{ files: ['*.ts'], rules: { 'no-undef': 'off' } },
];
+58
View File
@@ -85,6 +85,8 @@
},
"devDependencies": {
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@eslint/compat": "2.1.1",
"@eslint/js": "10.0.1",
"@monaco-editor/react": "4.7.0",
"@rollup/plugin-inject": "5.0.5",
"@rollup/plugin-wasm": "6.2.2",
@@ -109,6 +111,7 @@
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "7.1.1",
"globals": "17.13.0",
"monaco-editor": "0.52.2",
"prettier": "3.9.4",
"typescript": "6.0.3",
@@ -2260,6 +2263,27 @@
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/@eslint/compat": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-2.1.1.tgz",
"integrity": "sha512-rMcy8GSrwNzcISX/BlTDY/GLB4eCopEuy9woIls3To+15OLxykZrxxq+WUcylCPCQ6F4MujjBM1DX5V1aqI3Vw==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"@eslint/core": "^1.2.1"
},
"engines": {
"node": "^20.19.0 || ^22.13.0 || >=24"
},
"peerDependencies": {
"eslint": "^8.40 || 9 || 10"
},
"peerDependenciesMeta": {
"eslint": {
"optional": true
}
}
},
"node_modules/@eslint/config-array": {
"version": "0.23.5",
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
@@ -2340,6 +2364,27 @@
"node": "^20.19.0 || ^22.13.0 || >=24"
}
},
"node_modules/@eslint/js": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz",
"integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==",
"dev": true,
"license": "MIT",
"engines": {
"node": "^20.19.0 || ^22.13.0 || >=24"
},
"funding": {
"url": "https://eslint.org/donate"
},
"peerDependencies": {
"eslint": "^10.0.0"
},
"peerDependenciesMeta": {
"eslint": {
"optional": true
}
}
},
"node_modules/@eslint/object-schema": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
@@ -7332,6 +7377,19 @@
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/globals": {
"version": "17.13.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-17.13.0.tgz",
"integrity": "sha512-RwMTC61u7hrG3ZJMkZQOK4JLJrKS8QtoTii63EmWvFXHqycY9FObBJQCbsLxSO8kjKhWE5kV1GC+Vb1g3RI0Zg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/globalthis": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+3
View File
@@ -97,6 +97,8 @@
},
"devDependencies": {
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@eslint/compat": "2.1.1",
"@eslint/js": "10.0.1",
"@monaco-editor/react": "4.7.0",
"@rollup/plugin-inject": "5.0.5",
"@rollup/plugin-wasm": "6.2.2",
@@ -121,6 +123,7 @@
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "7.1.1",
"globals": "17.13.0",
"monaco-editor": "0.52.2",
"prettier": "3.9.4",
"typescript": "6.0.3",
+84
View File
@@ -0,0 +1,84 @@
#!/usr/bin/env bash
# Files one open Gitea issue per rule key, deduped by the marker line in the issue body.
# Never exits non-zero: findings are reported, not enforced.
set -u
API_BASE="${API_BASE:?API_BASE is required}"
REPO="${REPO:?REPO is required}"
TOKEN="${TOKEN:?TOKEN is required}"
LABEL="ci-checks"
SHOW="${SHOW:-50}"
cd "$(dirname "$0")/.."
WORK=$(mktemp -d)
trap 'rm -rf "$WORK"' EXIT
FINDINGS="$WORK/findings.tsv"
: > "$FINDINGS"
# key<TAB>violation, one line per finding.
npx eslint src --format json > "$WORK/eslint.json" || true
jq -r --arg root "$PWD" '.[] | .filePath as $f | .messages[] | select(.ruleId) | "eslint/" + .ruleId + "\t" + (($f | ltrimstr($root + "/")) + ":" + (.line | tostring))' "$WORK/eslint.json" >> "$FINDINGS"
npx prettier --check . > "$WORK/prettier.log" 2>&1 || true
sed -nE 's/^\[warn\] (.*)$/prettier\t\1/p' "$WORK/prettier.log" >> "$FINDINGS"
npx tsc --noEmit > "$WORK/tsc.log" 2>&1 || true
sed -nE 's/^(.*)\(([0-9]+),([0-9]+)\): error (TS[0-9]+):.*/tsc\/\4\t\1(\2,\3)/p' "$WORK/tsc.log" >> "$FINDINGS"
api() { # api METHOD PATH [JSON] -> response body on stdout, non-zero on HTTP failure
local method=$1 path=$2 data=${3-} code
code=$(curl -sS -o "$WORK/resp" -w '%{http_code}' -X "$method" \
-H "Authorization: token $TOKEN" -H 'Content-Type: application/json' \
${data:+-d "$data"} "$API_BASE/repos/$REPO$path") || return 1
case "$code" in
200 | 201) cat "$WORK/resp" ;;
*) echo "HTTP $code $method $path: $(cat "$WORK/resp")" >&2; return 1 ;;
esac
}
body() { # body KEY HASH VIOLATIONS_FILE
printf '<!-- ci-check: %s -->\n<!-- ci-check-hash: %s -->\n\n`%s`: %d violations.\n\n```text\n' \
"$1" "$2" "$1" "$(wc -l < "$3")"
head -n "$SHOW" "$3"
printf '```\n'
}
LABEL_ID=$(api GET "/labels?limit=100" | jq -r --arg n "$LABEL" '[.[] | select(.name == $n) | .id] | first // empty')
if [ -z "$LABEL_ID" ]; then
LABEL_ID=$(api POST "/labels" "$(jq -n --arg n "$LABEL" '{name: $n, color: "006060"}')" | jq -r '.id')
fi
# Gitea caps per_page at 50, so paging is required or dedupe misses issues past the first page.
# Accumulate as JSONL: passing the accumulated set as a jq program argument overflows argv.
OPEN="$WORK/open.jsonl"
: > "$OPEN"
for page in 1 2 3 4 5 6 7 8; do
api GET "/issues?state=open&limit=50&page=$page" | jq -c --arg l "$LABEL" '[.[] | select((.labels // []) | any(.name == $l))]' > "$WORK/page.json"
n=$(jq -r 'length' "$WORK/page.json")
[ -z "$n" ] && break
jq -c '.[]' "$WORK/page.json" >> "$OPEN"
[ "$n" -lt 50 ] && break
done
for key in $(cut -f1 "$FINDINGS" | sort -u); do
vf="$WORK/violations.tsv"
awk -F'\t' -v k="$key" '$1 == k' "$FINDINGS" | sort > "$vf"
hash=$(sha256sum < "$vf" | cut -d' ' -f1)
row=$(jq -c --arg k "$key" 'select((.body // "") | contains("<!-- ci-check: " + $k + " -->"))' "$OPEN" | head -1)
if [ -z "$row" ]; then
api POST "/issues" "$(jq -n --arg t "ci-check: $key" --arg b "$(body "$key" "$hash" "$vf")" --argjson l "$LABEL_ID" '{title: $t, body: $b, labels: [$l]}')" > /dev/null
elif ! echo "$row" | jq -e --arg h "$hash" '(.body // "") | contains("<!-- ci-check-hash: " + $h + " -->")' > /dev/null; then
api PATCH "/issues/$(jq -r '.number' <<< "$row")" "$(jq -n --arg b "$(body "$key" "$hash" "$vf")" '{body: $b}')" > /dev/null
fi
done
jq -r '[((.body // "") | capture("<!-- ci-check: (?<k>[^ ]+) -->").k), .number] | @tsv' "$OPEN" > "$WORK/keys.tsv"
while IFS=$'\t' read -r key number; do
if ! grep -qF -- "$key"$'\t' "$FINDINGS"; then
api PATCH "/issues/$number" '{"state": "closed"}' > /dev/null
fi
done < "$WORK/keys.tsv"
exit 0
+12 -11
View File
@@ -62,11 +62,17 @@ async function fetchTikTokOEmbed(url: string): Promise<{
videoId: string | null;
} | null> {
try {
const oembedUrl = `${TIKTOK_OEMBED_API}?url=${encodeURIComponent(url)}`;
const response = await fetch(oembedUrl);
if (!response.ok) return null;
const data = await response.json();
const electron = (window as any).electron;
let data;
if (electron?.tiktok?.getOEmbed) {
data = await electron.tiktok.getOEmbed(url);
} else {
const oembedUrl = `${TIKTOK_OEMBED_API}?url=${encodeURIComponent(url)}`;
const response = await fetch(oembedUrl);
if (!response.ok) return null;
data = await response.json();
}
if (!data) return null;
return {
title: data.title || 'TikTok Video',
@@ -224,12 +230,7 @@ export const TikTokEmbed = as<'div', TikTokEmbedProps>(({ url, ...props }, ref)
aria-label="Play TikTok video"
>
{state.thumbnailUrl ? (
<img
src={state.thumbnailUrl}
alt={state.title}
className={css.TikTokThumbnail}
crossOrigin="anonymous"
/>
<img src={state.thumbnailUrl} alt={state.title} className={css.TikTokThumbnail} />
) : null}
</button>
</Box>
+1 -31
View File
@@ -362,7 +362,6 @@ type RoomTimelineProps = {
eventId?: string;
roomInputRef: RefObject<HTMLElement>;
editor: Editor;
onViewportAnchorChange?: (eventId?: string) => void;
};
const PAGINATION_LIMIT = 80;
@@ -565,13 +564,7 @@ const getRoomUnreadInfo = (room: Room, scrollTo = false) => {
};
};
export function RoomTimeline({
room,
eventId,
roomInputRef,
editor,
onViewportAnchorChange,
}: RoomTimelineProps) {
export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimelineProps) {
const mx = useMatrixClient();
const useAuthentication = useMediaAuthentication();
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
@@ -1196,29 +1189,6 @@ export function RoomTimeline({
};
}, [room.roomId, eventId, persistTimelineScroll]);
// Report the message the user is actually looking at, so the activity bar
// reflects the shown message instead of the newest event in the room.
useEffect(() => {
if (!onViewportAnchorChange) return undefined;
const scrollEl = scrollRef.current;
if (!scrollEl) return undefined;
let raf = 0;
const report = () => {
window.cancelAnimationFrame(raf);
raf = window.requestAnimationFrame(() => {
onViewportAnchorChange(eventId ?? getViewportAnchorEventId() ?? getRangeCenterEventId());
});
};
report();
scrollEl.addEventListener('scroll', report, { passive: true });
return () => {
window.cancelAnimationFrame(raf);
scrollEl.removeEventListener('scroll', report);
};
}, [onViewportAnchorChange, eventId, getViewportAnchorEventId, getRangeCenterEventId]);
// Restore saved scroll or default to bottom on first open.
useLayoutEffect(() => {
const scrollEl = scrollRef.current;
+2 -4
View File
@@ -1,4 +1,4 @@
import React, { useCallback, useRef, useState } from 'react';
import React, { useCallback, useRef } from 'react';
import { Box, Text, config } from 'folds';
import { EventType, Room } from 'matrix-js-sdk';
import { ReactEditor } from 'slate-react';
@@ -65,7 +65,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
const roomViewRef = useRef<HTMLDivElement>(null);
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
const [viewportEventId, setViewportEventId] = useState<string>();
const { roomId } = room;
const editor = useEditor();
@@ -118,11 +117,10 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
eventId={eventId}
roomInputRef={roomInputRef}
editor={editor}
onViewportAnchorChange={setViewportEventId}
/>
<div className={roomViewCss.RoomViewBottomFloat}>
<RoomViewTyping room={room} />
{!hideActivity && <RoomViewFollowing room={room} eventId={viewportEventId} />}
{!hideActivity && <RoomViewFollowing room={room} />}
</div>
</Box>
<Box shrink="No" direction="Column">
+11 -24
View File
@@ -11,7 +11,6 @@ import * as css from './RoomViewFollowing.css';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { useRoomLatestRenderedEvent } from '../../hooks/useRoomLatestRenderedEvent';
import { useRoomEventReaders } from '../../hooks/useRoomEventReaders';
import { useRoomEventDelivery } from '../../hooks/useRoomEventDelivery';
import { EventReaders } from '../../components/event-readers';
import { stopPropagation } from '../../utils/keyboard';
@@ -21,29 +20,21 @@ export function RoomViewFollowingPlaceholder() {
export type RoomViewFollowingProps = {
room: Room;
/** Message the user is looking at. Falls back to the latest rendered event. */
eventId?: string;
};
export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
({ className, room, eventId, ...props }, ref) => {
({ className, room, ...props }, ref) => {
const mx = useMatrixClient();
const myUserId = mx.getUserId();
const [open, setOpen] = useState(false);
const latestEvent = useRoomLatestRenderedEvent(room);
const shownEventId = eventId ?? latestEvent?.getId();
const latestEventReaders = useRoomEventReaders(room, shownEventId);
const received = useRoomEventDelivery(room, shownEventId, myUserId);
const eventId = latestEvent?.getId();
const latestEventReaders = useRoomEventReaders(room, eventId);
// Received but not read shows a single tick, read shows the double tick.
const receivedOnly = received && !latestEventReaders.includes(myUserId);
const getName = (userId: string) =>
getMemberDisplayName(room, userId) ?? getMxIdLocalPart(userId) ?? userId;
const names = [
...(receivedOnly && myUserId ? [myUserId] : []),
...latestEventReaders.filter((readerId) => readerId !== myUserId),
].map(getName);
const names = latestEventReaders
.filter((readerId) => readerId !== myUserId)
.map(
(readerId) => getMemberDisplayName(room, readerId) ?? getMxIdLocalPart(readerId) ?? readerId
);
if (names.length === 0) {
return null;
@@ -51,7 +42,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
return (
<>
{shownEventId && (
{eventId && (
<Overlay open={open} backdrop={<OverlayBackdrop />}>
<OverlayCenter>
<FocusTrap
@@ -63,7 +54,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
}}
>
<Modal variant="Surface" size="300">
<EventReaders room={room} eventId={shownEventId} requestClose={() => setOpen(false)} />
<EventReaders room={room} eventId={eventId} requestClose={() => setOpen(false)} />
</Modal>
</FocusTrap>
</OverlayCenter>
@@ -79,11 +70,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
{...props}
ref={ref}
>
<Icon
style={{ opacity: config.opacity.P300 }}
size="100"
src={receivedOnly ? Icons.Check : Icons.CheckTwice}
/>
<Icon style={{ opacity: config.opacity.P300 }} size="100" src={Icons.CheckTwice} />
<Text size="T300" truncate>
{names.length === 1 && <b>{names[0]}</b>}
{names.length === 2 && (
+40 -61
View File
@@ -11,6 +11,9 @@ import { getMxIdLocalPart } from '../../utils/matrix';
import * as css from './RoomViewTyping.css';
import { useMatrixClient } from '../../hooks/useMatrixClient';
import { useRoomTypingMember } from '../../hooks/useRoomTypingMembers';
import { useTypingVerbs } from '../../hooks/useUserTypingVerb';
const DEFAULT_VERB = 'typing';
export type RoomViewTypingProps = {
room: Room;
@@ -21,17 +24,40 @@ export const RoomViewTyping = as<'div', RoomViewTypingProps>(
const mx = useMatrixClient();
const typingMembers = useRoomTypingMember(room.roomId);
const typingNames = typingMembers
const typers = typingMembers
.filter((receipt) => receipt.userId !== mx.getUserId())
.map(
(receipt) => getMemberDisplayName(room, receipt.userId) ?? getMxIdLocalPart(receipt.userId)
)
.map((receipt) => ({
userId: receipt.userId,
name: getMemberDisplayName(room, receipt.userId) ?? getMxIdLocalPart(receipt.userId),
}))
.reverse();
if (typingNames.length === 0) {
const verbs = useTypingVerbs(typers.map((typer) => typer.userId));
if (typers.length === 0) {
return null;
}
const entries = typers.slice(0, 3).map((typer) => ({
name: typer.name,
verb: verbs[typer.userId],
plural: false,
}));
if (typers.length > 3) {
entries.push({ name: `${typers.length - 3} others`, verb: undefined, plural: true });
}
// One verb for everyone keeps the joined form; mixed verbs need a clause per person
const firstVerb = verbs[typers[0].userId];
const sameVerb = typers.every((typer) => verbs[typer.userId] === firstVerb);
const clauses = entries.map((entry) => ({
name: entry.name,
suffix: `${entry.plural ? 'are' : 'is'} ${entry.verb ?? DEFAULT_VERB}`,
}));
const sharedSuffix = sameVerb
? ` ${entries.length > 1 ? 'are' : 'is'} ${firstVerb ?? DEFAULT_VERB}`
: undefined;
const handleDropAll = () => {
// some homeserver does not timeout typing status
// we have given option so user can drop their typing status
@@ -54,62 +80,15 @@ export const RoomViewTyping = as<'div', RoomViewTypingProps>(
>
<TypingIndicator />
<Text className={css.TypingText} size="T300" truncate>
{typingNames.length === 1 && (
<>
<b>{typingNames[0]}</b>
<Text as="span" size="Inherit" priority="300">
{' is typing...'}
</Text>
</>
)}
{typingNames.length === 2 && (
<>
<b>{typingNames[0]}</b>
<Text as="span" size="Inherit" priority="300">
{' and '}
</Text>
<b>{typingNames[1]}</b>
<Text as="span" size="Inherit" priority="300">
{' are typing...'}
</Text>
</>
)}
{typingNames.length === 3 && (
<>
<b>{typingNames[0]}</b>
<Text as="span" size="Inherit" priority="300">
{', '}
</Text>
<b>{typingNames[1]}</b>
<Text as="span" size="Inherit" priority="300">
{' and '}
</Text>
<b>{typingNames[2]}</b>
<Text as="span" size="Inherit" priority="300">
{' are typing...'}
</Text>
</>
)}
{typingNames.length > 3 && (
<>
<b>{typingNames[0]}</b>
<Text as="span" size="Inherit" priority="300">
{', '}
</Text>
<b>{typingNames[1]}</b>
<Text as="span" size="Inherit" priority="300">
{', '}
</Text>
<b>{typingNames[2]}</b>
<Text as="span" size="Inherit" priority="300">
{' and '}
</Text>
<b>{typingNames.length - 3} others</b>
<Text as="span" size="Inherit" priority="300">
{' are typing...'}
</Text>
</>
)}
{clauses.map((clause, index) => (
<React.Fragment key={index}>
{index > 0 && (index === clauses.length - 1 ? ' and ' : ', ')}
<b>{clause.name}</b>
{!sharedSuffix && ` ${clause.suffix}`}
</React.Fragment>
))}
{sharedSuffix}
{'...'}
</Text>
<IconButton title="Drop Typing Status" size="300" radii="Pill" onClick={handleDropAll}>
<Icon size="50" src={Icons.Cross} />
@@ -41,10 +41,14 @@ import { CollectiblesSection } from './CollectiblesSection';
import { useUserCollectibles } from '../../../hooks/useUserCollectibles';
import { pickAvatarDecorationUrl } from '../../../utils/collectibleAssets';
import * as avatarDecorationCss from '../../../styles/AvatarDecoration.css';
import { useUserTypingVerb } from '../../../hooks/useUserTypingVerb';
import { TypingIndicator } from '../../../components/typing-indicator';
import {
ColorPreference,
hasColorPreference,
parseTypingVerb,
resolveColorForTheme,
TYPING_VERB_PRESETS,
} from '../../../utils/profileFields';
/**
@@ -142,6 +146,44 @@ function ProfileBanner({ avatarRef, nameRef }: { avatarRef: React.RefObject<HTML
setSavingColor(false);
};
const [typingVerb, setTypingVerb, typingVerbLoading] = useUserTypingVerb();
const [localVerb, setLocalVerb] = useState('');
const [savingVerb, setSavingVerb] = useState(false);
const [verbError, setVerbError] = useState<string>();
useEffect(() => {
setLocalVerb(typingVerb ?? '');
}, [typingVerb]);
const handleVerbSave = async () => {
const parsed = parseTypingVerb(localVerb);
if (!parsed) {
setVerbError('Use letters, numbers and single spaces only.');
return;
}
setSavingVerb(true);
setVerbError(undefined);
try {
await setTypingVerb(parsed);
} catch (e) {
setVerbError('Failed to save typing verb. Server may not support profile fields (MSC4133).');
}
setSavingVerb(false);
};
const handleVerbRemove = async () => {
setSavingVerb(true);
setVerbError(undefined);
try {
await setTypingVerb(undefined);
setLocalVerb('');
} catch (e) {
setVerbError('Failed to remove typing verb');
}
setSavingVerb(false);
};
const [isEditingName, setIsEditingName] = useState(false);
const [editedName, setEditedName] = useState(profile.displayName || '');
const [savingName, setSavingName] = useState(false);
@@ -1024,6 +1066,101 @@ function ProfileBanner({ avatarRef, nameRef }: { avatarRef: React.RefObject<HTML
)}
</Box>
{/* Paarrot custom typing verb */}
<Box
direction="Column"
gap="300"
style={{
padding: config.space.S400,
border: `${toRem(1)} solid ${color.Surface.ContainerLine}`,
borderRadius: toRem(8),
width: '100%',
boxSizing: 'border-box',
}}
>
<Text size="H6">Typing verb</Text>
<Box gap="200" wrap="Wrap" alignItems="Center">
{TYPING_VERB_PRESETS.map((preset) => (
<Box
key={preset}
as="button"
onClick={() => {
setLocalVerb(preset);
setVerbError(undefined);
}}
style={{
backgroundColor: color.Surface.Container,
border: `${toRem(1)} solid ${color.Surface.ContainerLine}`,
padding: `${toRem(4)} ${toRem(8)}`,
borderRadius: toRem(16),
cursor: 'pointer',
}}
>
<Text size="B300">{preset}</Text>
</Box>
))}
</Box>
<Input
size="300"
variant="Secondary"
style={{ width: '100%' }}
value={localVerb}
onChange={(e) => {
setLocalVerb(e.target.value);
setVerbError(undefined);
}}
placeholder="Custom typing verb..."
maxLength={48}
/>
<Box gap="200" alignItems="Center">
<Avatar size="300">
<UserAvatar
userId={userId}
src={avatarUrl}
alt={userId}
renderFallback={() => <Icon size="200" src={Icons.User} filled />}
/>
</Avatar>
<TypingIndicator />
<Text size="T300">
<b>{profile.displayName || getMxIdLocalPart(userId)}</b>
{` is ${parseTypingVerb(localVerb) ?? 'typing'}...`}
</Text>
</Box>
<Box gap="200" alignItems="Center" wrap="Wrap">
<Button
size="300"
variant="Primary"
fill="Solid"
radii="300"
onClick={handleVerbSave}
disabled={savingVerb || typingVerbLoading}
>
<Text size="B300">{savingVerb ? 'Saving...' : 'Save verb'}</Text>
</Button>
{typingVerb && (
<Button
size="300"
variant="Critical"
fill="Soft"
radii="300"
onClick={handleVerbRemove}
disabled={savingVerb}
>
<Text size="B300">Remove verb</Text>
</Button>
)}
</Box>
{verbError && (
<Text size="T200" style={{ color: color.Critical.Main }}>{verbError}</Text>
)}
</Box>
<Box
direction="Column"
gap="300"
@@ -1,5 +1,6 @@
import React, { useCallback, useState } from 'react';
import { Box, Text, IconButton, Scroll, Switch, Button } from 'folds';
import { Box, Text, IconButton, Scroll, Switch, Button, Modal, Overlay, OverlayBackdrop, OverlayCenter } from 'folds';
import FocusTrap from 'focus-trap-react';
import { Icon, Icons } from '../../../components/icons';
import { Page, PageContent, PageHeader } from '../../../components/page';
import { SequenceCard } from '../../../components/sequence-card';
@@ -12,8 +13,12 @@ import {
AccountDataEditor,
AccountDataSubmitCallback,
} from '../../../components/AccountDataEditor';
import { TextViewer } from '../../../components/text-viewer';
import { copyToClipboard } from '../../../utils/dom';
import { stopPropagation } from '../../../utils/keyboard';
import { clearProfileCache } from '../../../utils/profileCache';
import { AccountData } from './AccountData';
import { ProfileFields } from './ProfileFields';
type DeveloperToolsProps = {
requestClose: () => void;
@@ -23,6 +28,67 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
const [developerTools, setDeveloperTools] = useSetting(settingsAtom, 'developerTools');
const [expand, setExpend] = useState(false);
const [accountDataType, setAccountDataType] = useState<string | null>();
const [profileExpand, setProfileExpand] = useState(false);
const [profileUserId, setProfileUserId] = useState(mx.getUserId() ?? '');
const [profileFields, setProfileFields] = useState<Record<string, unknown>>({});
const [profileSupported, setProfileSupported] = useState(false);
const [profileFieldKey, setProfileFieldKey] = useState<string | null>();
const profileEditable = profileSupported && profileUserId.trim() === mx.getUserId();
const fetchProfileFields = useCallback(async (userId: string) => {
if (!userId) return;
try {
const supported = await mx.doesServerSupportExtendedProfiles();
setProfileSupported(supported);
setProfileFields(
supported
? await mx.getExtendedProfile(userId)
: ((await mx.getProfileInfo(userId)) as Record<string, unknown>),
);
} catch (err) {
console.error('Failed to fetch profile fields:', err);
setProfileSupported(false);
setProfileFields({});
}
}, [mx]);
const submitProfileField: AccountDataSubmitCallback = useCallback(
async (key, content) => {
await mx.setExtendedProfileProperty(key, content);
setProfileFields((prev) => ({ ...prev, [key]: content }));
// The rest of the client reads through the shared profile cache
clearProfileCache(profileUserId.trim());
},
[mx, profileUserId]
);
const deleteProfileField = useCallback(
async (key: string) => {
try {
await mx.deleteExtendedProfileProperty(key);
setProfileFields((prev) => {
const next = { ...prev };
delete next[key];
return next;
});
// The rest of the client reads through the shared profile cache
clearProfileCache(profileUserId.trim());
} catch (err) {
console.error('Failed to delete profile field:', err);
}
},
[mx, profileUserId]
);
const handleProfileExpand = useCallback(
(expand: boolean) => {
setProfileExpand(expand);
if (expand) fetchProfileFields(profileUserId.trim());
},
[fetchProfileFields, profileUserId]
);
const submitAccountData: AccountDataSubmitCallback = useCallback(
async (type, content) => {
@@ -42,6 +108,8 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
);
}
const closeProfileField = useCallback(() => setProfileFieldKey(undefined), []);
return (
<Page>
<PageHeader outlined={false}>
@@ -109,6 +177,18 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
</SequenceCard>
)}
</Box>
{developerTools && (
<ProfileFields
userId={profileUserId}
fields={profileFields}
editable={profileEditable}
expand={profileExpand}
onUserIdChange={setProfileUserId}
onExpandToggle={handleProfileExpand}
onSelect={setProfileFieldKey}
onDelete={deleteProfileField}
/>
)}
{developerTools && (
<AccountData
expand={expand}
@@ -120,6 +200,38 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
</PageContent>
</Scroll>
</Box>
{profileFieldKey !== undefined && (
<Overlay open backdrop={<OverlayBackdrop />}>
<OverlayCenter>
<FocusTrap
focusTrapOptions={{
initialFocus: false,
clickOutsideDeactivates: true,
onDeactivate: closeProfileField,
escapeDeactivates: stopPropagation,
}}
>
<Modal size="500" variant="Surface">
{profileEditable ? (
<AccountDataEditor
type={profileFieldKey}
content={profileFields[profileFieldKey] as object}
submitChange={submitProfileField}
requestClose={closeProfileField}
/>
) : (
<TextViewer
name={profileFieldKey}
text={JSON.stringify(profileFields[profileFieldKey], null, 2)}
langName="json"
requestClose={closeProfileField}
/>
)}
</Modal>
</FocusTrap>
</OverlayCenter>
</Overlay>
)}
</Page>
);
}
@@ -0,0 +1,109 @@
import { Box, Text, Button, Input, MenuItem, IconButton } from 'folds';
import { Icon, Icons } from '../../../components/icons';
import { SequenceCard } from '../../../components/sequence-card';
import { SequenceCardStyle } from '../styles.css';
import { SettingTile } from '../../../components/setting-tile';
import { CutoutCard } from '../../../components/cutout-card';
type ProfileFieldsProps = {
userId: string;
fields: Record<string, unknown>;
editable: boolean;
expand: boolean;
onUserIdChange: (userId: string) => void;
onExpandToggle: (expand: boolean) => void;
onSelect: (key: string) => void;
onDelete: (key: string) => void;
};
export function ProfileFields({
userId,
fields,
editable,
expand,
onUserIdChange,
onExpandToggle,
onSelect,
onDelete,
}: ProfileFieldsProps) {
return (
<Box direction="Column" gap="100">
<Text size="L400">Public Profile Fields</Text>
<SequenceCard
className={SequenceCardStyle}
variant="SurfaceVariant"
direction="Column"
gap="400"
>
<SettingTile
title="Public Profile Fields"
description="Extended profile fields (MSC4133) as the server returns them, not through the client profile cache. Editable only when the user is you and the server supports MSC4133."
after={
<Button
onClick={() => onExpandToggle(!expand)}
variant="Secondary"
fill="Soft"
size="300"
radii="300"
outlined
before={
<Icon src={expand ? Icons.ChevronTop : Icons.ChevronBottom} size="100" filled />
}
>
<Text size="B300">{expand ? 'Collapse' : 'Expand'}</Text>
</Button>
}
/>
<Input
size="300"
variant="Secondary"
style={{ width: '100%' }}
value={userId}
onChange={(e) => onUserIdChange(e.target.value)}
placeholder="@user:server"
/>
{expand && (
<Box direction="Column" gap="100">
<Box justifyContent="SpaceBetween">
<Text size="L400">Fields</Text>
<Text size="L400">Total: {Object.keys(fields).length}</Text>
</Box>
<CutoutCard>
{Object.keys(fields).sort().map((key) => (
<MenuItem
key={key}
variant="Surface"
fill="None"
size="300"
radii="0"
after={
<Box gap="100" alignItems="Center">
{editable && (
<IconButton
size="200"
radii="Round"
title={`Delete ${key}`}
onClick={() => onDelete(key)}
>
<Icon size="50" src={Icons.Cross} />
</IconButton>
)}
<Icon size="50" src={Icons.ChevronRight} />
</Box>
}
onClick={() => onSelect(key)}
>
<Box grow="Yes">
<Text size="T200" truncate>
{key}
</Text>
</Box>
</MenuItem>
))}
</CutoutCard>
</Box>
)}
</SequenceCard>
</Box>
);
}
@@ -126,6 +126,11 @@ export const SETTINGS_SEARCH_CATALOG: SettingsSearchEntry[] = [
},
{ page: SettingsPages.DeveloperToolsPage, title: 'Access Token', keywords: ['auth', 'secret'] },
{ page: SettingsPages.DeveloperToolsPage, title: 'Account Data', keywords: ['global', 'events'] },
{
page: SettingsPages.DeveloperToolsPage,
title: 'Public Profile Fields',
keywords: ['profile', 'msc4133', 'json'],
},
// About
{ page: SettingsPages.AboutPage, title: 'Clear Cache & Reload', keywords: ['reset', 'storage'] },
-35
View File
@@ -1,35 +0,0 @@
import { useEffect, useState } from 'react';
import { MatrixEvent, Room, RoomEvent } from 'matrix-js-sdk';
import { PAARROT_RECEIVED_EVENT, hasReceivedMarker } from '../utils/paarrotDelivery';
/**
* Whether `userId` has recorded a delivery marker for `eventId` - received, but
* not necessarily read. Read state still comes from the read receipt.
*/
export const useRoomEventDelivery = (room: Room, eventId?: string, userId?: string): boolean => {
const [received, setReceived] = useState(() =>
eventId && userId ? hasReceivedMarker(room, eventId, userId) : false,
);
useEffect(() => {
setReceived(eventId && userId ? hasReceivedMarker(room, eventId, userId) : false);
if (!eventId || !userId) return;
const update = () => setReceived(hasReceivedMarker(room, eventId, userId));
const handleTimeline = (event: MatrixEvent, r: Room) => {
if (r.roomId !== room.roomId) return;
if (event.getRelation()?.event_id !== eventId) return;
if (event.getType() !== PAARROT_RECEIVED_EVENT && !event.isRedaction()) return;
update();
};
room.on(RoomEvent.Timeline, handleTimeline);
return () => {
room.removeListener(RoomEvent.Timeline, handleTimeline);
};
}, [room, eventId, userId]);
return received;
};
+114
View File
@@ -0,0 +1,114 @@
import { useCallback, useEffect, useState } from 'react';
import { useMatrixClient } from './useMatrixClient';
import {
PROFILE_KEY_TYPING_VERB,
deleteTypingVerb,
parseTypingVerb,
saveTypingVerb,
} from '../utils/profileFields';
import {
getCachedProfileFields,
getProfileFields,
registerProfileCacheListener,
} from '../utils/profileCache';
/**
* Hook to manage the user's custom typing verb on their global profile.
*/
export function useUserTypingVerb(): [
string | undefined,
(verb: string | undefined) => Promise<void>,
boolean
] {
const mx = useMatrixClient();
const [verb, setVerb] = useState<string | undefined>();
const [loading, setLoading] = useState(true);
useEffect(() => {
const userId = mx.getUserId();
if (!userId) {
setLoading(false);
return undefined;
}
let cancelled = false;
const load = async () => {
setLoading(true);
try {
const fields = await getProfileFields(mx, userId);
const loaded = parseTypingVerb(fields[PROFILE_KEY_TYPING_VERB]);
if (!cancelled) setVerb(loaded);
} catch (e) {
console.error('Failed to load typing verb:', e);
if (!cancelled) setVerb(undefined);
}
if (!cancelled) setLoading(false);
};
load();
return () => {
cancelled = true;
};
}, [mx]);
const updateVerb = useCallback(
async (newVerb: string | undefined) => {
const parsed = parseTypingVerb(newVerb);
if (!parsed) {
await deleteTypingVerb(mx);
setVerb(undefined);
return;
}
await saveTypingVerb(mx, parsed);
setVerb(parsed);
},
[mx]
);
return [verb, updateVerb, loading];
}
/** Typing verb for a user already in the shared profile cache. */
export function getCachedTypingVerb(userId: string): string | undefined {
const fields = getCachedProfileFields(userId);
return fields ? parseTypingVerb(fields[PROFILE_KEY_TYPING_VERB]) : undefined;
}
/**
* Typing verbs for a group of users. Hooks cannot be called per typing user, so this
* reads the shared profile cache and re-renders when a cache entry arrives. Only cache
* misses are fetched.
*/
export function useTypingVerbs(userIds: string[]): Record<string, string | undefined> {
const mx = useMatrixClient();
const [, setTick] = useState(0);
const key = userIds.join(',');
useEffect(() => {
if (!key) return undefined;
let cancelled = false;
const unsubscribe = registerProfileCacheListener(() => setTick((tick) => tick + 1));
for (const userId of key.split(',')) {
if (getCachedProfileFields(userId)) continue;
// setProfileCache does not notify listeners, so a fresh fetch has to re-render here
getProfileFields(mx, userId)
.then(() => {
if (!cancelled) setTick((tick) => tick + 1);
})
.catch(() => undefined);
}
return () => {
cancelled = true;
unsubscribe();
};
}, [mx, key]);
const verbs: Record<string, string | undefined> = {};
for (const userId of userIds) verbs[userId] = getCachedTypingVerb(userId);
return verbs;
}
@@ -22,7 +22,6 @@ import {
getOrphanParents,
guessPerfectParent,
} from '../../utils/room';
import { sendReceivedMarker } from '../../utils/paarrotDelivery';
import { NotificationType, UnreadInfo } from '../../../types/matrix/room';
import { getMxIdLocalPart, mxcUrlToHttp, getCanonicalAliasOrRoomId } from '../../utils/matrix';
import { mDirectAtom } from '../../state/mDirectList';
@@ -388,14 +387,6 @@ function MessageNotifications() {
(notificationType === NotificationType.Default && !isDm);
if (mentionsOnly && unreadInfo.highlight === 0) return;
// Record that Paarrot received this message. This is the single tick; the
// read receipt below is what turns it into the double tick.
if (showNotifications) {
sendReceivedMarker(mx, room, eventId).catch((error) => {
console.error('[PaarrotDelivery] Failed to send delivery marker:', error);
});
}
if (
showNotifications &&
((isTauri() && !isElectron()) || isCapacitorNative() || notificationPermission('granted'))
-53
View File
@@ -1,53 +0,0 @@
import { MatrixClient, RelationType, Room } from 'matrix-js-sdk';
/**
* Client-defined event marking that Paarrot has received a message.
*
* The spec has no delivery receipt type - Synapse only accepts `m.read`,
* `m.read.private` and `m.fully_read` on the receipts endpoint - so delivery is
* recorded as a custom event related to the target message with `m.reference`.
*
* It never shows in the cinny timeline (events with a relation are skipped
* unless "show hidden events" is on), and other clients only see an unknown
* event. Delivery is always self-reported: in E2EE, only the receiving client
* can know it actually got the event.
*/
export const PAARROT_RECEIVED_EVENT = 'com.paarrot.received';
export const getReceivedContent = (eventId: string) => ({
'm.relates_to': {
event_id: eventId,
rel_type: RelationType.Reference,
},
});
export const getEventDeliveryRelations = (room: Room, eventId: string) =>
room
.getUnfilteredTimelineSet()
.relations.getChildEventsForEvent(eventId, RelationType.Reference, PAARROT_RECEIVED_EVENT);
export const hasReceivedMarker = (room: Room, eventId: string, userId: string): boolean => {
const relations = getEventDeliveryRelations(room, eventId);
if (!relations) return false;
return relations
.getRelations()
.some(
(rel) =>
!rel.isRedacted() && rel.getSender() === userId && rel.getRelation()?.event_id === eventId,
);
};
/**
* Sends the delivery marker for `eventId`. Skips events that are still local
* echoes (no `$` id yet) and events this user already marked, so a room that
* re-syncs does not spam markers.
*/
export async function sendReceivedMarker(mx: MatrixClient, room: Room, eventId: string) {
const userId = mx.getUserId();
if (!userId || !eventId.startsWith('$')) return false;
if (hasReceivedMarker(room, eventId, userId)) return false;
await mx.sendEvent(room.roomId, PAARROT_RECEIVED_EVENT, getReceivedContent(eventId));
return true;
}
+55
View File
@@ -23,6 +23,38 @@ export const PROFILE_KEY_NAMEPLATE = 'im.paarrot.nameplate';
/** Paarrot avatar decoration (avatar frame) */
export const PROFILE_KEY_AVATAR_DECORATION = 'im.paarrot.avatar_decoration';
/** Paarrot custom typing verb (shown in the typing indicator) */
export const PROFILE_KEY_TYPING_VERB = 'im.paarrot.typing_verb';
export const TYPING_VERB_PRESETS: string[] = [
'typing',
'cooking',
'thinking',
'plotting',
'brewing',
'sketching',
'humming',
'whispering',
'doodling',
'lurking',
'scheming',
'daydreaming',
];
const TYPING_VERB_MAX_LENGTH = 48;
/** Profile data arrives as unknown from the homeserver, so it is validated here. */
export function parseTypingVerb(value: unknown): string | undefined {
if (typeof value !== 'string') return undefined;
const verb = value
.replace(/[^a-zA-Z0-9 ]/g, '')
.replace(/ {2,}/g, ' ')
.trim();
if (!verb || verb.length > TYPING_VERB_MAX_LENGTH) return undefined;
return verb;
}
export type StoredCollectible = {
sku_id: string;
name: string;
@@ -230,3 +262,26 @@ export async function deleteColorPreference(mx: MatrixClient): Promise<void> {
const userId = mx.getUserId();
if (userId) clearProfileCache(userId);
}
export async function saveTypingVerb(mx: MatrixClient, verb: string): Promise<void> {
if (!(await mx.doesServerSupportExtendedProfiles())) {
throw new Error('Server does not support extended profile fields (MSC4133)');
}
const value = parseTypingVerb(verb);
if (!value) throw new Error('Invalid typing verb');
await mx.setExtendedProfileProperty(PROFILE_KEY_TYPING_VERB, value);
const userId = mx.getUserId();
if (userId) clearProfileCache(userId);
}
export async function deleteTypingVerb(mx: MatrixClient): Promise<void> {
if (!(await mx.doesServerSupportExtendedProfiles())) {
throw new Error('Server does not support extended profile fields (MSC4133)');
}
await mx.deleteExtendedProfileProperty(PROFILE_KEY_TYPING_VERB);
const userId = mx.getUserId();
if (userId) clearProfileCache(userId);
}