Skip to content

Commit

Permalink
Remove merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
backspace committed Mar 10, 2025
1 parent 259f9e5 commit d5b930a
Showing 1 changed file with 0 additions and 69 deletions.
69 changes: 0 additions & 69 deletions packages/base/matrix-event.gts
Original file line number Diff line number Diff line change
Expand Up @@ -345,75 +345,6 @@ interface FileRemovedEventContent {
removed: string;
}

export interface RealmServerEvent extends BaseMatrixEvent {
type: 'm.room.message';
content: RealmServerEventContent;
}

export interface RealmServerEventContent {
msgtype: typeof APP_BOXEL_REALM_SERVER_EVENT_MSGTYPE;
body: string;
}

export interface RealmEvent extends BaseMatrixEvent {
type: typeof APP_BOXEL_REALM_EVENT_TYPE;
content: RealmEventContent;
}

export type RealmEventContent =
| IndexRealmEventContent
| UpdateRealmEventContent;

export type IndexRealmEventContent =
| IncrementalIndexEventContent
| FullIndexEventContent
| CopiedIndexEventContent
| IncrementalIndexInitiationContent;

export interface IncrementalIndexEventContent {
eventName: 'index';
indexType: 'incremental';
invalidations: string[];
clientRequestId?: string | null;
}

interface FullIndexEventContent {
eventName: 'index';
indexType: 'full';
}

interface CopiedIndexEventContent {
eventName: 'index';
indexType: 'copy';
sourceRealmURL: string;
}

interface IncrementalIndexInitiationContent {
eventName: 'index';
indexType: 'incremental-index-initiation';
updatedFile: string;
}

export type UpdateRealmEventContent =
| FileAddedEventContent
| FileUpdatedEventContent
| FileRemovedEventContent;

interface FileAddedEventContent {
eventName: 'update';
added: string;
}

interface FileUpdatedEventContent {
eventName: 'update';
updated: string;
}

interface FileRemovedEventContent {
eventName: 'update';
removed: string;
}

export type MatrixEvent =
| RoomCreateEvent
| RoomJoinRules
Expand Down

0 comments on commit d5b930a

Please sign in to comment.