LotusGuild/cinny
3
0
Fork 0
Code Issues 27 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lotus' into fix/status-expiry-account-data
CI / Build & Quality Checks (pull_request) Failing after 1m49s
Details
CI / Trigger Desktop Build (pull_request) Skipped
Details
CI / Docker image build & smoke test (pull_request) Skipped
Details
CI / Playwright smoke (e2e) (pull_request) Skipped
Details
CI / Secret scan (gitleaks) (pull_request) Successful in 9s
Details

Browse Source 
# Conflicts:
#	src/app/pages/client/ClientNonUIFeatures.tsx
#	src/types/matrix/accountData.ts
This commit is contained in:
Lotus CI
2026-10-18 23:20:44 -04:00
parent c8576cbb1f d7bc6d94bb
commit e4b2405a19
101 changed files with 2298 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/types/matrix/accountData.ts
+3
View File
@@ -29,6 +29,9 @@ export enum AccountDataEvent {
// [Gitea #300] When the status message auto-clears: { status_msg, expires_at },
// so any Lotus device can clear it (not only the one that set it).
LotusStatusExpiry = 'io.lotus.status_expiry',
// [Gitea #333] Timed mutes: { timers: { [roomId]: unmuteAt } }, so any Lotus
// device can lift a mute set on another.
LotusMuteTimers = 'io.lotus.mute_timers',
SecretStorageDefaultKey = 'm.secret_storage.default_key',