From 51f318e1a4815cc049cdcce0e7eeee46e09c1b02 Mon Sep 17 00:00:00 2001
From: Bastard Operator <bofh@nogafam.es>
Date: Mon, 11 Jan 2021 23:21:09 +0100
Subject: [PATCH] Some improvements and new internal-code features

* We can use fediloveUI.toast(msg) to send a message using the React toast
* I couldnt manage to export formatIntl function to the outside, and the only option was to set the desired keys at the _layout.html initial load
* Some little fixes and localizations
---
 src/routes/_actions/timeline.js |  1 +
 src/routes/_layout.html         |  5 +++++
 static/fedilove-no-react.js     | 22 +++++++++++++++++-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/routes/_actions/timeline.js b/src/routes/_actions/timeline.js
index ce25c0e4..98b79f28 100644
--- a/src/routes/_actions/timeline.js
+++ b/src/routes/_actions/timeline.js
@@ -276,4 +276,5 @@ export async function showMoreItemsForThread (instanceName, timelineName) {
 
 if (process.browser) {
   window.__database = database;
+  window.__toast    = toast;
 }
diff --git a/src/routes/_layout.html b/src/routes/_layout.html
index d60f5a33..25ef1e72 100644
--- a/src/routes/_layout.html
+++ b/src/routes/_layout.html
@@ -79,6 +79,7 @@
 <script>
   import { store } from './_store/store'
   import { observe } from 'svelte-extras'
+  import { formatIntl } from './_utils/formatIntl'
   import { importShowEmojiDialog } from './_components/dialog/asyncDialogs/importShowEmojiDialog'
   import { updateCustomEmojiForInstance } from './_actions/emoji'
 
@@ -102,6 +103,10 @@
         document.body.appendChild(script);
       };
 
+      window.__intl = {
+        'nothingToShow':	formatIntl('intl.nothingToShow'),
+      };
+
       loadScript('/jquery-3.5.1.min.js');
       loadScript("/fedilove-no-react.js?v="+Date.now(), true);
 
diff --git a/static/fedilove-no-react.js b/static/fedilove-no-react.js
index ab2f0cea..9eee8b6c 100644
--- a/static/fedilove-no-react.js
+++ b/static/fedilove-no-react.js
@@ -198,7 +198,8 @@ var fediloveUI = {
             count++;
             var newLen = $('div.the-list > div').length;
             if (count >= 100 || newLen != startLen) {
-                document.querySelector('div.the-list > div:last-child').scrollIntoView();
+                const elem = document.querySelector('div.the-list > div:last-child');
+                if (elem !== null) elem.scrollIntoView();
                 clearInterval(_this);
             }
         }, 150);
@@ -268,6 +269,10 @@ var fediloveUI = {
             countMax++;
         }, 100);
     },
+    toast: function(whatToSay) {
+        if (window.__toast !== undefined)
+            window.__toast.say(whatToSay);
+    },
     animateMainContentSwipe: function(animName, cback) {
         $('div.virtual-list')[0].style.animation = `${animName} .25s linear 1`;
         setTimeout(cback, 220);
@@ -473,8 +478,15 @@ function fedilove_customization() {
         return;
     }
 
-    if (fediloveData.myAccountId === undefined && window.__store.get().verifyCredentials !== undefined)
-        fediloveData.myAccountId = window.__store.get().verifyCredentials[fediloveApi.getCurrentInstance()].id;
+    if (fediloveData.myAccountId === undefined && window.__store.get().verifyCredentials !== undefined) {
+        var aCountMax = 0;
+        const _a = setInterval(function() {
+            const theData = window.__store.get().verifyCredentials[fediloveApi.getCurrentInstance()];
+            if (aCountMax > 20 || theData !== null)
+                fediloveData.myAccountId = theData !== null ? theData.id : undefined;
+            aCountMax++;
+        }, 500);
+    }
 
     if (document.querySelector('#main-nav > div#dummy-nav') != null) {
         document.querySelector('#main-nav > div#dummy-nav').remove();
@@ -545,7 +557,7 @@ function fedilove_customization() {
                     if (!e.ctrlKey && !e.shiftKey) {
                         e.stopPropagation();
                         e.preventDefault();
-                        setTimeout(function() { api_send_message() }, 100);
+                        setTimeout(function() { fediloveMastodon.API.sendMessage() }, 100);
                         return true;
                     } else {
                         if (!e.shiftKey && e.ctrlKey) {
@@ -740,7 +752,7 @@ function fedilove_customization() {
 
             // added when there is no more profiles to Meet
             if ($('div#noone-to-meet').length === 0)
-                $('div.timeline').parent().append('<div id="noone-to-meet" style="display: none"><span>Nothing to show</span></div>');
+                $('div.timeline').parent().append('<div id="noone-to-meet" style="display: none"><span>'+window.__intl.nothingToShow+'</span></div>');
 
             // remove discarded accounts from timeline (temporal,
             //  if /meet is reloaded, blocked accounts won't show either)