fixes and fixes

Author: morethanwords

.gitignore

@@ -4,4 +4,5 @@ __pycache__
 dist
 .DS_Store
 stats.json
-certs
+certs
+src/rlottie.github.io

public/rlottie-wasm.js

@@ -50,9 +50,10 @@ export class SearchGroup {
 
 export default class AppSearch {
   private minMsgID = 0;
-  private loadedCount = 0;
-  private foundCount = 0;
+  private loadedCount = -1;
+  private foundCount = -1;
   private offsetRate = 0;
+  private loadedContacts = false;
 
   private searchPromise: Promise<void> = null;
   private searchTimeout: number = 0;
@@ -107,9 +108,10 @@ export default class AppSearch {
     }
 
     this.minMsgID = 0;
-    this.loadedCount = 0;
-    this.foundCount = 0;
+    this.loadedCount = -1;
+    this.foundCount = -1;
     this.offsetRate = 0;
+    this.loadedContacts = false;
 
     for(let i in this.searchGroups) {
       this.searchGroups[i].clear();
@@ -129,25 +131,27 @@ export default class AppSearch {
   public searchMore() {
     if(this.searchPromise) return this.searchPromise;
 
-    let query = this.query;
+    const query = this.query;
 
     if(!query.trim()) {
       this.onSearch && this.onSearch(0);
       return;
     }
 
-    if(this.loadedCount != 0 && this.loadedCount >= this.foundCount) {
+    if(this.foundCount != -1 && this.loadedCount >= this.foundCount) {
       return Promise.resolve();
     }
 
-    let maxID = appMessagesIDsManager.getMessageIDInfo(this.minMsgID)[0];
+    const maxID = appMessagesIDsManager.getMessageIDInfo(this.minMsgID)[0] || 0;
 
-    if(!this.peerID && !maxID) {
+    if(!this.peerID && !maxID && !this.loadedContacts) {
       appUsersManager.searchContacts(query, 20).then((contacts: any) => {
         if(this.searchInput.value != query) {
           return;
         }
 
+        this.loadedContacts = true;
+
         ///////this.log('input search contacts result:', contacts);
 
         let setResults = (results: any, group: SearchGroup, showMembersCount = false) => {
@@ -205,19 +209,19 @@ export default class AppSearch {
         return;
       }
 
-      //console.log('input search result:', this.peerID, query, null, maxID, 20, res);
+      console.log('input search result:', this.peerID, query, null, maxID, 20, res);
 
-      let {count, history, next_rate} = res;
+      const {count, history, next_rate} = res;
 
       if(history[0] == this.minMsgID) {
         history.shift();
       }
 
-      let searchGroup = this.searchGroups['messages'];
+      const searchGroup = this.searchGroups['messages'];
       searchGroup.setActive();
 
       history.forEach((msgID: number) => {
-        let message = appMessagesManager.getMessage(msgID);
+        const message = appMessagesManager.getMessage(msgID);
         let originalDialog = appMessagesManager.getDialogByPeerID(message.peerID)[0];
 
         if(!originalDialog) {
@@ -230,15 +234,18 @@ export default class AppSearch {
           } as any;
         }
 
-        let {dialog, dom} = appDialogsManager.addDialog(originalDialog, this.scrollable/* searchGroup.list */, false);
+        const {dialog, dom} = appDialogsManager.addDialog(originalDialog, this.scrollable/* searchGroup.list */, false);
         appDialogsManager.setLastMessage(dialog, message, dom, query);
       });
 
       this.minMsgID = history[history.length - 1];
       this.offsetRate = next_rate;
       this.loadedCount += history.length;
+      if(this.loadedCount == -1) {
+        this.loadedCount = 0;
+      }
 
-      if(!this.foundCount) {
+      if(this.foundCount == -1) {
         this.foundCount = count;
         this.onSearch && this.onSearch(this.foundCount);
       }

public/rlottie-wasm.wasm

@@ -208,7 +208,7 @@ export class AppSelectPeers {
   }
 
   public add(peerID: any, title?: string) {
-    console.trace('add');
+    //console.trace('add');
     const div = document.createElement('div');
     div.classList.add('selector-user', 'scale-in');
 

public/rlottie_with_printf/rlottie-wasm.js

@@ -271,6 +271,7 @@ function wrapAudio(doc: MTDocument, audioEl: AudioElement) {
 
 export default class AudioElement extends HTMLElement {
   public audio: HTMLAudioElement;
+  public preloader: ProgressivePreloader;
 
   private attachedHandlers: {[name: string]: any[]} = {};
   private onTypeDisconnect: () => void;
@@ -303,7 +304,7 @@ export default class AudioElement extends HTMLElement {
     const audioTimeDiv = this.querySelector('.audio-time') as HTMLDivElement;
     audioTimeDiv.innerHTML = durationStr;
 
-    let preloader: ProgressivePreloader;
+    let preloader: ProgressivePreloader = this.preloader;
     let promise: CancellablePromise<Blob>;
 
     const onLoad = () => {
@@ -377,7 +378,8 @@ export default class AudioElement extends HTMLElement {
       this.addEventListener('click', onClick);
       this.click();
     } else {
-      onLoad();
+      this.preloader.attach(this.querySelector('.audio-download'), false);
+      //onLoad();
     }
   }
 
@@ -402,6 +404,8 @@ export default class AudioElement extends HTMLElement {
 
       delete this.attachedHandlers[name];
     }
+
+    this.preloader = null;
   }
 
   static get observedAttributes(): string[] {

public/rlottie_with_printf/rlottie-wasm.wasm

@@ -151,7 +151,7 @@ export class ChatInput {
           }).then((webpage: any) => {
             appWebPagesManager.saveWebPage(webpage);
             if(this.lastUrl != url) return;
-            console.log('got webpage: ', webpage);
+            //console.log('got webpage: ', webpage);
 
             this.setTopInfo(webpage.site_name || webpage.title, webpage.description || webpage.url);
 
@@ -235,7 +235,7 @@ export class ChatInput {
       return new Promise<HTMLDivElement>((resolve, reject) => {
         let params: SendFileParams = {};
         params.file = file;
-        console.log('selected file:', file, typeof(file), willAttach);
+        //console.log('selected file:', file, typeof(file), willAttach);
         let itemDiv = document.createElement('div');
         switch(willAttach.type) {
           case 'media': {
@@ -249,6 +249,8 @@ export class ChatInput {
               source.src = params.objectURL = URL.createObjectURL(file);
               video.autoplay = false;
               video.controls = false;
+              video.muted = true;
+              video.setAttribute('playsinline', '');
 
               video.onloadeddata = () => {
                 params.width = video.videoWidth;
@@ -283,6 +285,8 @@ export class ChatInput {
               type: file.type.indexOf('image/') !== -1 ? 'photo' : 'doc'
             } as any, false, true);
 
+            params.objectURL = URL.createObjectURL(file);
+
             itemDiv.append(docDiv);
             resolve(itemDiv);
             break;
@@ -364,7 +368,7 @@ export class ChatInput {
               this.attachMediaPopUp.mediaContainer.append(div);
             }
 
-            console.log('chatInput album layout:', layout);
+            //console.log('chatInput album layout:', layout);
           } else {
             let params = willAttach.sendFileDetails[0];
             let div = results[0];
@@ -407,11 +411,13 @@ export class ChatInput {
     }, false);
 
     this.attachMenu.media.addEventListener('click', () => {
+      this.fileInput.setAttribute('accept', 'image/*, video/*');
       willAttach.type = 'media';
       this.fileInput.click();
     });
 
     this.attachMenu.document.addEventListener('click', () => {
+      this.fileInput.removeAttribute('accept');
       willAttach.type = 'document';
       this.fileInput.click();
     });
@@ -451,7 +457,7 @@ export class ChatInput {
       let caption = this.attachMediaPopUp.captionInput.value;
       willAttach.isMedia = willAttach.type == 'media';
 
-      console.log('will send files with options:', willAttach);
+      //console.log('will send files with options:', willAttach);
 
       let peerID = appImManager.peerID;
 
@@ -471,7 +477,8 @@ export class ChatInput {
 
         let promises = willAttach.sendFileDetails.map(params => {
           let promise = appMessagesManager.sendFile(peerID, params.file, Object.assign({
-            isMedia: willAttach.isMedia, 
+            //isMedia: willAttach.isMedia, 
+            isMedia: true, 
             caption,
             replyToMsgID: this.replyToMsgID
           }, params));