Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sync init when thread unread notif is not supported #2739

Merged
merged 10 commits into from
Oct 7, 2022
Merged

Fix sync init when thread unread notif is not supported #2739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
476f2c9
Add better feature detection on MatrixClient start
germain-gg Oct 7, 2022
0ab369b
Only set unread thread notification when server support is advertised
germain-gg Oct 7, 2022
5da1d7f
fix strict null checks
germain-gg Oct 7, 2022
5c7f471
fix strict null checks
germain-gg Oct 7, 2022
6e6d730
strict null checks
germain-gg Oct 7, 2022
ef6e5fa
Use optional chaining
Oct 7, 2022
bfadf01
Use unread thread notification unstable value
germain-gg Oct 7, 2022
b2d5f79
Better granularity on feature support
germain-gg Oct 7, 2022
32ac04c
fix
germain-gg Oct 7, 2022
9c8cac8
Rename experimental to unstable
germain-gg Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion spec/unit/filter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { UNREAD_THREAD_NOTIFICATIONS } from "../../src/@types/sync";
import { Filter, IFilterDefinition } from "../../src/filter";

describe("Filter", function() {
Expand Down Expand Up @@ -50,7 +51,7 @@ describe("Filter", function() {
expect(filter.getDefinition()).toEqual({
room: {
timeline: {
unread_thread_notifications: true,
[UNREAD_THREAD_NOTIFICATIONS.name]: true,
},
},
});
Expand Down
12 changes: 11 additions & 1 deletion src/filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
EventType,
RelationType,
} from "./@types/event";
import { UNREAD_THREAD_NOTIFICATIONS } from "./@types/sync";
import { FilterComponent, IFilterComponent } from "./filter-component";
import { MatrixEvent } from "./models/event";

Expand Down Expand Up @@ -227,7 +228,16 @@ export class Filter {
* @param {boolean} enabled
*/
public setUnreadThreadNotifications(enabled: boolean): void {
setProp(this.definition, "room.timeline.unread_thread_notifications", !!enabled);
this.definition = {
...this.definition,
room: {
...this.definition?.room,
timeline: {
...this.definition?.room?.timeline,
[UNREAD_THREAD_NOTIFICATIONS.name]: !!enabled,
germain-gg marked this conversation as resolved.
Show resolved Hide resolved
},
},
};
}

setLazyLoadMembers(enabled: boolean): void {
Expand Down