improve "delete all but own feed" (but it's WIP)

Author: tschudin

android/tinySSB/app/src/main/assets/web/prod/chat.js

@@ -300,6 +300,7 @@ function load_post_item(p) { // { 'key', 'from', 'when', 'body', 'to' (if group
 }
 
 function load_chat(nm) {
+    console.log("load_chat() for ", nm);
     var ch, pl, e;
     ch = tremola.chats[nm]
     if (ch.timeline == null)
@@ -492,6 +493,7 @@ function new_conversation() {
 }
 
 function getUnreadCnt(nm) {
+    console.log("XX", nm);
     var ch = tremola.chats[nm];
     return Object.keys(ch.posts).length - ch.lastRead;
 }

android/tinySSB/app/src/main/assets/web/prod/contacts.js

@@ -35,9 +35,11 @@ function load_contact_list() {
     document.getElementById("lst:contacts-trustLevelZero").innerHTML = '';
     document.getElementById("lst:contacts-trustLevelOne").innerHTML = '';
     document.getElementById("lst:contacts-trustLevelTwo").innerHTML = '';
-    for (var id in tremola.contacts)
+    for (var id in tremola.contacts) {
+        console.log("contacts", id);
         if (!tremola.contacts[id].forgotten)
             load_contact_item([id, tremola.contacts[id]]);
+    }
     if (!tremola.settings.hide_forgotten_contacts)
         for (var id in tremola.contacts) {
             var c = tremola.contacts[id]
@@ -57,7 +59,7 @@ function load_contact_item(c) { // [ id, { "alias": "thealias", "initial": "T",
         c[1]["color"] = colors[Math.floor(colors.length * Math.random())];
         persist();
     }
-    console.log("load_c_i", JSON.stringify(c[1]))
+    // console.log("load_c_i", JSON.stringify(c[1]))
     bg = c[1].forgotten ? ' gray' : ' light';
     row = "<button class=contact_picture style='margin-right: 0.75em; background: " + c[1].color + ";'>" + c[1].initial + "</button>";
     row += "<button class='chat_item_button" + bg + "' style='overflow: hidden; width: calc(100% - 4em);' onclick='show_contact_details(\"" + c[0] + "\");'>";
@@ -370,8 +372,15 @@ function deleteContact(contactID) {
     //convert the contactID to scuttlebutt format
     contactID = encodeScuttlebuttId(contactID);
     //remove the contact from the contacts list
-    delete tremola.contacts[contactID];
-    persist();
+    if (tremola == undefined)
+        tremola = {};
+    if (!Object.hasOwn(tremola, 'contacts'))
+        tremola.contacts = {};
+    if (contactID in tremola.contacts) {
+        console.log("going to delete", contactID, "in", tremola.contacts);
+        delete tremola.contacts[contactID];
+        persist();
+    }
     closeOverlay();
     load_contact_list();
     launch_snackbar("Contact deleted successfully");

android/tinySSB/app/src/main/assets/web/prod/settings.js

@@ -159,10 +159,13 @@ function settings_reset_ui() {
 }
 
 function settings_clear_other_feeds() {
-    backend("wipe:others")
-    closeOverlay()
-    settings_reset_ui()
-
+    closeOverlay();
+    resetTremola();
+    setScenario('chats');
+    menu_redraw();
+    launch_snackbar("reloading all feeds");
+    backend("wipe:others");
+    backend("reset");
 }
 
 // eof

android/tinySSB/app/src/main/assets/web/tremola.js

@@ -631,12 +631,20 @@ function b2f_new_event(e) { // incoming SSB log event: we get map with three ent
             if (!(ch.timeline instanceof Timeline))
                 ch.timeline = Timeline.fromJSON(ch.timeline)
 
+            var ESID = encodeScuttlebuttId(a[2]);
+            if (!(ESID in tremola.contacts)) {
+                var shortID = id2b32(ESID);
+                console.log("XX", a[2], ESID, shortID)
+                tremola.contacts[ESID] = {
+                    "alias": shortID, "initial": shortID.substring(0, 1).toUpperCase(),
+                    "color": colors[Math.floor(colors.length * Math.random())],
+                    "iam": "", "forgotten": false
+                }
+            }
             // console.log("new post 1 ", ch)
             if (!(e.header.ref in ch.posts)) { // new post
-                var a = e.confid;
-
                 //get alias from fid
-                var alias = tremola.contacts[encodeScuttlebuttId(a[2])].alias;
+                var alias = tremola.contacts[ESID].alias;
                 var p = {
                     "key": e.header.ref, "from": e.header.fid, "body": "Set contact: " + alias + "'s trust level to " + a[3],
                     "when": a[4] * 1000, "prev": a[1]
@@ -655,6 +663,8 @@ function b2f_new_event(e) { // incoming SSB log event: we get map with three ent
             }
             // if (curr_scenario == "chats") // the updated conversation could bubble up
             load_chat_list();
+            load_contact_list();
+            reloadChatTrustLevels();
         }
         if (a[0] == 'TAV')
             rcpts = a[5];
@@ -744,10 +754,12 @@ function b2f_new_contact(fid, trustLevel="untrusted", alias="") {
     if (alias == "") {
         alias = id2b32(fid);
     }
-    tremola.contacts[fid] = {
-        "alias": alias, "initial": alias.substring(0, 1).toUpperCase(),
-        "color": colors[Math.floor(colors.length * Math.random())],
-        "iam": "", "forgotten": false, "trusted": trusted
+    if (!(fid in tremola.contacts)) {
+        tremola.contacts[fid] = {
+            "alias": alias, "initial": alias.substring(0, 1).toUpperCase(),
+            "color": colors[Math.floor(colors.length * Math.random())],
+            "iam": "", "forgotten": false, "trusted": trusted
+            };
     };
     backend("contacts:checkDeleted " + decodeScuttlebuttId(fid));
     console.log(tremola.contacts[fid]);

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/WebAppInterface.kt

@@ -117,6 +117,11 @@ class WebAppInterface(val act: MainActivity, val webView: WebView) {
             }
             "restream" -> {
                 eval("restream = true")
+                for (fid in act.tinyRepo.listFeeds()) {
+                    Log.d("wai", "recreating contact ${fid.toHex()}")
+                    if (!fid.contentEquals(act.idStore.identity.verifyKey))
+                        eval("b2f_new_contact(\"@${fid.toBase64()}.ed25519\", \"untrusted\")")
+                }
                 for (fid in act.tinyRepo.listFeeds()) {
                     Log.d("wai", "restreaming ${fid.toHex()}")
                     var i = 1

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/tssb/Repo.kt

@@ -122,6 +122,7 @@ class Repo(val context: MainActivity) {
         // Check if the replica was found
         if (replicaIndex != -1) {
             replicas.removeAt(replicaIndex)
+            delete_feed(fid)
             Log.d("repo", "Replica with fid ${fid.toHex()} deleted.")
             return true
         } else {