Merge branch 'master' into zach-starter

1 files changed, 4 insertions, 67 deletions

diff --git a/src/server/Message.ts b/src/server/Message.ts
index 03150c841..01a42fc68 100644
--- a/src/server/Message.ts
+++ b/src/server/Message.ts
@@ -1,5 +1,6 @@
 import * as uuid from 'uuid';
 import { Point } from '../pen-gestures/ndollar';
+import { serverOpType } from '../fields/ObjectField';
 
 function GenerateDeterministicGuid(seed: string): string {
     return uuid.v5(seed, uuid.v5.URL);
@@ -22,52 +23,12 @@ export class Message<T> {
     }
 }
 
-export enum Types {
-    Number,
-    List,
-    Key,
-    Image,
-    Web,
-    Document,
-    Text,
-    Icon,
-    RichText,
-    DocumentReference,
-    Html,
-    Video,
-    Audio,
-    Ink,
-    PDF,
-    Tuple,
-    Boolean,
-    Script,
-    Templates,
-}
-
-export interface Transferable {
-    readonly id: string;
-    readonly type: Types;
-    readonly data?: any;
-}
-
-export enum YoutubeQueryTypes {
-    Channels,
-    SearchVideo,
-    VideoDetails,
-}
-
-export interface YoutubeQueryInput {
-    readonly type: YoutubeQueryTypes;
-    readonly userInput?: string;
-    readonly videoIds?: string;
-}
-
 export interface Reference {
     readonly id: string;
 }
 
 export interface Diff extends Reference {
-    readonly diff: any;
+    readonly diff: serverOpType;
 }
 
 export interface GestureContent {
@@ -77,23 +38,6 @@ export interface GestureContent {
     readonly color?: string;
 }
 
-export interface MobileInkOverlayContent {
-    readonly enableOverlay: boolean;
-    readonly width?: number;
-    readonly height?: number;
-    readonly text?: string;
-}
-
-export interface UpdateMobileInkOverlayPositionContent {
-    readonly dx?: number;
-    readonly dy?: number;
-    readonly dsize?: number;
-}
-
-export interface MobileDocumentUploadContent {
-    readonly docId: string;
-}
-
 export interface RoomMessage {
     readonly message: string;
     readonly room: string;
@@ -102,23 +46,16 @@ export interface RoomMessage {
 export namespace MessageStore {
     export const Foo = new Message<string>('Foo');
     export const Bar = new Message<string>('Bar');
-    export const SetField = new Message<Transferable>('Set Field'); // send Transferable (no reply)
-    export const GetField = new Message<string>('Get Field'); // send string 'id' get Transferable back
-    export const GetFields = new Message<string[]>('Get Fields'); // send string[] of 'id' get Transferable[] back
     export const GetDocument = new Message<string>('Get Document');
-    export const DeleteAll = new Message<any>('Delete All');
+    export const DeleteAll = new Message<unknown>('Delete All');
     export const ConnectionTerminated = new Message<string>('Connection Terminated');
 
     export const GesturePoints = new Message<GestureContent>('Gesture Points');
-    export const MobileInkOverlayTrigger = new Message<MobileInkOverlayContent>('Trigger Mobile Ink Overlay');
-    export const UpdateMobileInkOverlayPosition = new Message<UpdateMobileInkOverlayPositionContent>('Update Mobile Ink Overlay Position');
-    export const MobileDocumentUpload = new Message<MobileDocumentUploadContent>('Upload Document From Mobile');
 
     export const GetRefField = new Message<string>('Get Ref Field');
     export const GetRefFields = new Message<string[]>('Get Ref Fields');
     export const UpdateField = new Message<Diff>('Update Ref Field');
-    export const CreateField = new Message<Reference>('Create Ref Field');
-    export const YoutubeApiQuery = new Message<YoutubeQueryInput>('Youtube Api Query');
+    export const CreateDocField = new Message<Reference>('Create Ref Field');
     export const DeleteField = new Message<string>('Delete field');
     export const DeleteFields = new Message<string[]>('Delete fields');