Chat thread with proof

jest.config.js

@@ -5,5 +5,9 @@ module.exports = {
     '**/?(*.)+(spec|test).[tj]s?(x)'  ],
   setupFilesAfterEnv: [
     './test/helpers/setup.ts'
-  ]
+  ],
+  transformIgnorePatterns: ["/node_modules/(?!lit-html).+\\.js"],
+  testEnvironmentOptions: {
+      customExportConditions: ['node']
+}
 }

package.json

@@ -55,6 +55,7 @@
   },
   "homepage": "https://github.com/solidos/solid-ui",
   "dependencies": {
+    "16": "^0.0.2",
     "@noble/curves": "^1.0.0",
     "acorn": "^7.4.1",
     "escape-html": "^1.0.3",
@@ -108,7 +109,7 @@
     "husky": "^7.0.4",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^27.5.1",
-    "jsdom": "^19.0.0",
+    "jsdom": "^16.7.0",
     "lint-staged": "^12.5.0",
     "nock": "^13.3.0",
     "react": "^17.0.2",

src/chat/bookmarks.js

@@ -3,7 +3,6 @@
  * @packageDocumentation
  */
 
-/* global alert confirm */
 import * as debug from '../debug'
 import { icons } from '../iconBase'
 import { media } from '../media/index'
@@ -99,7 +98,8 @@ export async function findBookmarkDocument (userContext) {
   if (userContext.instances && userContext.instances.length > 0) {
     userContext.bookmarkDocument = userContext.instances[0]
     if (userContext.instances.length > 1) {
-      alert('More than one bookmark file! ' + userContext.instances)
+      debug.warn('More than one bookmark file! ' + userContext.instances) // @@ todo - deal with > 1
+      // Note: should pick up community bookmarks as well
     }
   } else {
     if (userContext.publicProfile) {
@@ -111,7 +111,7 @@ export async function findBookmarkDocument (userContext) {
         debug.log('Creating new bookmark file ' + newBookmarkFile)
         await createIfNotExists(newBookmarkFile)
       } catch (e) {
-        alert.error("Can't make fresh bookmark file:" + e)
+        debug.warn("Can't make fresh bookmark file:" + e)
         return userContext
       }
       await registerInTypeIndex(
@@ -121,7 +121,7 @@ export async function findBookmarkDocument (userContext) {
       )
       userContext.bookmarkDocument = newBookmarkFile
     } else {
-      alert('You seem to have no bookmark file and not even a profile file.')
+      debug.warn('You seem to have no bookmark file, nor even a profile file!')
     }
   }
   return userContext
@@ -164,7 +164,7 @@ async function addBookmark (context, target) {
     await updatePromise([], ins) // 20190118A
   } catch (e) {
     const msg = 'Making bookmark: ' + e
-    alert.error(msg)
+    debug.warn(msg)
     return null
   }
   return bookmark
@@ -188,7 +188,7 @@ export async function toggleBookmark (userContext, target, bookmarkButton) {
         debug.log('Bookmark deleted: ' + bookmarks[i])
       } catch (e) {
         debug.error('Cant delete bookmark:' + e)
-        alert('Cant delete bookmark:' + e)
+        debug.warn('Cannot delete bookmark:' + e)
       }
     }
   } else {

src/chat/chatLogic.js

@@ -42,7 +42,7 @@ export class ChatChannel {
     as a replacement for an existing one.
     The old one iis left, and the two are linked
   */
-  async updateMessage (text, oldMsg = null, deleteIt) {
+  async updateMessage (text, oldMsg = null, deleteIt, thread = null) {
     const sts = []
     const now = new Date()
     const timestamp = '' + now.getTime()
@@ -58,7 +58,13 @@ export class ChatChannel {
     if (oldMsg) { // edit message replaces old one
       const oldMsgMaker = store.any(oldMsg, ns.foaf('maker')) // may not be needed here, but needed on READ
       if (oldMsgMaker.uri === me.uri) {
-        sts.push($rdf.st(mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument))
+        const oldMsgMostRecentVersion = await mostRecentVersion(oldMsg)
+        sts.push($rdf.st(oldMsgMostRecentVersion, ns.dct('isReplacedBy'), message, chatDocument))
+        // if oldMsg has_reply => add has_reply to message
+        const oldMsgThread = store.any(oldMsgMostRecentVersion, ns.sioc('has_reply'))
+        if (oldMsgThread) {
+          sts.push($rdf.st(message, ns.sioc('has_reply'), oldMsgThread, chatDocument))
+        }
         if (deleteIt) { // we need to add a specific signature, else anyone can delete a msg ?
           sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument))
         }
@@ -89,8 +95,14 @@ export class ChatChannel {
       const sig = signMsg(msg, privateKey)
       sts.push($rdf.st(message, $rdf.sym(`${SEC}proofValue`), $rdf.lit(sig), chatDocument))
     }
+    if (thread) {
+      sts.push($rdf.st(thread, ns.sioc('has_member'), message, chatDocument))
+      if (!thread.doc().sameTerm(message.doc())) {
+        sts.push($rdf.st(thread, ns.sioc('has_member'), message, thread.doc()))
+      }
+    }
     try {
-      await store.updater.update([], sts)
+      await store.updater.updateMany([], sts)
     } catch (err) {
       const errMsg = 'Error saving chat message: ' + err
       debug.warn(errMsg)
@@ -107,21 +119,80 @@ export class ChatChannel {
   async deleteMessage (message) {
     return this.updateMessage('(message deleted)', message, true)
   }
+
+  // Create a new thread of replies to the thread root message
+  //  or return one which already exists
+
+  async createThread (threadRoot) {
+    const already = store.each(threadRoot, ns.sioc('has_reply'), null, threadRoot.doc())
+      .filter(thread => store.holds(thread, ns.rdf('type'), ns.sioc('Thread'), thread.doc()))
+    if (already.length > 0) return already[0]
+
+    const thread = $rdf.sym(threadRoot.uri + '-thread')
+    const insert = [
+      $rdf.st(thread, ns.rdf('type'), ns.sioc('Thread'), thread.doc()),
+      $rdf.st(threadRoot, ns.sioc('has_reply'), thread, thread.doc())
+    ]
+    await store.updater.update([], insert)
+    return thread
+  }
 } // class ChatChannel
 
-export function originalVersion (message) {
+// ////////// Utility functions
+
+// Have to not loop forever if fed loops
+export async function allVersions (message) {
+  const versions = [message]
+  const done = {}
+  done[message.uri] = true
+  let m = message
+  while (true) { // earlier?
+    const prev = store.any(null, ns.dct('isReplacedBy'), m, m.doc())
+    if (!prev || done[prev.uri]) break
+    await store.fetcher.load(prev)
+    versions.unshift(prev)
+    done[prev.uri] = true
+    m = prev
+  }
+  m = message
+  while (true) { // later?
+    const next = store.any(m, ns.dct('isReplacedBy'), null, m.doc())
+    if (!next || done[next.uri]) break
+    versions.push(next)
+    done[next.uri] = true
+    m = next
+  }
+  return versions
+}
+
+export async function originalVersion (message) {
   let msg = message
+  const done = {}
+  // done[message.uri] = true
   while (msg) {
+    if (done[msg.uri]) {
+      debug.error('originalVersion: verion loop' + message)
+      return message
+    }
+    done[msg.uri] = true
     message = msg
+    await store.fetcher.load(message)
     msg = store.any(null, ns.dct('isReplacedBy'), message, message.doc())
   }
   return message
 }
 
-export function mostRecentVersion (message) {
+export async function mostRecentVersion (message) {
   let msg = message
+  const done = {}
   while (msg) {
+    if (done[msg.uri]) {
+      debug.error('mostRecentVersion: verion loop' + message)
+      return message
+    }
+    done[msg.uri] = true
     message = msg
+    await store.fetcher.load(message)
     msg = store.any(message, ns.dct('isReplacedBy'), null, message.doc())
   }
   return message

src/chat/dateFolder.js

@@ -3,13 +3,20 @@
  * This tracks data stored in dated folders and sub-folders
  *
  */
-
 import * as debug from '../debug'
 import { store } from 'solid-logic'
-
 import * as ns from '../ns'
 import * as $rdf from 'rdflib' // pull in first avoid cross-refs
 
+export async function emptyLeaf (leafDocument) {
+  await store.fetcher.load(leafDocument)
+  // files can have seealso links. skip ones with no leafObjects with a date
+  return !(
+    store.statementsMatching(null, ns.dct('created'), null, leafDocument)
+      .length > 0
+  )
+}
+
 /**
  * Track back through the YYYY/MM/DD tree to find the previous/next day
  */
@@ -45,7 +52,6 @@ export class DateFolder {
   }
 
   async loadPrevious (date, backwards) {
-    const thisDateFolder = this
     async function previousPeriod (file, level) {
       function younger (x) {
         if (backwards ? x.uri >= file.uri : x.uri <= file.uri) return false // later than we want or same -- looking for different
@@ -60,33 +66,21 @@ export class DateFolder {
         return true
       }
 
-      async function lastNonEmpty (siblings) {
+      function lastOrFirst (siblings) {
         siblings = siblings.filter(suitable)
         siblings.sort() // chronological order
         if (!backwards) siblings.reverse()
-        if (level !== 3) return siblings.pop() // only length chck final leverl
-        while (siblings.length) {
-          const folder = siblings.pop()
-          const leafDocument = store.sym(folder.uri + thisDateFolder.leafFileName)
-          await store.fetcher.load(leafDocument)
-          // files can have seealso links. skip ones with no leafObjects with a date
-          if (
-            store.statementsMatching(null, ns.dct('created'), null, leafDocument)
-              .length > 0
-          ) {
-            return folder
-          }
-        }
-        return null
+        return siblings.pop() // date folder
       }
       // debug.log('  previousPeriod level' + level + ' file ' + file)
       const parent = file.dir()
       try {
         await store.fetcher.load(parent)
         let siblings = store.each(parent, ns.ldp('contains'))
         siblings = siblings.filter(younger)
-        const folder = await lastNonEmpty(siblings)
+        const folder = lastOrFirst(siblings)
         if (folder) return folder
+        debug.log(' parent no suitable offspring ' + parent)
       } catch (err) {
         if (err.response && err.response.status && err.response.status === 404) {
           debug.log('Error 404 for chat parent file ' + parent)
@@ -96,24 +90,43 @@ export class DateFolder {
           throw (new Error(`*** ${err.message} for chat folder ${parent}`))
         }
       }
-
-      if (level === 0) return null // 3:day, 2:month, 1: year  0: no
+      if (level === 0) {
+        debug.log('loadPrevious:  returning as level is zero')
+        return null // 3:day, 2:month, 1: year  0: no
+      }
 
       const uncle = await previousPeriod(parent, level - 1)
-      if (!uncle) return null // reached first ever
+      if (!uncle) {
+        debug.log('   previousPeriod: nothing left before. ', parent)
+        return null // reached first ever
+      }
       await store.fetcher.load(uncle)
       const cousins = store.each(uncle, ns.ldp('contains'))
-      const result = await lastNonEmpty(cousins)
+      const result = lastOrFirst(cousins)
+      debug.log('   previousPeriod: returning cousins at level ' + level, cousins)
+      debug.log('   previousPeriod: returning result at level ' + level, result)
+
       return result
     } // previousPeriod
 
-    const folder = this.leafDocumentFromDate(date).dir()
-    const found = await previousPeriod(folder, 3)
-    if (found) {
-      const doc = store.sym(found.uri + this.leafFileName)
-      return this.dateFromLeafDocument(doc)
+    let folder = this.leafDocumentFromDate(date).dir()
+    while (true) {
+      const found = await previousPeriod(folder, 3)
+      if (found) {
+        const leafDocument = store.sym(found.uri + this.leafFileName)
+        const nextDate = this.dateFromLeafDocument(leafDocument)
+        if (!await emptyLeaf(leafDocument)) {
+          return nextDate
+        } else {
+          debug.log('  loadPrevious: skipping empty ' + leafDocument)
+          date = nextDate
+          folder = this.leafDocumentFromDate(date).dir()
+          debug.log('    loadPrevious: moved back to ' + folder)
+        }
+      } else {
+        return null // no more left
+      }
     }
-    return null
   } // loadPrevious
 
   async firstLeaf (backwards) {