tpmkms_4wp 9.3.0-beta.32 → 9.3.0-beta.34

package/common/reminders.js

@@ -16,19 +16,19 @@ const helpers = require('./helpers')
    remind every truck driver to whatever tomorrow at 8 am
 */
 
-const query = (missing, reminder) => {
+const query = (missing, reminder_id) => {
   return  {
     where: where(),
     // oneShot: false,
     onNevermind: ({verbatim, ...args}) => {
       const api = args.kms.reminders.api
-      api.delete_reminder(reminder.id)
+      api.delete_reminder(reminder_id)
     },
 
-    matchq: ({ api, context }) => api.missing(missing, reminder) && context.marker == 'controlEnd',
+    matchq: ({ api, context }) => api.missing(missing, reminder_id) && context.marker == 'controlEnd',
     applyq: async ({ api, context, gs }) => {
       context.cascade = false
-      const item = api.missing(missing, reminder)
+      const item = api.missing(missing, reminder_id)
       let who
       if (Array.isArray(item.who)) {
         who = await gs(item.who.map((who) => who.text), ', ', ' and ')
@@ -48,7 +48,7 @@ const query = (missing, reminder) => {
     },
 
     matchr: ({ isA, api, context }) => {
-      const gotADate = ((isA(context.marker, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && api.missing(missing, reminder))
+      const gotADate = ((isA(context.marker, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && api.missing(missing, reminder_id))
       if (missing == 'missingDate') {
         return gotADate
       } else {
@@ -58,7 +58,7 @@ const query = (missing, reminder) => {
       return false
     },
     applyr: async ({ context, api, gp }) => {
-      const item = api.missing(missing, reminder)
+      const item = api.missing(missing, reminder_id)
       await api.update({ id: item.id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })
     }
   }
@@ -87,7 +87,7 @@ class API {
 
   // addUser to current
   addUser(user) {
-    const reminder = this._objects.reminders.find((r) => r.id == this._objects.current)
+    const reminder = this.reminders().find((r) => r.id == this._objects.current)
     if (reminder) {
       if (Array.isArray(reminder.who)) {
         reminder.who = [...reminder.who, user]
@@ -98,7 +98,7 @@ class API {
   }
 
   removeUser(user) {
-    const reminder = this._objects.reminders.find((r) => r.id == this._objects.current)
+    const reminder = this.reminders().find((r) => r.id == this._objects.current)
     if (reminder) {
       reminder.who = reminder.who.filter((who) => who.remindee_id != user.remindee_id)
     }
@@ -132,7 +132,8 @@ class API {
   getCurrent() {
   }
 
-  missing(what, reminder) {
+  missing(what, reminder_id) {
+    const reminder = this.reminder(reminder_id)
     if (what == 'missingReminder' && !reminder.text) {
       return { when: true, who: reminder.who, text: reminder.text, id: reminder.id, missingReminder: true }
     }
@@ -141,26 +142,38 @@ class API {
     }
   }
 
+  reminder(id) {
+    return this._objects.reminders.find((reminder) => reminder.id == id)
+  }
+
+  reminders() {
+    return this._objects.reminders
+  }
+
+  setReminders(reminders) {
+    this._objects.reminders = reminders
+  }
+
   askAbout(what) {
     const items = []
-    for (const item of this._objects.reminders) {
-      if (this.missing('missingReminder', item)) {
-        items.push(this.missing('missingReminder', item))
+    for (const item of this.reminders()) {
+      if (this.missing('missingReminder', item.id)) {
+        items.push(this.missing('missingReminder', item.id))
       }
-      if (this.missing('missingDate', item)) {
-        items.push(this.missing('missingDate', item))
+      if (this.missing('missingDate', item.id)) {
+        items.push(this.missing('missingDate', item.id))
       }
     }
     return items
   }
 
   show() {
-    if (this._objects.reminders.length == 0) {
+    if (this.reminders().length == 0) {
       return "There are no reminders"
     }
     let s = 'The reminders are\n'
     let counter = 1
-    for (const item of this._objects.reminders) {
+    for (const item of this.reminders()) {
       s += `    ${counter}. ${item.text}\n`
       counter += 1
     }
@@ -168,21 +181,13 @@ class API {
     // -> return a table object. then have ability to talk about the table. maybe later let's focus on this for now
   }
 
-  /*
-  delete_reminder(ordinal) {
-    if (ordinal < 1 || ordinal > this._objects.reminders.length) {
-      return `Not possible`
-    }
-    this._objects.reminders = this._objects.reminders.splice(ordinal, 1)
-  }
-  */
   delete_reminder(id) {
-    const reminder = this._objects.reminders.find((reminder) => reminder.id)
+    const reminder = this.reminders().find((reminder) => reminder.id)
     if (reminder) {
       if (reminder.cleanUp) {
         reminder.cleanUp()
       }
-      this._objects.reminders = this._objects.reminders.filter((reminder) => reminder.id != id)
+      this.setReminders(this._objects.reminders.filter((reminder) => reminder.id != id))
     }
   }
 
@@ -283,8 +288,8 @@ const template = {
             // await api.instantiate(reminder)
             await api.add(reminder)
             reminder.cleanUp = ask([
-              query('missingReminder', reminder),
-              query('missingDate', reminder),
+              query('missingReminder', reminder.id),
+              query('missingDate', reminder.id),
             ])
           },
         },

package/package.json

@@ -341,8 +341,8 @@
     "scriptjs": "^2.5.9",
     "table": "^6.7.1",
     "uuid": "^9.0.0",
-    "theprogrammablemind_4wp": "9.3.0-beta.32"
+    "theprogrammablemind_4wp": "9.3.0-beta.34"
   },
-  "version": "9.3.0-beta.32",
+  "version": "9.3.0-beta.34",
   "license": "UNLICENSED"
 }