Merge branch 'develop' into export-conversations

2021-09-22 18:07:01 +05:30
parent b49c8ebf60 b13fdb698c
commit 94e4fb71c1
498 changed files with 13790 additions and 23008 deletions
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -93,6 +93,26 @@ declare global {
        mxSetupEncryptionStore?: SetupEncryptionStore;
        mxRoomScrollStateStore?: RoomScrollStateStore;
        mxOnRecaptchaLoaded?: () => void;
+        electron?: Electron;
+    }
+
+    interface DesktopCapturerSource {
+        id: string;
+        name: string;
+        thumbnailURL: string;
+    }
+
+    interface GetSourcesOptions {
+        types: Array<string>;
+        thumbnailSize?: {
+            height: number;
+            width: number;
+        };
+        fetchWindowIcons?: boolean;
+    }
+
+    interface Electron {
+        getDesktopCapturerSources(options: GetSourcesOptions): Promise<Array<DesktopCapturerSource>>;
    }

    interface Document {