Merge remote-tracking branch 'upstream/dev' into feat/element-call

src/types/matrix/accountData.ts

@@ -18,6 +18,8 @@ export enum AccountDataEvent {
   MegolmBackupV1 = 'm.megolm_backup.v1',
 }
 
+export type MDirectContent = Record<string, string[]>;
+
 export type SecretStorageDefaultKeyContent = {
   key: string;
 };

src/types/matrix/room.ts

@@ -1,3 +1,5 @@
+import { IImageInfo } from './common';
+
 export enum Membership {
   Invite = 'invite',
   Knock = 'knock',
@@ -50,6 +52,7 @@ export enum MessageEvent {
 
 export enum RoomType {
   Space = 'm.space',
+  Call = 'org.matrix.msc3417.call',
 }
 
 export type MSpaceChildContent = {
@@ -70,8 +73,9 @@ export type IRoomCreateContent = {
   ['m.federate']?: boolean;
   room_version: string;
   type?: string;
+  additional_creators?: string[];
   predecessor?: {
-    event_id: string;
+    event_id?: string;
     room_id: string;
   };
 };
@@ -95,3 +99,13 @@ export type MuteChanges = {
   added: string[];
   removed: string[];
 };
+
+export type MemberPowerTagIcon = {
+  key?: string;
+  info?: IImageInfo;
+};
+export type MemberPowerTag = {
+  name: string;
+  color?: string;
+  icon?: MemberPowerTagIcon;
+};