Adapt Membership usage for the change to an enum KnownMembership

This commit is contained in:
Andy Balaam 2024-03-12 14:52:54 +00:00
parent da99bad7b9
commit 34559d2a89
115 changed files with 764 additions and 593 deletions

View file

@ -15,7 +15,13 @@ limitations under the License.
*/
import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib";
import { EventType, KNOWN_SAFE_ROOM_VERSION, MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
import {
EventType,
KNOWN_SAFE_ROOM_VERSION,
KnownMembership,
MatrixClient,
MatrixEvent,
} from "matrix-js-sdk/src/matrix";
import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../src/models/LocalRoom";
import { determineCreateRoomEncryptionOption, Member } from "../../../src/utils/direct-messages";
@ -76,7 +82,7 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
type: EventType.RoomMember,
content: {
displayname: userId,
membership: MembershipJoin,
membership: KnownMembership.Join,
},
state_key: userId,
user_id: userId,
@ -93,7 +99,7 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
content: {
displayname: target.name,
avatar_url: target.getMxcAvatarUrl() ?? undefined,
membership: Membership.Invite,
membership: KnownMembership.Invite,
isDirect: true,
},
state_key: target.userId,
@ -108,7 +114,7 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
content: {
displayname: target.name,
avatar_url: target.getMxcAvatarUrl() ?? undefined,
membership: Membership.Join,
membership: KnownMembership.Join,
},
state_key: target.userId,
sender: target.userId,
@ -118,7 +124,7 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
});
localRoom.targets = targets;
localRoom.updateMyMembership(Membership.Join);
localRoom.updateMyMembership(KnownMembership.Join);
localRoom.addLiveEvents(events);
localRoom.currentState.setStateEvents(events);
localRoom.name = localRoom.getDefaultRoomName(client.getUserId()!);