tpmkms_4wp 9.3.0-beta.25 → 9.3.0-beta.27

package/common/reminders.js

@@ -42,12 +42,20 @@ class API {
     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
@@ -80,7 +88,7 @@ class API {
     const items = []
     for (const item of this._objects.reminders) {
       if (!item.dateTimeSelector) {
-        items.push({ when: true, text: item.text, id: item.id })
+        items.push({ when: true, who: item.who, text: item.text, id: item.id })
       }
     }
     return items
@@ -127,20 +135,37 @@ 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(context.arg)
+            api.addUser(api.contextToWho(context.arg))
+          }
+        },
+        {
+          id: 'remove',
+          words: ['delete', 'remove'],
+          isA: ['verb'],
+          bridge: "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          semantic: ({api, context}) => {
+            api.removeUser(api.contextToWho(context.arg))
           }
         },
         {
@@ -155,17 +180,30 @@ 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), bridge: 'justWhoBridge', 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 = api.contextToWho(context.who)
+            let text;
+            if (context.reminder) {
+              text = await gsp(context.reminder.slice(1));
+            }
             const reminder = { text, dateTimeSelector: context.date, who }
             if (context.date) {
               reminder.dateTimeSelector = context.date
@@ -216,11 +254,17 @@ const template = {
           },
 
           matchq: ({ api, context }) => api.askAbout().length > 0 && context.marker == 'controlEnd',
-          applyq: ({ api, context }) => {
+          applyq: async ({ api, context, gs }) => {
             context.cascade = false
             const items = api.askAbout()
             const item = items[0]
-            return 'When should I remind you to ' + item.text;
+            let who
+            if (item.who.id == 'me') {
+              who = 'you'
+            } else {
+              who = await gs(item.who.map((who) => who.text), ', ', ' and ')
+            }
+            return `When should I remind ${who} to ${item.text}`
           },
 
           matchr: ({ isA, api, context }) => {
@@ -250,7 +294,7 @@ knowledgeModule( {
     name: './reminders.test.json',
     contents: reminders_tests,
     checks: {
-      context: defaultContextCheck(['who', 'reminder']),
+      context: defaultContextCheck(['who', 'reminder', 'verbatim']),
       objects: [
         { 
           property: 'reminders',