mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
Merge branch 'dev' into feat/tauri-desktop
# Conflicts: # src/app/pages/client/ClientNonUIFeatures.tsx # src/app/utils/presence.ts # src/client/presenceSync.ts
This commit is contained in:
4 files changed
+22
-37
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Fix presence status resetting to "online".
|
||||
@@ -130,14 +130,16 @@ function getUnreadTotals(roomToUnread: RoomToUnread) {
|
||||
return { total, highlightTotal, notification, highlight };
|
||||
}
|
||||
|
||||
// Show the mention count in the tab title.
|
||||
// Updates document.title with an unread count.
|
||||
function PageTitleUpdater() {
|
||||
const roomToUnread = useAtomValue(roomToUnreadAtom);
|
||||
const [faviconForMentionsOnly] = useSetting(settingsAtom, 'faviconForMentionsOnly');
|
||||
|
||||
useEffect(() => {
|
||||
const { highlightTotal } = getUnreadTotals(roomToUnread);
|
||||
document.title = highlightTotal > 0 ? `(${highlightTotal}) Sable Client` : 'Sable Client';
|
||||
}, [roomToUnread]);
|
||||
const { total, highlightTotal } = getUnreadTotals(roomToUnread);
|
||||
const count = faviconForMentionsOnly ? highlightTotal : total;
|
||||
document.title = count > 0 ? `(${count}) Sable Client` : 'Sable Client';
|
||||
}, [roomToUnread, faviconForMentionsOnly]);
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -905,9 +907,7 @@ function PresenceFeature() {
|
||||
// Passing undefined restores the default (online); Offline suppresses broadcasting.
|
||||
const syncPresence = sendPresence ? undefined : SetPresence.Offline;
|
||||
mx.setSyncPresence(syncPresence);
|
||||
const presenceManager = getPresenceSyncManager(mx);
|
||||
presenceManager?.setPresence(syncPresence);
|
||||
presenceManager?.setPresenceEnabled(sendPresence);
|
||||
getPresenceSyncManager(mx)?.setPresenceEnabled(sendPresence);
|
||||
}, [mx, sendPresence]);
|
||||
|
||||
return null;
|
||||
|
||||
@@ -17,10 +17,10 @@ export const setUserPresence = async (
|
||||
presence: Presence,
|
||||
statusMsg?: string
|
||||
): Promise<void> => {
|
||||
const syncPresence = presenceToSetPresence(presence);
|
||||
getPresenceSyncManager(mx)?.setPresence(syncPresence);
|
||||
const setPresence = presenceToSetPresence(presence);
|
||||
getPresenceSyncManager(mx)?.setDesiredPresence(setPresence);
|
||||
await Promise.all([
|
||||
mx.setSyncPresence(syncPresence),
|
||||
mx.setSyncPresence(setPresence),
|
||||
mx.setPresence({
|
||||
presence,
|
||||
status_msg: statusMsg,
|
||||
|
||||
@@ -26,11 +26,7 @@ export class PresenceSyncManager {
|
||||
|
||||
private enabled = true;
|
||||
|
||||
private started = false;
|
||||
|
||||
private presence = SetPresence.Online;
|
||||
|
||||
private restartAfterRequest = false;
|
||||
private desiredSetPresence = SetPresence.Online;
|
||||
|
||||
private activeRequest: Promise<void> | null = null;
|
||||
|
||||
@@ -53,40 +49,27 @@ export class PresenceSyncManager {
|
||||
this.enabled = enabled;
|
||||
|
||||
if (!enabled) {
|
||||
this.restartAfterRequest = false;
|
||||
if (this.nextPollTimer !== undefined) clearTimeout(this.nextPollTimer);
|
||||
this.nextPollTimer = undefined;
|
||||
this.abortController?.abort();
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.started && !this.activeRequest && !this.disposed) this.poll();
|
||||
if (!this.activeRequest && !this.disposed) this.poll();
|
||||
}
|
||||
|
||||
public setPresence(presence: SetPresence = SetPresence.Online): void {
|
||||
if (this.presence === presence) return;
|
||||
this.presence = presence;
|
||||
|
||||
if (!this.started || !this.enabled || this.disposed) return;
|
||||
if (this.activeRequest) {
|
||||
this.restartAfterRequest = true;
|
||||
this.abortController?.abort();
|
||||
} else {
|
||||
this.poll();
|
||||
}
|
||||
public setDesiredPresence(presence: SetPresence): void {
|
||||
this.desiredSetPresence = presence;
|
||||
}
|
||||
|
||||
public start(): void {
|
||||
if (this.disposed || this.started) return;
|
||||
this.started = true;
|
||||
if (!this.enabled) return;
|
||||
if (this.disposed || this.activeRequest || !this.enabled) return;
|
||||
this.poll();
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
this.disposed = true;
|
||||
this.enabled = false;
|
||||
this.started = false;
|
||||
if (this.nextPollTimer !== undefined) clearTimeout(this.nextPollTimer);
|
||||
this.nextPollTimer = undefined;
|
||||
this.abortController?.abort();
|
||||
@@ -165,7 +148,7 @@ export class PresenceSyncManager {
|
||||
filter: filterId,
|
||||
since: this.syncToken,
|
||||
timeout: this.pollTimeoutMs,
|
||||
set_presence: this.presence,
|
||||
set_presence: this.desiredSetPresence,
|
||||
},
|
||||
undefined,
|
||||
{ abortSignal: signal }
|
||||
@@ -191,10 +174,7 @@ export class PresenceSyncManager {
|
||||
this.activeRequest = null;
|
||||
this.abortController = undefined;
|
||||
|
||||
if (this.restartAfterRequest && this.started && this.enabled && !this.disposed) {
|
||||
this.restartAfterRequest = false;
|
||||
this.poll();
|
||||
} else if (this.started && this.enabled && !this.disposed) {
|
||||
if (this.enabled && !this.disposed) {
|
||||
this.nextPollTimer = setTimeout(() => {
|
||||
this.nextPollTimer = undefined;
|
||||
this.poll();
|
||||
|
||||
Reference in new issue
Block a user