Skip to content

Change event shape to match MSC3898 #2964

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

Merged
merged 5 commits into from
Dec 12, 2022
Merged

Change event shape to match MSC3898 #2964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
416344c
Change event shape to match MSC3898
SimonBrandner Dec 10, 2022
e0d42b1
Update some formatting
SimonBrandner Dec 12, 2022
b8f04bd
Remove unsubscribed tracks
SimonBrandner Dec 12, 2022
8bec5fa
Delint
SimonBrandner Dec 12, 2022
01db22e
Be smarter when receiving m.negotiate
SimonBrandner Dec 12, 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
5 changes: 5 additions & 0 deletions src/@types/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export enum EventType {
RoomMessage = "m.room.message",
RoomMessageEncrypted = "m.room.encrypted",
Sticker = "m.sticker",

CallInvite = "m.call.invite",
CallCandidates = "m.call.candidates",
CallAnswer = "m.call.answer",
Expand All @@ -54,6 +55,10 @@ export enum EventType {
CallReplaces = "m.call.replaces",
CallAssertedIdentity = "m.call.asserted_identity",
CallAssertedIdentityPrefix = "org.matrix.call.asserted_identity",
CallTrackSubscription = "m.call.track_subscription",
CallPing = "m.call.ping",
CallPong = "m.call.pong",

KeyVerificationRequest = "m.key.verification.request",
KeyVerificationStart = "m.key.verification.start",
KeyVerificationCancel = "m.key.verification.cancel",
Expand Down
24 changes: 13 additions & 11 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,10 +1774,12 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
public getFoci(): IFocusInfo[] {
if (!this.localSfuUserId || !this.localSfuDeviceId) return [];

return [{
user_id: this.localSfuUserId,
device_id: this.localSfuDeviceId,
}];
return [
{
user_id: this.localSfuUserId,
device_id: this.localSfuDeviceId,
},
];
}

/**
Expand Down Expand Up @@ -9332,13 +9334,13 @@ export function fixNotificationCountOnDecryption(cli: MatrixClient, event: Matri
const thread = room.getThread(event.threadRootId);
hasReadEvent = thread
? thread.hasUserReadEvent(cli.getUserId()!, event.getId()!)
// If the thread object does not exist in the room yet, we don't
// want to calculate notification for this event yet. We have not
// restored the read receipts yet and can't accurately calculate
// highlight notifications at this stage.
//
// This issue can likely go away when MSC3874 is implemented
: true;
: // If the thread object does not exist in the room yet, we don't
// want to calculate notification for this event yet. We have not
// restored the read receipts yet and can't accurately calculate
// highlight notifications at this stage.
//
// This issue can likely go away when MSC3874 is implemented
true;
} else {
hasReadEvent = room.hasUserReadEvent(cli.getUserId()!, event.getId()!);
}
Expand Down
Loading