Fix Chat and Sidebar props, remove interactive-widget, suppress avatar errors

TeleGhost Dev · TeleGhost Dev · commit 1a00a9938c39 · 2026-02-13T16:19:19.000+05:00
diff --git a/android/app/src/main/java/com/teleghost/app/MainActivity.kt b/android/app/src/main/java/com/teleghost/app/MainActivity.kt
@@ -138,6 +138,43 @@ class MainActivity : AppCompatActivity(), mobile.PlatformBridge {
     }
 
     // --- PlatformBridge Implementation ---
+    override fun openFile(path: String) {
+        runOnUiThread {
+            try {
+                val file = File(path)
+                if (!file.exists()) {
+                    android.widget.Toast.makeText(this, "File not found: $path", android.widget.Toast.LENGTH_SHORT).show()
+                    return@runOnUiThread
+                }
+
+                val uri = androidx.core.content.FileProvider.getUriForFile(
+                    this,
+                    "com.teleghost.app.fileprovider",
+                    file
+                )
+
+                val intent = Intent(Intent.ACTION_VIEW).apply {
+                    setDataAndType(uri, getMimeType(path))
+                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                }
+
+                startActivity(Intent.createChooser(intent, "Open File"))
+            } catch (e: Exception) {
+                android.util.Log.e(TAG, "Failed to open file", e)
+                android.widget.Toast.makeText(this, "Open failed: ${e.message}", android.widget.Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun getMimeType(url: String): String {
+        var type: String? = null
+        val extension = MimeTypeMap.getFileExtensionFromUrl(url)
+        if (extension != null) {
+            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+        }
+        return type ?: "*/*"
+    }
+
     override fun pickFile() {
         runOnUiThread {
             try {
diff --git a/frontend/index.html b/frontend/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8" />
-    <meta content="width=device-width, initial-scale=1.0, interactive-widget=resizes-content" name="viewport" />
+    <meta content="width=device-width, initial-scale=1.0" name="viewport" />
     <title>teleghost</title>
 </head>
 
diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
@@ -500,7 +500,8 @@
           }
           // Убираем оптимистичное сообщение (реальное придёт через событие)
           messages = (messages || []).filter(m => m.ID !== tempId);
-          await loadMessages(selectedContact.ID);
+          // Removed redundant loadMessages to prevent UI reset loop
+          // await loadMessages(selectedContact.ID);
       } catch (err) {
           showToast(err, 'error');
           // Помечаем как ошибку
diff --git a/frontend/src/components/Auth.svelte b/frontend/src/components/Auth.svelte
@@ -60,7 +60,8 @@
                         const base64 = await GetFileBase64(p.avatar_path);
                         if (base64) newAvatars[p.id] = base64;
                     } catch (e) {
-                        console.error("Failed to load avatar for", p.id, e);
+                        // Suppress error if file not found, use placeholder
+                        console.warn("Avatar not found or load failed:", p.id);
                     }
                 }
             }
diff --git a/frontend/src/components/Chat.svelte b/frontend/src/components/Chat.svelte
@@ -35,6 +35,8 @@
     export let onPreviewImage;
     export let startLoadingImage; // Fix: Add missing prop
     export let isLoading = false;
+    export let previewImage; // Fix: Add missing prop
+    export let onJumpToMessage = null; // Fix: Add missing prop
 
     let textarea;
     let touchStartX = 0;
@@ -91,23 +93,7 @@
     let containerRef;
 
     let isLoadingMore = false;
-    async function handleScroll(e) {
-        const container = e.target;
-        const distanceToBottom = container.scrollHeight - container.scrollTop - container.clientHeight;
-        showScrollButton = distanceToBottom > 50;
 
-        // Load more when reaching top
-        if (container.scrollTop < 100 && canLoadMore && !isLoadingMore && onLoadMore) {
-            isLoadingMore = true;
-            const oldHeight = container.scrollHeight;
-            await onLoadMore();
-            await tick();
-            // Maintain scroll position relative to bottom
-            const newHeight = container.scrollHeight;
-            container.scrollTop += (newHeight - oldHeight);
-            isLoadingMore = false;
-        }
-    }
 
     function scrollToBottom(force = false) {
         // Guard against unnecessary scrolls
@@ -152,46 +138,31 @@
     });
 
     // Handle Contact Change & Initialize Loading
-    $: if (isLoading || (selectedContact && selectedContact.ID !== currentContactId)) {
-        if (selectedContact) currentContactId = selectedContact.ID;
-        // Reset state for new chat or loading start
+    let lastMessageId = null;
+
+    $: if (selectedContact && selectedContact.ID !== currentContactId) {
+        currentContactId = selectedContact.ID;
+        // Reset state ONLY for new chat
         chatReady = false; 
         initialScrollDone = false;
         imagesLoading = true;
         pendingImages = 0;
         loadedImages = 0;
-        
-        // Safety timeout
-        if (isLoading) {
-             // If legitimate loading, we rely on isLoading becoming false
-        } else {
-            // Fallback if not loading but contact changed (shouldn't happen with new App logic)
-             setTimeout(() => {
-                if (!chatReady && !isLoading) {
-                    chatReady = true;
-                    imagesLoading = false;
-                    scrollToBottom(true);
-                }
-            }, 3000);
-        }
+        lastMessageId = null;
     }
 
     // Handle Messages Update & Auto-scroll
-    $: if (!isLoading && messages && currentContactId && containerRef) {
-        // Logic when data is ready
-        
+    $: if (messages && currentContactId && containerRef) {
         if (!chatReady) {
-            // Check for images in new messages
-            const images = messages.flatMap(m => m.Attachments || []).filter(a => a.MimeType && a.MimeType.startsWith('image/'));
+            // Initial Load Logic
+            const images = (messages || []).flatMap(m => m.Attachments || []).filter(a => a.MimeType && a.MimeType.startsWith('image/'));
             
             if (images.length > 0) {
-                 // Check if we already counted them (to avoid reset loop)
                  if (pendingImages === 0) {
                     pendingImages = images.length;
                     loadedImages = 0;
-                    // Wait for onImageLoad
                  }
-                 // If all images loaded (rare case of cache)
+                 // If all images loaded (rare case of cache) or no pending
                  if (loadedImages >= pendingImages) {
                      finishLoading();
                  }
@@ -201,45 +172,85 @@
             }
         } else {
             // Already ready, handle normal new message scroll
-            const distanceToBottom = containerRef.scrollHeight - containerRef.scrollTop - containerRef.clientHeight;
-            const wasNearBottom = distanceToBottom < 100;
-            const isUserSender = messages.length > 0 && messages[messages.length-1].IsOutgoing;
-
-            if (wasNearBottom || isUserSender) {
-                tick().then(() => {
-                    scrollToBottom(true); 
-                });
+            const currentLastMsg = messages.length > 0 ? messages[messages.length-1] : null;
+            const isNewMessage = currentLastMsg && currentLastMsg.ID !== lastMessageId;
+            
+            if (isNewMessage) {
+                lastMessageId = currentLastMsg.ID;
+                
+                const distanceToBottom = containerRef.scrollHeight - containerRef.scrollTop - containerRef.clientHeight;
+                const wasNearBottom = distanceToBottom < 100;
+                const isUserSender = currentLastMsg.IsOutgoing;
+
+                if (wasNearBottom || isUserSender) {
+                    tick().then(() => {
+                        scrollToBottom(true); 
+                    });
+                }
             }
         }
     }
 
-    function onImageLoad() {
+    function onImageLoad(e) {
+        // If image is already complete (cached), handle immediately
+        if (e && e.target && e.target.complete) {
+             // Logic handled below
+        }
+
         if (chatReady) {
             // Smart scroll after image load if near bottom
             if (containerRef) {
                 const dist = containerRef.scrollHeight - containerRef.scrollTop - containerRef.clientHeight;
-                if (dist < 100) scrollToBottom(true);
+                if (dist < 150) scrollToBottom(true);
             }
             return;
         }
         loadedImages++;
         if (loadedImages >= pendingImages) {
-            chatReady = true;
-            imagesLoading = false;
-            scrollToBottom(true);
+            finishLoading();
         }
     }
 
-    // Auto-scroll on new messages
-    $: if (messages && messages.length > 0 && chatReady) {
-        scrollToBottom();
-    }
-
     function finishLoading() {
         if (chatReady) return;
-        chatReady = true;
-        imagesLoading = false;
+        
+        // 1. Force scroll to bottom WHILE INVISIBLE
         scrollToBottom(true);
+        
+        // 2. Make visible after brief delay to allow layout to settle
+        requestAnimationFrame(() => {
+            chatReady = true;
+            imagesLoading = false;
+            
+            if (messages && messages.length > 0) {
+                 lastMessageId = messages[messages.length-1].ID;
+            }
+            
+            // 3. Force scroll again just in case opacity change affected anything
+            setTimeout(() => scrollToBottom(true), 10);
+        });
+    }
+    
+    // ...
+    
+    async function handleScroll(e) {
+        if (!chatReady) return; // CRITICAL: Don't load history if initial scroll isn't done
+        
+        const container = e.target;
+        const distanceToBottom = container.scrollHeight - container.scrollTop - container.clientHeight;
+        showScrollButton = distanceToBottom > 50;
+        
+        // ... rest of logic
+        if (container.scrollTop < 100 && canLoadMore && !isLoadingMore && onLoadMore) {
+             // ...
+             isLoadingMore = true;
+             const oldHeight = container.scrollHeight;
+             await onLoadMore();
+             await tick();
+             const newHeight = container.scrollHeight;
+             container.scrollTop += (newHeight - oldHeight);
+             isLoadingMore = false;
+        }
     }
 
 </script>
diff --git a/frontend/src/components/Sidebar.svelte b/frontend/src/components/Sidebar.svelte
@@ -29,6 +29,8 @@
     export let onEditFolder;
     export let onCreateFolder;
     export let onFolderContextMenu;
+    export let onTogglePin;
+    export let onMovePin;
 
     let longPressTimer;
 
diff --git a/i2pd.log b/i2pd.log
diff --git a/internal/appcore/messages.go b/internal/appcore/messages.go
diff --git a/mobile/mobile.go b/mobile/mobile.go

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@`
`60`	`60`	`const base64 = await GetFileBase64(p.avatar_path);`
`61`	`61`	`if (base64) newAvatars[p.id] = base64;`
`62`	`62`	`} catch (e) {`
`63`		`- console.error("Failed to load avatar for", p.id, e);`
	`63`	`+ // Suppress error if file not found, use placeholder`
	`64`	`+ console.warn("Avatar not found or load failed:", p.id);`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`}`