diff --git a/app/definitions/IRoom.ts b/app/definitions/IRoom.ts index 3c28b71a5..21d57db23 100644 --- a/app/definitions/IRoom.ts +++ b/app/definitions/IRoom.ts @@ -1,7 +1,7 @@ -import { Observable } from 'rxjs'; import Model from '@nozbe/watermelondb/Model'; import { IRocketChatRecord } from './IRocketChatRecord'; +import { ISubscriptions } from './ISubscriptions'; export enum RoomType { GROUP = 'p', @@ -12,7 +12,7 @@ export enum RoomType { E2E_MESSAGE_TYPE = 'e2e' } -export interface IRoom extends IRocketChatRecord { +export interface IRoom extends IRocketChatRecord, ISubscriptions { rid: string; t: RoomType; name: string; @@ -26,9 +26,8 @@ export interface IRoom extends IRocketChatRecord { visitor?: boolean; autoTranslateLanguage?: boolean; autoTranslate?: boolean; - observe?(): Observable; usedCannedResponse?: string; - bannerClosed?: boolean; + bannerClosed: boolean; lastOpen?: Date; draftMessage?: string; } diff --git a/app/definitions/ISubscriptions.ts b/app/definitions/ISubscriptions.ts index cd9ae19fd..cf4494d7c 100644 --- a/app/definitions/ISubscriptions.ts +++ b/app/definitions/ISubscriptions.ts @@ -9,6 +9,16 @@ export interface ISubscriptions { tunread: string; tunreadUser: string; tunreadGroup: string; + joinCodeRequired: boolean; + alert: boolean; + userMentions: object; + ls: Date; + jitsiTimeout: number; + ignored: any; + announcement: string; + sysMes: string; + archived: string; + broadcast: string; } export type TSubscriptionsModel = ISubscriptions & Model;