Chat threads

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",
     "acorn": "^7.4.1",
     "escape-html": "^1.0.3",
     "eslint-plugin-n": "^15.6.1",

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 and not 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('Cant delete bookmark:' + e)
       }
     }
   } else {

src/chat/chatLogic.js

@@ -40,7 +40,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()
@@ -52,7 +52,7 @@ export class ChatChannel {
     const me = authn.currentUser() // If already logged on
 
     if (oldMsg) { // edit message replaces old one
-      sts.push($rdf.st(mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument))
+      sts.push($rdf.st(await mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument))
       if (deleteIt) {
         sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument))
       }
@@ -68,8 +68,14 @@ export class ChatChannel {
     if (me) {
       sts.push($rdf.st(message, ns.foaf('maker'), me, 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 msg = 'Error saving chat message: ' + err
       debug.warn(msg)
@@ -86,21 +92,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 returns 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.ur] = 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.ur] = 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