tpmkms_4wp 9.3.0-beta.24 → 9.3.0-beta.26

package/common/reminders.js

@@ -13,9 +13,7 @@ const helpers = require('./helpers')
    make it friday instead
    2 sundays from now
    the sunday after july 1st
-   remind greg to go to regina
    remind every truck driver to whatever tomorrow at 8 am
-   remind greg and bob to go to bolivia and see the xyz corporation
 */
 
 class API {
@@ -23,6 +21,7 @@ class API {
     this._objects = objects
     this._objects.reminders = []
     this._objects.id = 0
+    this._objects.current = null
   }
 
   async add(reminder) {
@@ -31,13 +30,36 @@ class API {
     reminder.id = id
     this._objects.reminders.push(reminder)
     this.args.mentioned({ context: reminder })
+    this._objects.current = id
+  }
+
+  getCurrent() {
+    return this._objects.current
+  }
+
+  // addUser to current
+  addUser(user) {
+    const reminder = this._objects.reminders.find((r) => r.id == this._objects.current)
+    if (reminder) {
+      if (Array.isArray(reminder.who)) {
+        reminder.who = [...reminder.who, user]
+      } else {
+        reminder.who = [reminder.who, user]
+      }
+    }
+  }
+
+  removeUser(user) {
+    const reminder = this._objects.reminders.find((r) => r.id == this._objects.current)
+    if (reminder) {
+      reminder.who = reminder.who.filter((who) => who.remindee_id != user.remindee_id)
+    }
   }
 
   addRemindable(id, text) {
     if (!text) {
       text = id
     }
-    debugger
     this.args.makeObject({ ...this.args, context: { word: text, value: id, number: 'one', remindee_id: id }, initial: `remindee_id: "${id}"`, types: ['remindable'] })
   }
 
@@ -46,6 +68,18 @@ class API {
     reminder.nextISODate = value?.evalue
   }
 
+  contextToWho(who) {
+    if (who.isList) {
+      const whos = []
+      for (const element of this.args.values(who)) {
+        whos.push(this.contextToWho(element))
+      }
+      return whos
+    } else {
+      return { id: who.value || who.text, text: who.text, remindee_id: who.remindee_id }
+    }
+  }
+
   // the user of the KM can override this. this can be used to sync the GUI and the LUI
   getCurrent() {
   }
@@ -89,7 +123,6 @@ class API {
         return
       }
     }
-
   }
 }
 
@@ -102,13 +135,38 @@ const template = {
       operators: [
         "([remindable])",
         { pattern: "([addRemindable] (word)*)", development: true },
-        "([remind] (remindable/*) (!@<= 'dateTimeSelector')*)",
-        "([remind:withDateBridge] (remindable/*) (!@<= 'dateTimeSelector')* (dateTimeSelector))",
-        "([remind:withDateAndTimeBridge] (remindable/*) (!@<= 'dateTimeSelector')* (dateTimeSelector) (atTime))",
+        "([remind:justWhoBridge] (remindable/*))",
+        "([remind] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
+        "([remind:withDateBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector))",
+        "([remind:withDateAndTimeBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector) (atTime))",
         "([show] ([reminders]))",
         "([delete_reminders|delete,cancel] (number/*))",
+        "([add] (remindable/*))",
+        "([remove] (remindable/*))",
+        "((verb/*) [inAddition|also,too])",
       ],
       bridges: [
+        {
+          id: 'inAddition',
+          after: ['verb'],
+          bridge: "{ ...before[0], inAddition: true, verb: before[0], operator: operator, interpolate: '${verb} ${operator}' }",
+        },
+        {
+          id: 'add',
+          isA: ['verb'],
+          bridge: "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          semantic: ({api, context}) => {
+            api.addUser(api.contextToWho(context.arg))
+          }
+        },
+        {
+          id: 'remove',
+          isA: ['verb'],
+          bridge: "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          semantic: ({api, context}) => {
+            api.removeUser(api.contextToWho(context.arg))
+          }
+        },
         {
           id: 'addRemindable',
           isA: ['verb'],
@@ -121,17 +179,27 @@ const template = {
         },
         {
           id: 'remindable',
+          isA: ['listable'],
         },
         {
           id: 'remind',
           isA: ['verb'],
           localHierarchy: [['self', 'remindable']],
           bridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
+          justWhoBridge: "{ ...next(operator), operator: operator, who: after[0], interpolate: '${operator} ${who}' }",
           withDateBridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], interpolate: '${operator} ${who} ${reminder} ${date}' }",
           withDateAndTimeBridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], time: after[3], interpolate: '${operator} ${who} ${reminder} ${date} ${time}' }",
+          semantics: [
+            {
+              match: ({context}) => context.marker == 'remind' && context.inAddition,
+              apply: ({context, api}) => {
+                api.addUser(api.contextToWho(context.who))
+              }
+            },
+          ],
           semantic: async ({api, gsp, gp, context}) => {
             const text = await gsp(context.reminder.slice(1));
-            const who = { id: context.who.value || context.who.text, text: context.who.text, remindee_id: context.who.remindee_id }
+            const who = api.contextToWho(context.who)
             const reminder = { text, dateTimeSelector: context.date, who }
             if (context.date) {
               reminder.dateTimeSelector = context.date