From c9052f1b2912d855e9d31ca32268a8968847bebe Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Thu, 29 Jun 2023 00:21:37 -0400
Subject: [PATCH 001/423] Resolve an issue with wp admin improperly handling
 migrations during plugin update.

---
 src/TouchPoint-WP/TouchPointWP.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index d2ce4ea3..3976187c 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -493,7 +493,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
      */
     public static function currentUserIsAdmin(): bool
     {
-        if (!function_exists('current_user_can'))
+        if (!function_exists('current_user_can') || !function_exists('wp_get_current_user'))
             return false;
         return current_user_can('manage_options');
     }

From 202e8453e4d5a3296ece0b868d7bbcb48aa94c66 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Tue, 18 Jul 2023 18:23:24 -0400
Subject: [PATCH 002/423] Adding check that plugin has only been initialized
 once.

---
 src/TouchPoint-WP/TouchPointWP.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 3976187c..7cc82f36 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -710,9 +710,22 @@ public static function load($file): TouchPointWP
         return $instance;
     }
 
+    /**
+     * @var bool True of the init process has run.  False if not.  Prevents things from happening twice, which can cause errors.
+     */
+    private static bool $_hasBeenInited = false;
+
+    /**
+     * Initialize the plugin.
+     *
+     * @return void
+     */
     public static function init(): void
     {
-	    self::instance()->loadLocalizations();
+	    if (self::$_hasBeenInited)
+            return;
+
+        self::instance()->loadLocalizations();
 
         self::instance()->registerTaxonomies();
 
@@ -722,6 +735,8 @@ public static function init(): void
         // If the scripts need to be updated, do that.
         self::instance()->updateDeployedScripts();
 
+        self::$_hasBeenInited = true;
+
         self::requireScript("base");
 
         do_action(self::INIT_ACTION_HOOK);

From 097f352ba80346335eeea7a599d787a9944a5d79 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Fri, 21 Jul 2023 10:12:08 -0400
Subject: [PATCH 003/423] Style improvement for "sign in with TouchPoint" link

---
 src/TouchPoint-WP/Auth.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 9b94f057..598d5c3c 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -129,18 +129,17 @@ public static function footer()
      */
     public static function printLoginLink()
     {
-        $html = '<p class="touchpoint-wp-auth-form-text">';
+        $html = '<p class="touchpoint-wp-auth-form">';
+        $url = self::getLoginUrl();
         /** @noinspection HtmlUnknownTarget */
-        $html .= '<a href="%s">';
+        $html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
         $html .= sprintf(
             // translators: %s is "what you call TouchPoint at your church", which is a setting
             __('Sign in with your %s account', 'TouchPoint-WP'),
             htmlentities(TouchPointWP::instance()->settings->system_name)
         );
-        printf(
-            $html,
-            self::getLoginUrl()
-        );
+        $html .= '</a></p>';
+        echo $html;
     }
 
     /**

From a615cd2d74c411f5c274b077dfc5b2c7c4418dad Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Fri, 21 Jul 2023 11:49:06 -0400
Subject: [PATCH 004/423] Significant performance improvement by reducing db
 queries. Also, better error reporting in python.

---
 src/TouchPoint-WP/TouchPointWP.php          | 542 +++++++++++---------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php |   2 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php |  48 +-
 src/python/WebApi.py                        |  10 +-
 4 files changed, 346 insertions(+), 256 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 7cc82f36..1c8ad335 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -450,7 +450,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
                     return $continue;
                 }
             }
-            
+
             // Auth endpoints
             if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_AUTH &&
                 $this->settings->enable_authentication === "on"
@@ -623,14 +623,44 @@ public function loadLocalizations()
 	    load_plugin_textdomain('TouchPoint-WP', false, $dir . '/i18n/');
     }
 
+    /**
+     * Create or update database tables
+     */
+    protected function createTables(): void
+    {
+        global $wpdb;
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
+        // IP Geo Caching table
+        $tableName = $wpdb->base_prefix . TouchPointWP::TABLE_IP_GEO;
+        $sql = "CREATE TABLE $tableName (
+            id int(10) unsigned NOT NULL auto_increment,
+            ip varbinary(16) NOT NULL UNIQUE,
+            updatedDT datetime DEFAULT NOW(),
+            data text NOT NULL,
+            PRIMARY KEY  (id)
+        )";
+        dbDelta($sql);
+    }
+
     /**
      * Compare the version numbers to determine if a migration is needed.
      */
-    public function checkMigrations(): void
+    public function migrate($force = false): void
     {
-        if ($this->settings->version !== self::VERSION) {
-            $this->settings->migrate();
+        if ($this->settings->version === self::VERSION && !$force) {
+            return;
         }
+
+        $this->createTables();
+
+        if (self::$_hasBeenInited) {
+            $this->insertTerms();
+        } else {
+            add_action(self::INIT_ACTION_HOOK, [$this, 'insertTerms']);
+        }
+
+        $this->settings->migrate();
     }
 
     /**
@@ -647,7 +677,7 @@ public static function load($file): TouchPointWP
         if (is_null($instance->settings)) {
             $instance->settings = TouchPointWP_Settings::instance($instance);
             if (is_admin()) {
-                $instance->checkMigrations();
+                $instance->migrate();
             }
         }
 
@@ -702,7 +732,7 @@ public static function load($file): TouchPointWP
         // Load Reports (feature is always enabled)
         $instance->reports = Report::load();
 
-        add_action('init', [self::class, 'init']);
+        add_action('init', [self::class, 'init'], 10);
 
 	    add_filter('the_content', [self::class, 'capitalPyScript'], 11);
 	    add_filter('widget_text_content', [self::class, 'capitalPyScript'], 11);
@@ -742,6 +772,12 @@ public static function init(): void
         do_action(self::INIT_ACTION_HOOK);
     }
 
+    /**
+     * Prints the inline 'base' script.  This is meant to be called in the wp_head and admin_head, and should only be
+     * called once on a page, but that is not automatically validated.
+     *
+     * @return void
+     */
     public static function renderBaseInlineScript(): void
     {
 		include self::instance()->assets_dir . '/js/base-inline.php';
@@ -765,7 +801,10 @@ public function registerScriptsAndStyles(): void
             self::VERSION,
             true
         );
-	    wp_set_script_translations(self::SHORTCODE_PREFIX . 'base-defer', 'TouchPoint-WP', $this->getJsLocalizationDir());
+	    wp_set_script_translations(
+            self::SHORTCODE_PREFIX . 'base-defer',
+            'TouchPoint-WP', $this->getJsLocalizationDir()
+        );
 
 	    wp_register_script(
             self::SHORTCODE_PREFIX . 'swal2-defer',
@@ -1234,7 +1273,7 @@ function getLabels(string $singular, string $plural): array
             $resCodeTypesToApply = Involvement_PostTypeSettings::getPostTypesWithGeoEnabled();
         }
         $resCodeTypesToApply[] = 'user';
-        $rt = register_taxonomy(
+        register_taxonomy(
             self::TAX_RESCODE,
             $resCodeTypesToApply,
             [
@@ -1257,28 +1296,7 @@ function getLabels(string $singular, string $plural): array
                 ],
             ]
         );
-        if (! is_wp_error($rt)) {
-            foreach ($this->getResCodes() as $rc) {
-                if ($rc->name !== null && ! Utilities::termExists($rc->name, self::TAX_RESCODE)) {
-                    $term = Utilities::insertTerm(
-                        $rc->name,
-                        self::TAX_RESCODE,
-                        [
-                            'description' => $rc->name,
-                            'slug'        => sanitize_title($rc->name)
-                        ]
-                    );
-                    if (is_wp_error($term)) {
-                        new TouchPointWP_WPError($term);
-                    } else {
-                        update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $rc->id);
-                    }
-
-                    self::queueFlushRewriteRules();
-                }
-            }
-            // TODO remove defunct res codes
-        }
+        // Terms inserted via insertTerms method
 
         // Campuses
         if ($this->settings->enable_campuses === "on") {
@@ -1287,7 +1305,7 @@ function getLabels(string $singular, string $plural): array
                 $campusesTypesToApply = Involvement_PostTypeSettings::getPostTypes();
             }
             $campusesTypesToApply[] = 'user';
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_CAMPUS,
                 $campusesTypesToApply,
                 [
@@ -1307,29 +1325,8 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                foreach ($this->getCampuses() as $c) {
-                    if ($c->name !== null && ! Utilities::termExists($c->name, self::TAX_CAMPUS)) {
-                        $term = Utilities::insertTerm(
-                            $c->name,
-                            self::TAX_CAMPUS,
-                            [
-                                'description' => $c->name,
-                                'slug'        => sanitize_title($c->code)
-                            ]
-                        );
-                        if (is_wp_error($term)) {
-                            new TouchPointWP_WPError($term);
-                        } else {
-                            update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $c->id);
-                        }
-
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
-        // TODO remove defunct campuses (including all of them, if disabled)
 
         // Divisions & Programs
         $divisionTypesToApply = [];
@@ -1338,7 +1335,7 @@ function getLabels(string $singular, string $plural): array
         }
         // TODO allow this taxonomy to be applied to other post types as an option.
         if (count($divisionTypesToApply) > 0) {
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_DIV,
                 $divisionTypesToApply,
                 [
@@ -1359,75 +1356,13 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                $enabledDivisions = $this->settings->dv_divisions;
-                foreach ($this->getDivisions() as $d) {
-                    if (in_array('div' . $d->id, $enabledDivisions)) {
-                        // Program
-                        $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-                        if ($pTermInfo === null && $d->pName !== null) {
-                            $pTermInfo = Utilities::insertTerm(
-                                $d->pName,
-                                self::TAX_DIV,
-                                [
-                                    'description' => $d->pName,
-                                    'slug'        => sanitize_title($d->pName)
-                                ]
-                            );
-                            if (is_wp_error($pTermInfo)) {
-                                new TouchPointWP_WPError($pTermInfo);
-                            } else {
-                                update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
-                            }
-
-                            self::queueFlushRewriteRules();
-                        }
-
-                        // Division
-                        $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-                        if ($dTermInfo === null && $d->dName !== null) {
-                            $dTermInfo = Utilities::insertTerm(
-                                $d->dName,
-                                self::TAX_DIV,
-                                [
-                                    'description' => $d->dName,
-                                    'parent'      => $pTermInfo['term_id'],
-                                    'slug'        => sanitize_title($d->dName)
-                                ]
-                            );
-                            if (is_wp_error($dTermInfo)) {
-                                new TouchPointWP_WPError($dTermInfo);
-                            } else {
-                                update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
-                            }
-
-                            self::queueFlushRewriteRules();
-                        }
-                    } else {
-                        // Remove terms that are disabled from importing.
-
-                        // Delete disabled divisions.  Get program, so we delete the right division.
-                        $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-                        if ($pTermInfo !== null) {
-                            $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-                            if ($dTermInfo !== null) {
-                                wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
-                                self::queueFlushRewriteRules();
-                            }
-                        }
-
-                        // Program
-                        // TODO remove programs that no longer have a division selected for use as a term.
-                        // TODO remove program & div terms that are no longer present in TouchPoint
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
 
         if ($this->settings->enable_involvements === "on") {
 
             // Weekdays
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_WEEKDAY,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1447,25 +1382,10 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                for ($di = 0; $di < 7; $di++) {
-                    $name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
-                    if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
-                        Utilities::insertTerm(
-                            $name,
-                            self::TAX_WEEKDAY,
-                            [
-                                'description' => $name,
-                                'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
 
             // Tenses
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_TENSE,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1485,31 +1405,11 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                foreach (
-                    [
-                        TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
-                        TouchPointWP::TAX_TENSE_PRESENT => 'Current',
-                        TouchPointWP::TAX_TENSE_PAST => 'Past',
-                    ] as $slug => $name
-                ) {
-                    if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
-                        Utilities::insertTerm(
-                            $name,
-                            self::TAX_TENSE,
-                            [
-                                'description' => $name,
-                                'slug'        => $slug
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
 
             // Time of Day
             /** @noinspection SpellCheckingInspection */
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_DAYTIME,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1529,32 +1429,7 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                $timesOfDay = [
-                    'Late Night',
-                    'Early Morning',
-                    'Morning',
-                    'Midday',
-                    'Afternoon',
-                    'Evening',
-                    'Night'
-                ];
-                foreach ($timesOfDay as $tod) {
-                    if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
-                        $slug = str_replace(" ", "", $tod);
-                        $slug = strtolower($slug);
-                        Utilities::insertTerm(
-                            $tod,
-                            self::TAX_DAYTIME,
-                            [
-                                'description' => $tod,
-                                'slug'        => $slug
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
 
         // Age Groups
@@ -1563,7 +1438,7 @@ function getLabels(string $singular, string $plural): array
             $ageGroupTypesToApply = Involvement_PostTypeSettings::getPostTypes();
         }
         $ageGroupTypesToApply[] = 'user';
-        $rt = register_taxonomy(
+        register_taxonomy(
             self::TAX_AGEGROUP,
             $ageGroupTypesToApply,
             [
@@ -1583,26 +1458,12 @@ function getLabels(string $singular, string $plural): array
                 ],
             ]
         );
-        if (! is_wp_error($rt)) {
-            foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
-                if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
-                    Utilities::insertTerm(
-                        $ag,
-                        self::TAX_AGEGROUP,
-                        [
-                            'description' => $ag,
-                            'slug'        => sanitize_title($ag)
-                        ]
-                    );
-                    self::queueFlushRewriteRules();
-                }
-            }
-        }
+        // Terms inserted via insertTerms method
 
 
         // Involvement Marital Status
         if ($this->settings->enable_involvements === "on") {
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_INV_MARITAL,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1622,21 +1483,7 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                foreach (['mostly_single', 'mostly_married'] as $ms) {
-                    if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
-                        Utilities::insertTerm(
-                            $ms,
-                            self::TAX_INV_MARITAL,
-                            [
-                                'description' => $ms,
-                                'slug'        => sanitize_title($ms)
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
 
         // Global Partner Category
@@ -1672,6 +1519,245 @@ function getLabels(string $singular, string $plural): array
         }
     }
 
+    /**
+     * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.
+     *
+     * @param object[]  $list
+     * @param string $taxonomy
+     * @param bool   $forceIdUpdate
+     *
+     * @return void
+     */
+    protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+    {
+        foreach ($list as $i) {
+            if ($i->name === null) {
+                continue;
+            }
+            // In addition to making sure term exists, make sure it has the correct meta id, too.
+            $term = Utilities::termExists($i->name, $taxonomy);
+            $idUpdate = $forceIdUpdate;
+            if (!$term) {
+                $term = Utilities::insertTerm(
+                    $i->name,
+                    $taxonomy,
+                    [
+                        'description' => $i->name,
+                        'slug'        => sanitize_title($i->name)
+                    ]
+                );
+                if (is_wp_error($term)) {
+                    new TouchPointWP_WPError($term);
+                    $term = null;
+                }
+                $idUpdate = true;
+            }
+            if ($term !== null && isset($term['term_id']) && $idUpdate) {
+                update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
+            }
+            if ($idUpdate) {
+                self::queueFlushRewriteRules();
+            }
+        }
+    }
+
+    public static bool $forceTermLookupIdUpdate = false;
+
+    /**
+     * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
+     * loaded.)
+     *
+     * @return void
+     */
+    public function insertTerms()
+    {
+        // Resident Codes
+        $this->insertTermsForLookupBasedTaxonomy(
+            $this->getResCodes(),
+            self::TAX_RESCODE,
+            self::$forceTermLookupIdUpdate
+        );
+        // TODO remove defunct res codes
+
+        // Campuses
+        if ($this->settings->enable_campuses === "on") {
+            $this->insertTermsForLookupBasedTaxonomy(
+                $this->getCampuses(),
+                self::TAX_CAMPUS,
+                self::$forceTermLookupIdUpdate
+            );
+        }
+        // TODO remove defunct campuses (including all of them, if disabled)
+
+        // Age Groups
+        foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
+            if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
+                Utilities::insertTerm(
+                    $ag,
+                    self::TAX_AGEGROUP,
+                    [
+                        'description' => $ag,
+                        'slug'        => sanitize_title($ag)
+                    ]
+                );
+                self::queueFlushRewriteRules();
+            }
+        }
+
+        // Involvements and TODO Events
+        $postTypesToApply = [];
+        if ($this->settings->enable_involvements === "on") {
+            $postTypesToApply = Involvement_PostTypeSettings::getPostTypes();
+        }
+        if (count($postTypesToApply) > 0) {
+
+            // Divisions & Programs
+            $enabledDivisions = $this->settings->dv_divisions;
+            foreach ($this->getDivisions() as $d) {
+                if (in_array('div' . $d->id, $enabledDivisions)) {
+                    // Program
+                    $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
+                    if ($pTermInfo === null && $d->pName !== null) {
+                        $pTermInfo = Utilities::insertTerm(
+                            $d->pName,
+                            self::TAX_DIV,
+                            [
+                                'description' => $d->pName,
+                                'slug'        => sanitize_title($d->pName)
+                            ]
+                        );
+                        if (is_wp_error($pTermInfo)) {
+                            new TouchPointWP_WPError($pTermInfo);
+                        } else {
+                            update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
+                        }
+
+                        self::queueFlushRewriteRules();
+                    }
+
+                    // Division
+                    $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+                    if ($dTermInfo === null && $d->dName !== null) {
+                        $dTermInfo = Utilities::insertTerm(
+                            $d->dName,
+                            self::TAX_DIV,
+                            [
+                                'description' => $d->dName,
+                                'parent'      => $pTermInfo['term_id'],
+                                'slug'        => sanitize_title($d->dName)
+                            ]
+                        );
+                        if (is_wp_error($dTermInfo)) {
+                            new TouchPointWP_WPError($dTermInfo);
+                        } else {
+                            update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
+                        }
+
+                        self::queueFlushRewriteRules();
+                    }
+                } else {
+                    // Remove terms that are disabled from importing.
+
+                    // Delete disabled divisions.  Get program, so we delete the right division.
+                    $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
+                    if ($pTermInfo !== null) {
+                        $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+                        if ($dTermInfo !== null) {
+                            wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
+                            self::queueFlushRewriteRules();
+                        }
+                    }
+
+                    // Program
+                    // TODO remove programs that no longer have a division selected for use as a term.
+                    // TODO remove program & div terms that are no longer present in TouchPoint
+                }
+            }
+
+            // Weekdays
+            for ($di = 0; $di < 7; $di++) {
+                $name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
+                if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
+                    Utilities::insertTerm(
+                        $name,
+                        self::TAX_WEEKDAY,
+                        [
+                            'description' => $name,
+                            'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+
+            // Tense
+            foreach (
+                [
+                    TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
+                    TouchPointWP::TAX_TENSE_PRESENT => 'Current',
+                    TouchPointWP::TAX_TENSE_PAST => 'Past',
+                ] as $slug => $name
+            ) {
+                if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
+                    Utilities::insertTerm(
+                        $name,
+                        self::TAX_TENSE,
+                        [
+                            'description' => $name,
+                            'slug'        => $slug
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+
+            // Time of Day
+            $timesOfDay = [
+                'Late Night',
+                'Early Morning',
+                'Morning',
+                'Midday',
+                'Afternoon',
+                'Evening',
+                'Night'
+            ];
+            foreach ($timesOfDay as $tod) {
+                if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
+                    $slug = str_replace(" ", "", $tod);
+                    $slug = strtolower($slug);
+                    Utilities::insertTerm(
+                        $tod,
+                        self::TAX_DAYTIME,
+                        [
+                            'description' => $tod,
+                            'slug'        => $slug
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+        }
+
+        // Involvements
+        if ($this->settings->enable_involvements === "on") {
+
+            // Involvement Marital Status
+            foreach (['mostly_single', 'mostly_married'] as $ms) {
+                if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
+                    Utilities::insertTerm(
+                        $ms,
+                        self::TAX_INV_MARITAL,
+                        [
+                            'description' => $ms,
+                            'slug'        => sanitize_title($ms)
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+        }
+    }
+
     private static array $divisionTerms = [];
 
     /**
@@ -1749,9 +1835,7 @@ public function activation()
     {
         self::queueFlushRewriteRules();
 
-        $this->createTables();
-
-        $this->settings->migrate();
+        $this->migrate(true);
     }
 
     /**
@@ -1793,26 +1877,6 @@ protected static function clearScheduledHooks(): void
         wp_clear_scheduled_hook(Report::CRON_HOOK);
     }
 
-    /**
-     * Create or update database tables
-     */
-    protected function createTables(): void
-    {
-        global $wpdb;
-        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-        // IP Geo Caching table
-        $tableName = $wpdb->base_prefix . self::TABLE_IP_GEO;
-        $sql = "CREATE TABLE $tableName (
-            id int(10) unsigned NOT NULL auto_increment,
-            ip varbinary(16) NOT NULL UNIQUE,
-            updatedDT datetime DEFAULT NOW(),
-            data text NOT NULL,
-            PRIMARY KEY  (id)
-        )";
-        dbDelta($sql);
-    }
-
     /**
      * Drop database tables at uninstallation.
      */
@@ -1835,7 +1899,7 @@ protected static function dropTables(): void
      */
     private function _log_version_number()
     {
-        update_option(self::TOKEN . '_version', self::VERSION, false);
+        update_option(self::TOKEN . '_version', self::VERSION, true);
     }
 
     /**
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 24a5c86a..9452cac0 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -88,7 +88,7 @@ public static function api(array $uri): bool
                 if (!TouchPointWP::currentUserIsAdmin()) {
                     return false;
                 }
-                TouchPointWP::instance()->settings->migrate();
+                TouchPointWP::instance()->migrate(true);
                 exit;
         }
 
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 7bf47ed0..0f9e8dfc 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -180,6 +180,31 @@ public function hasValidApiSettings(): bool
                $this->getWithoutDefault('api_pass') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER);
     }
 
+    /**
+     * Used internally to determine if a particular setting should be auto-loaded.
+     *
+     * @param string $settingName
+     *
+     * @return bool
+     */
+    private function settingShouldBeAutoLoaded(string $settingName): bool
+    {
+        if (str_contains($settingName, '_cron_last_run')) {
+            return true;
+        }
+        foreach (self::settingsFields() as $page) {
+            foreach ($page['fields'] as $f) {
+                if ($f['id'] === $settingName) {
+                    if (isset($f['autoload'])) {
+                        return !!$f['autoload'];
+                    }
+                    return false;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Build settings fields
      *
@@ -213,6 +238,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                     'callback'    => fn($new) => $this->validation_updateScriptsIfChanged($new, 'enable_authentication'),
                 ],
                 [
@@ -221,6 +247,7 @@ private function settingsFields($includeDetail = false): array
                     'description' => __('Add a crazy-simple RSVP button to WordPress event pages.', 'TouchPoint-WP'),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_involvements',
@@ -231,6 +258,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_people_lists',
@@ -241,6 +269,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_global',
@@ -251,6 +280,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_campuses',
@@ -261,6 +291,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'system_name',
@@ -1174,16 +1205,18 @@ protected function getWithoutDefault(string $what, $default = self::UNDEFINED_PL
     /**
      * @param string $what
      * @param mixed  $value
-     * @param bool   $autoload
+     * @param ?bool  $autoload
      *
      * @return false|mixed
      */
-    public function set(string $what, $value, bool $autoload = false): bool
+    public function set(string $what, $value, ?bool $autoload = null): bool
     {
+        if ($autoload === null) {
+            $autoload = $this->settingShouldBeAutoLoaded($what);
+        }
         return update_option(TouchPointWP::SETTINGS_PREFIX . $what, $value, $autoload); // TODO MULTI
     }
 
-
     /**
      * Migrate settings from version to version.  This may be called even when a migration isn't necessary.
      */
@@ -1314,14 +1347,7 @@ public function migrate(): void
 
 
         // 0.0.31 - Add lookup IDs to ResCodes
-        foreach (TouchPointWP::instance()->getResCodes() as $rc) {
-            $term = Utilities::termExists($rc->name, TouchPointWP::TAX_RESCODE);
-            if ($term !== null && isset($term['term_id'])) {
-                if (update_term_meta($term['term_id'], TouchPointWP::TAXMETA_LOOKUP_ID, $rc->id)) {
-                    TouchPointWP::queueFlushRewriteRules();
-                }
-            }
-        }
+        TouchPointWP::$forceTermLookupIdUpdate = true;
 
 
         // Update version string
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index f70ee4cf..13542342 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -18,8 +18,7 @@ def print_exception():  # From https://stackoverflow.com/a/20264059/2339939
     lineno = tb.tb_lineno
     filename = f.f_code.co_filename
     linecache.checkcache(filename)
-    line = linecache.getline(filename, lineno, f.f_globals)
-    print('EXCEPTION IN ({}, LINE {} "{}"): {}'.format(filename, lineno, line.strip(), exc_obj))
+    print('{} (L{})'.format(exc_obj, lineno))
 
 
 def get_person_info_for_sync(person_obj):
@@ -1166,6 +1165,9 @@ def get_person_info_for_sync(person_obj):
                 model.Title = "Login"
                 model.Header = "Processing..."
 
+                if response == "":
+                    raise Exception("Could not communicate with WordPress server.")
+
                 response = json.loads(response)
 
                 if "error" in response:
@@ -1199,10 +1201,8 @@ def get_person_info_for_sync(person_obj):
             print("<p>Please email the following error message to <b>" + model.Setting("AdminMail",
                                                                                        "the church staff") + "</b>.</p><pre>")
             print(response)
-            print("</pre>")
-            print("<!-- Exception Raised: ")
             print_exception()
-            print(" -->")
+            print("</pre>")
 
 if not apiCalled:
     model.Title = "Invalid Request"

From a5510aa262e8e325dbed0f05d3bb21c85cbb615d Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Fri, 21 Jul 2023 22:49:32 -0400
Subject: [PATCH 005/423] Further updates to which options are autoloaded.

---
 src/TouchPoint-WP/TouchPointWP.php          |  1 +
 src/TouchPoint-WP/TouchPointWP_Settings.php | 25 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 1c8ad335..a8df67c8 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1552,6 +1552,7 @@ protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxono
                 }
                 $idUpdate = true;
             }
+            // Update the term meta if term is new, or if id update is forced.
             if ($term !== null && isset($term['term_id']) && $idUpdate) {
                 update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
             }
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 0f9e8dfc..1b57163e 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -189,7 +189,10 @@ public function hasValidApiSettings(): bool
      */
     private function settingShouldBeAutoLoaded(string $settingName): bool
     {
-        if (str_contains($settingName, '_cron_last_run')) {
+        if (str_contains($settingName, '_cron_last_run')
+            || $settingName === "DEBUG"
+            || $settingName === "meta_familyEvFields" // because it's used when registering the taxonomies on every init.
+        ) {
             return true;
         }
         foreach (self::settingsFields() as $page) {
@@ -313,6 +316,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => 'mychurch.tpsdb.com',
                     'callback'    => [$this, 'validation_lowercase']
                 ],
@@ -338,6 +342,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -349,6 +354,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text_secret',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => $this->passwordPlaceholder('api_pass'),
                     'callback'    => fn($new) => $this->validation_secret($new, 'api_pass')
                 ],
@@ -361,6 +367,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'WebApi',
+                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -372,6 +379,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -389,7 +397,8 @@ private function settingsFields($includeDetail = false): array
         ];
 
         // Add Script generation section if necessary settings are established.
-        if ($this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
+        if ($includeDetail
+            && $this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
             && $this->hasValidApiSettings()) {
             /** @noinspection HtmlUnknownTarget */
             $this->settings['basic']['fields'][] = [
@@ -535,6 +544,7 @@ private function settingsFields($includeDetail = false): array
                         'type'        => 'textarea',
                         'label'       => __('Involvement Post Types', 'TouchPoint-WP'),
                         'default'     => '[]',
+                        'autoload'    => true,
                         'hidden'      => true,
                         'description' => !$includeThis ? "" : function() {
                             TouchPointWP::requireScript("base");
@@ -617,6 +627,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'partners',
+                        'autoload'    => true,
                         'placeholder' => 'partners',
                         'callback'    => fn($new) => $this->validation_slug($new, 'global_slug')
                     ],
@@ -708,6 +719,7 @@ private function settingsFields($includeDetail = false): array
                         'type'        => 'select',
                         'options'     => $includeThis ? $this->parent->getFamilyEvFieldsAsKVArray('code', true) : [],
                         'default'     => [],
+                        'autoload'    => true,
                     ],
                 ],
             ];
@@ -764,6 +776,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Divisions',
+                    'autoload'    => true,
                     'placeholder' => 'Divisions'
                 ],
                 [
@@ -775,6 +788,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Division',
+                    'autoload'    => true,
                     'placeholder' => 'Division'
                 ],
                 [
@@ -786,6 +800,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'div',
+                    'autoload'    => true,
                     'placeholder' => 'div',
                     'callback'    => fn($new) => $this->validation_slug($new, 'dv_slug')
                 ],
@@ -844,6 +859,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'Campuses',
+                        'autoload'    => true,
                         'placeholder' => 'Campuses'
                     ],
                     [
@@ -855,6 +871,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'Campus',
+                        'autoload'    => true,
                         'placeholder' => 'Campus'
                     ],
                     [
@@ -866,6 +883,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'campus',
+                        'autoload'    => true,
                         'placeholder' => 'campus',
                         'callback'    => fn($new) => $this->validation_slug($new, 'camp_slug')
                     ]
@@ -886,6 +904,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Resident Codes',
+                    'autoload'    => true,
                     'placeholder' => 'Resident Codes'
                 ],
                 [
@@ -897,6 +916,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Resident Code',
+                    'autoload'    => true,
                     'placeholder' => 'Resident Code'
                 ],
                 [
@@ -908,6 +928,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'rescodes',
+                    'autoload'    => true,
                     'placeholder' => 'rescodes',
                     'callback'    => fn($new) => $this->validation_slug($new, 'rc_slug')
                 ]

From a1e48b71ef9c1b72d18b63d978e3c18a112a82d2 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Tue, 8 Aug 2023 07:24:16 -0400
Subject: [PATCH 006/423] Adding filter for report classes

---
 src/TouchPoint-WP/Report.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 837ac966..7d01c0e3 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -35,6 +35,8 @@ class Report implements api, module, JsonSerializable, updatesViaCron
     public const NAME_META_KEY = self::META_PREFIX . "name";
     public const P1_META_KEY = self::META_PREFIX . "p1";
     public const DEFAULT_CONTENT = '';
+    public const FIGURE_CLASS_FILTER = TouchPointWP::SETTINGS_PREFIX . "rpt_figure_class";
+    public const FIGURE_CLASS_DEFAULT = "TouchPoint-report";
 
 
     public static bool $_isLoaded = false;
@@ -286,7 +288,8 @@ public static function reportShortcode($params = [], string $content = ""): stri
 
         // Add Figure elt with a unique ID
         $idAttr = "id=\"" . wp_unique_id('tp-report-') . "\"";
-        $rc = "<figure $idAttr>\n\t" . str_replace("\n", "\n\t", $rc);
+        $class = apply_filters(self::FIGURE_CLASS_FILTER, self::FIGURE_CLASS_DEFAULT);
+        $rc = "<figure $idAttr class=\"$class\">\n\t" . str_replace("\n", "\n\t", $rc);
 
         // If desired, add a caption that indicates when the table was last updated.
         if ($params['showupdated']) {

From d963685cb10ec34e23abf807893401d2cf7a0e7b Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Thu, 10 Aug 2023 15:57:38 -0400
Subject: [PATCH 007/423] Updates related to changed dev environment

---
 .gitignore     | 3 ++-
 .idea/misc.xml | 1 -
 .idea/php.xml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0380c8f9..2f612cad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ node_modules
 package-lock.json
 
 /build/
-/touchpoint-wp.zip
\ No newline at end of file
+/touchpoint-wp.zip
+/composer.phar
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 591fc5ab..691dd2ff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
diff --git a/.idea/php.xml b/.idea/php.xml
index 05d47f11..299cb8ee 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -13,6 +13,7 @@
     <include_path>
       <path value="$PROJECT_DIR$/../WordPressDemo" />
       <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/../TenthDev/app/public" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.4">

From 19b15cff9b64f3f05f4533da0cd79c149802c7c2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Aug 2023 22:14:55 -0400
Subject: [PATCH 008/423] Resolving an issue with how settings are defined

---
 src/TouchPoint-WP/TouchPointWP_Settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 1b57163e..707ca003 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1401,7 +1401,7 @@ public function updateDeployedScripts(): void
      */
     public function registerSettings(): void
     {
-        $currentSection = false;
+        $currentSection = 'basic'; // basic is the default.
         if (isset($_POST['tab']) && $_POST['tab']) {
             $currentSection = $_POST['tab'];
         } elseif (isset($_GET['tab']) && $_GET['tab']) {
@@ -1411,7 +1411,7 @@ public function registerSettings(): void
         $this->settings = $this->settingsFields($currentSection);
         foreach ($this->settings as $section => $data) {
             // Check posted/selected tab.
-            if ($currentSection && $currentSection !== $section) {
+            if ($currentSection !== $section) {
                 continue;
             }
 

From 9c9d71560e6815691be19d0b37828fd5eda9b969 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Mon, 14 Aug 2023 22:29:41 -0400
Subject: [PATCH 009/423] Reworking build procedure to maintain a local build
 directory during development.

---
 .gitignore                       |  4 +---
 build.sh                         | 19 +++++++++----------
 generateI18n_1forTranslation.ps1 |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f612cad..236fe5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@ composer.lock
 /assets/images/people
 /TouchPointWP_ErrorLog.txt
 /.phpdoc/
-/phpDocumentor.phar
-/wp-cli.phar
+*.phar
 
 /.idea/workspace.xml
 /.idea/usage.statistics.xml
@@ -24,4 +23,3 @@ package-lock.json
 
 /build/
 /touchpoint-wp.zip
-/composer.phar
diff --git a/build.sh b/build.sh
index b69c25e7..772b2e07 100644
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,7 @@ uglifyjs -o build/assets/js/meeting-defer.min.js -- assets/js/meeting-defer.js
 uglifyjs -o build/assets/js/partner-defer.min.js -- assets/js/partner-defer.js
 cp -r assets build
 cd ./build || exit
-zip -r ../touchpoint-wp.zip assets
+#zip -r ../touchpoint-wp.zip assets
 cd ..
 
 
@@ -35,15 +35,14 @@ cp -r ./i18n ./build/i18n
 
 php ./wp-cli.phar i18n make-json ./build/i18n
 php ./wp-cli.phar i18n make-mo ./build/i18n
-cd ./build || exit
-zip -r ../touchpoint-wp.zip i18n
-cd ..
 
-zip -r touchpoint-wp.zip ./ext
-zip -r touchpoint-wp.zip ./src
+cp -r ./ext ./build/ext
+cp -r ./src ./build/src
 
-find . -maxdepth 1 -iname "*.php" -exec zip touchpoint-wp.zip {} \;
-find . -maxdepth 1 -iname "*.md" -exec zip touchpoint-wp.zip {} \;
-find . -maxdepth 1 -iname "*.json" -exec zip touchpoint-wp.zip {} \;
+find . -maxdepth 1 -iname "*.php" -exec cp {} build/ \;
+find . -maxdepth 1 -iname "*.md" -exec cp {} build/ \;
+find . -maxdepth 1 -iname "*.json" -exec cp {} build/ \;
 
-rm -r build
\ No newline at end of file
+cd ./build || exit
+find . -exec zip ../touchpoint-wp.zip {} \;
+cd ..
diff --git a/generateI18n_1forTranslation.ps1 b/generateI18n_1forTranslation.ps1
index cc5a901d..e23662c6 100644
--- a/generateI18n_1forTranslation.ps1
+++ b/generateI18n_1forTranslation.ps1
@@ -7,5 +7,5 @@ if (!(test-path $pharFile -newerThan $compareDt))
     Invoke-WebRequest https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -OutFile $pharFile
 }
 
-php .\wp-cli.phar i18n make-pot . i18n/TouchPoint-WP.pot
+php .\wp-cli.phar i18n make-pot . i18n/TouchPoint-WP.pot --exclude=build
 php .\wp-cli.phar i18n update-po i18n/TouchPoint-WP.pot
\ No newline at end of file

From 27601ab876b62d99647a63339427070ec3188cb1 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Mon, 14 Aug 2023 22:30:57 -0400
Subject: [PATCH 010/423] Adding jetbrains run profiles

---
 .idea/runConfigurations/Build__WSL_.xml         | 17 +++++++++++++++++
 .../i18n__1_for_Translation.xml                 | 17 +++++++++++++++++
 .idea/runConfigurations/i18n__2_for_Publish.xml | 17 +++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 .idea/runConfigurations/Build__WSL_.xml
 create mode 100644 .idea/runConfigurations/i18n__1_for_Translation.xml
 create mode 100644 .idea/runConfigurations/i18n__2_for_Publish.xml

diff --git a/.idea/runConfigurations/Build__WSL_.xml b/.idea/runConfigurations/Build__WSL_.xml
new file mode 100644
index 00000000..d2225246
--- /dev/null
+++ b/.idea/runConfigurations/Build__WSL_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build (WSL)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="wsl -e ./build.sh" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/i18n__1_for_Translation.xml b/.idea/runConfigurations/i18n__1_for_Translation.xml
new file mode 100644
index 00000000..8f161b58
--- /dev/null
+++ b/.idea/runConfigurations/i18n__1_for_Translation.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="i18n #1 for Translation" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="powershell ./generateI18n_1forTranslation.ps1" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/i18n__2_for_Publish.xml b/.idea/runConfigurations/i18n__2_for_Publish.xml
new file mode 100644
index 00000000..30b2968d
--- /dev/null
+++ b/.idea/runConfigurations/i18n__2_for_Publish.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="i18n #2 for Publish" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="powershell ./generateI18n_2forPublish.ps1" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

From 8bd438ac43d57cc2c17271179b2b139a12c51d1e Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Tue, 15 Aug 2023 15:25:10 -0400
Subject: [PATCH 011/423] build improvements

---
 .github/workflows/releases.yml | 4 ++--
 .idea/misc.xml                 | 3 ++-
 build.sh                       | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 5b1c26a6..5d315037 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -1,10 +1,10 @@
+name: Create Release
+
 on:
   push:
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
-name: Create Release
-
 jobs:
   build:
     name: Create Release
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 691dd2ff..ec30493f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="Python 3.10 (TouchPointScripts)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 772b2e07..1f1eb7ad 100644
--- a/build.sh
+++ b/build.sh
@@ -24,12 +24,13 @@ uglifyjs -o build/assets/js/meeting-defer.min.js -- assets/js/meeting-defer.js
 uglifyjs -o build/assets/js/partner-defer.min.js -- assets/js/partner-defer.js
 cp -r assets build
 cd ./build || exit
-#zip -r ../touchpoint-wp.zip assets
 cd ..
 
 
 # compile translations
-wget -O wp-cli.phar https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+if [ ! -f wp-cli.phar ]; then
+    wget -O wp-cli.phar https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+fi
 
 cp -r ./i18n ./build/i18n
 

From 136e61ea2f893efa0c660f0f72e8b70a8f8e2a12 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Aug 2023 22:46:18 -0400
Subject: [PATCH 012/423] Added an endpoint to spit out phpinfo.

---
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 24a5c86a..ae6bc5a7 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -90,6 +90,13 @@ public static function api(array $uri): bool
                 }
                 TouchPointWP::instance()->settings->migrate();
                 exit;
+
+            case "phpinfo":
+	            if (!TouchPointWP::currentUserIsAdmin()) {
+		            return false;
+	            }
+	            phpinfo();
+	            exit;
         }
 
         return false;

From 44da8de7f598e10aca4e2f52542b0a2268260760 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Aug 2023 22:46:44 -0400
Subject: [PATCH 013/423] Som very, VERY minor memory improvements

---
 src/TouchPoint-WP/Involvement.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 58bbb603..ff43e69e 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -364,6 +364,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
                 $count += $update;
             }
         }
+		unset($type);
 
         if ($success && $count !== 0) {
             TouchPointWP::instance()->settings->set('inv_cron_last_run', time());
@@ -2087,6 +2088,7 @@ final protected static function updateInvolvementPostsForType(
         } catch (TouchPointWP_Exception $e) {
             return false;
         }
+		unset($qOpts);
 
         $invData = $response->invs ?? []; // null coalesce for case where there is no data.
 
@@ -2512,8 +2514,10 @@ final protected static function updateInvolvementPostsForType(
             if ($verbose) {
                 echo "<hr />";
             }
-        }
 
+			unset($post);
+        }
+		unset($inv);
 
         //////////////////
         //// Removals ////

From 7f4805ca612588bc2127d60b970120832bd0421c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 25 Aug 2023 12:51:10 -0400
Subject: [PATCH 014/423] A few diagnostic tools for involvement syncing

---
 .idea/misc.xml                    |  1 -
 src/TouchPoint-WP/Involvement.php | 26 ++++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 591fc5ab..691dd2ff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index ff43e69e..535687c3 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -345,7 +345,14 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
         $verbose &= TouchPointWP::currentUserIsAdmin();
 
-        foreach (self::allTypeSettings() as $type) {
+        foreach (self::allTypeSettings() as $k => $type) {
+
+			// TODO this is temp debugging code to allow only one post type to be synced during a force-sync.
+			if ($verbose && isset($_GET['type'])) {
+				if (intval($k) !== intval($_GET['type']))
+					continue;
+			}
+
             if (count($type->importDivs) < 1) {
                 // Don't update if there aren't any divisions selected yet.
                 if ($verbose) {
@@ -356,7 +363,14 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
             // Divisions
             $divs   = Utilities::idArrayToIntArray($type->importDivs, false);
-            $update = self::updateInvolvementPostsForType($type, $divs, $verbose);
+			try {
+				$update = self::updateInvolvementPostsForType($type, $divs, $verbose);
+			} catch (Exception $e) {
+				if ($verbose) {
+					echo "An exception occurred while syncing $type->namePlural: " . $e->getMessage();
+				}
+				continue;
+			}
 
             if ($update === false) {
                 $success = false;
@@ -2108,13 +2122,21 @@ final protected static function updateInvolvementPostsForType(
             return false;
         }
 
+		$count = 0;
         foreach ($invData as $inv) {
             set_time_limit(15);
+			$count++;
 
             if ($verbose) {
                 var_dump($inv);
             }
 
+	        // TODO this is temp debugging code to allow only one post type to be synced during a force-sync.
+	        if ($verbose && isset($_GET['limit'])) {
+		        if ($count > intval($_GET['limit']))
+			        continue;
+	        }
+
 
             ////////////////////////
             // Standardize Inputs //

From cf64126d4650ec83437ca0a3a01adf8743683006 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Mon, 14 Aug 2023 22:29:41 -0400
Subject: [PATCH 015/423] Reworking build procedure to maintain a local build
 directory during development.

---
 .gitignore                       |  5 ++---
 build.sh                         | 19 +++++++++----------
 generateI18n_1forTranslation.ps1 |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0380c8f9..236fe5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@ composer.lock
 /assets/images/people
 /TouchPointWP_ErrorLog.txt
 /.phpdoc/
-/phpDocumentor.phar
-/wp-cli.phar
+*.phar
 
 /.idea/workspace.xml
 /.idea/usage.statistics.xml
@@ -23,4 +22,4 @@ node_modules
 package-lock.json
 
 /build/
-/touchpoint-wp.zip
\ No newline at end of file
+/touchpoint-wp.zip
diff --git a/build.sh b/build.sh
index b69c25e7..772b2e07 100644
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,7 @@ uglifyjs -o build/assets/js/meeting-defer.min.js -- assets/js/meeting-defer.js
 uglifyjs -o build/assets/js/partner-defer.min.js -- assets/js/partner-defer.js
 cp -r assets build
 cd ./build || exit
-zip -r ../touchpoint-wp.zip assets
+#zip -r ../touchpoint-wp.zip assets
 cd ..
 
 
@@ -35,15 +35,14 @@ cp -r ./i18n ./build/i18n
 
 php ./wp-cli.phar i18n make-json ./build/i18n
 php ./wp-cli.phar i18n make-mo ./build/i18n
-cd ./build || exit
-zip -r ../touchpoint-wp.zip i18n
-cd ..
 
-zip -r touchpoint-wp.zip ./ext
-zip -r touchpoint-wp.zip ./src
+cp -r ./ext ./build/ext
+cp -r ./src ./build/src
 
-find . -maxdepth 1 -iname "*.php" -exec zip touchpoint-wp.zip {} \;
-find . -maxdepth 1 -iname "*.md" -exec zip touchpoint-wp.zip {} \;
-find . -maxdepth 1 -iname "*.json" -exec zip touchpoint-wp.zip {} \;
+find . -maxdepth 1 -iname "*.php" -exec cp {} build/ \;
+find . -maxdepth 1 -iname "*.md" -exec cp {} build/ \;
+find . -maxdepth 1 -iname "*.json" -exec cp {} build/ \;
 
-rm -r build
\ No newline at end of file
+cd ./build || exit
+find . -exec zip ../touchpoint-wp.zip {} \;
+cd ..
diff --git a/generateI18n_1forTranslation.ps1 b/generateI18n_1forTranslation.ps1
index cc5a901d..e23662c6 100644
--- a/generateI18n_1forTranslation.ps1
+++ b/generateI18n_1forTranslation.ps1
@@ -7,5 +7,5 @@ if (!(test-path $pharFile -newerThan $compareDt))
     Invoke-WebRequest https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -OutFile $pharFile
 }
 
-php .\wp-cli.phar i18n make-pot . i18n/TouchPoint-WP.pot
+php .\wp-cli.phar i18n make-pot . i18n/TouchPoint-WP.pot --exclude=build
 php .\wp-cli.phar i18n update-po i18n/TouchPoint-WP.pot
\ No newline at end of file

From 41bd37d02d01cb3cfc04b6ce18ccbd6e0ffeb8c5 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Thu, 29 Jun 2023 00:21:37 -0400
Subject: [PATCH 016/423] Resolve an issue with wp admin improperly handling
 migrations during plugin update.

---
 src/TouchPoint-WP/TouchPointWP.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 41016a12..1ecb1308 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -493,7 +493,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
      */
     public static function currentUserIsAdmin(): bool
     {
-        if (!function_exists('current_user_can'))
+        if (!function_exists('current_user_can') || !function_exists('wp_get_current_user'))
             return false;
         return current_user_can('manage_options');
     }

From 8ecc5c2bf40722918b33d3a86faeb08386e64340 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Tue, 18 Jul 2023 18:23:24 -0400
Subject: [PATCH 017/423] Adding check that plugin has only been initialized
 once.

---
 src/TouchPoint-WP/TouchPointWP.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 1ecb1308..8e837589 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -710,9 +710,22 @@ public static function load($file): TouchPointWP
         return $instance;
     }
 
+    /**
+     * @var bool True of the init process has run.  False if not.  Prevents things from happening twice, which can cause errors.
+     */
+    private static bool $_hasBeenInited = false;
+
+    /**
+     * Initialize the plugin.
+     *
+     * @return void
+     */
     public static function init(): void
     {
-	    self::instance()->loadLocalizations();
+	    if (self::$_hasBeenInited)
+            return;
+
+        self::instance()->loadLocalizations();
 
         self::instance()->registerTaxonomies();
 
@@ -722,6 +735,8 @@ public static function init(): void
         // If the scripts need to be updated, do that.
         self::instance()->updateDeployedScripts();
 
+        self::$_hasBeenInited = true;
+
         self::requireScript("base");
 
         do_action(self::INIT_ACTION_HOOK);

From 032c1ecf169cecb0f887c0e4da42bc72ca1e2186 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Fri, 21 Jul 2023 10:12:08 -0400
Subject: [PATCH 018/423] Style improvement for "sign in with TouchPoint" link

---
 src/TouchPoint-WP/Auth.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 9b94f057..598d5c3c 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -129,18 +129,17 @@ public static function footer()
      */
     public static function printLoginLink()
     {
-        $html = '<p class="touchpoint-wp-auth-form-text">';
+        $html = '<p class="touchpoint-wp-auth-form">';
+        $url = self::getLoginUrl();
         /** @noinspection HtmlUnknownTarget */
-        $html .= '<a href="%s">';
+        $html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
         $html .= sprintf(
             // translators: %s is "what you call TouchPoint at your church", which is a setting
             __('Sign in with your %s account', 'TouchPoint-WP'),
             htmlentities(TouchPointWP::instance()->settings->system_name)
         );
-        printf(
-            $html,
-            self::getLoginUrl()
-        );
+        $html .= '</a></p>';
+        echo $html;
     }
 
     /**

From eb6fbc60d89903fd6b727b6f6d277b956f39343d Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Fri, 21 Jul 2023 11:49:06 -0400
Subject: [PATCH 019/423] Significant performance improvement by reducing db
 queries. Also, better error reporting in python.

---
 src/TouchPoint-WP/TouchPointWP.php          | 542 +++++++++++---------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php |   2 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php |  48 +-
 src/python/WebApi.py                        |  10 +-
 4 files changed, 346 insertions(+), 256 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 8e837589..a1485e9a 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -450,7 +450,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
                     return $continue;
                 }
             }
-            
+
             // Auth endpoints
             if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_AUTH &&
                 $this->settings->enable_authentication === "on"
@@ -623,14 +623,44 @@ public function loadLocalizations()
 	    load_plugin_textdomain('TouchPoint-WP', false, $dir . '/i18n/');
     }
 
+    /**
+     * Create or update database tables
+     */
+    protected function createTables(): void
+    {
+        global $wpdb;
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
+        // IP Geo Caching table
+        $tableName = $wpdb->base_prefix . TouchPointWP::TABLE_IP_GEO;
+        $sql = "CREATE TABLE $tableName (
+            id int(10) unsigned NOT NULL auto_increment,
+            ip varbinary(16) NOT NULL UNIQUE,
+            updatedDT datetime DEFAULT NOW(),
+            data text NOT NULL,
+            PRIMARY KEY  (id)
+        )";
+        dbDelta($sql);
+    }
+
     /**
      * Compare the version numbers to determine if a migration is needed.
      */
-    public function checkMigrations(): void
+    public function migrate($force = false): void
     {
-        if ($this->settings->version !== self::VERSION) {
-            $this->settings->migrate();
+        if ($this->settings->version === self::VERSION && !$force) {
+            return;
         }
+
+        $this->createTables();
+
+        if (self::$_hasBeenInited) {
+            $this->insertTerms();
+        } else {
+            add_action(self::INIT_ACTION_HOOK, [$this, 'insertTerms']);
+        }
+
+        $this->settings->migrate();
     }
 
     /**
@@ -647,7 +677,7 @@ public static function load($file): TouchPointWP
         if (is_null($instance->settings)) {
             $instance->settings = TouchPointWP_Settings::instance($instance);
             if (is_admin()) {
-                $instance->checkMigrations();
+                $instance->migrate();
             }
         }
 
@@ -702,7 +732,7 @@ public static function load($file): TouchPointWP
         // Load Reports (feature is always enabled)
         $instance->reports = Report::load();
 
-        add_action('init', [self::class, 'init']);
+        add_action('init', [self::class, 'init'], 10);
 
 	    add_filter('the_content', [self::class, 'capitalPyScript'], 11);
 	    add_filter('widget_text_content', [self::class, 'capitalPyScript'], 11);
@@ -742,6 +772,12 @@ public static function init(): void
         do_action(self::INIT_ACTION_HOOK);
     }
 
+    /**
+     * Prints the inline 'base' script.  This is meant to be called in the wp_head and admin_head, and should only be
+     * called once on a page, but that is not automatically validated.
+     *
+     * @return void
+     */
     public static function renderBaseInlineScript(): void
     {
 		include self::instance()->assets_dir . '/js/base-inline.php';
@@ -765,7 +801,10 @@ public function registerScriptsAndStyles(): void
             self::VERSION,
             true
         );
-	    wp_set_script_translations(self::SHORTCODE_PREFIX . 'base-defer', 'TouchPoint-WP', $this->getJsLocalizationDir());
+	    wp_set_script_translations(
+            self::SHORTCODE_PREFIX . 'base-defer',
+            'TouchPoint-WP', $this->getJsLocalizationDir()
+        );
 
 	    wp_register_script(
             self::SHORTCODE_PREFIX . 'swal2-defer',
@@ -1234,7 +1273,7 @@ function getLabels(string $singular, string $plural): array
             $resCodeTypesToApply = Involvement_PostTypeSettings::getPostTypesWithGeoEnabled();
         }
         $resCodeTypesToApply[] = 'user';
-        $rt = register_taxonomy(
+        register_taxonomy(
             self::TAX_RESCODE,
             $resCodeTypesToApply,
             [
@@ -1257,28 +1296,7 @@ function getLabels(string $singular, string $plural): array
                 ],
             ]
         );
-        if (! is_wp_error($rt)) {
-            foreach ($this->getResCodes() as $rc) {
-                if ($rc->name !== null && ! Utilities::termExists($rc->name, self::TAX_RESCODE)) {
-                    $term = Utilities::insertTerm(
-                        $rc->name,
-                        self::TAX_RESCODE,
-                        [
-                            'description' => $rc->name,
-                            'slug'        => sanitize_title($rc->name)
-                        ]
-                    );
-                    if (is_wp_error($term)) {
-                        new TouchPointWP_WPError($term);
-                    } else {
-                        update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $rc->id);
-                    }
-
-                    self::queueFlushRewriteRules();
-                }
-            }
-            // TODO remove defunct res codes
-        }
+        // Terms inserted via insertTerms method
 
         // Campuses
         if ($this->settings->enable_campuses === "on") {
@@ -1287,7 +1305,7 @@ function getLabels(string $singular, string $plural): array
                 $campusesTypesToApply = Involvement_PostTypeSettings::getPostTypes();
             }
             $campusesTypesToApply[] = 'user';
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_CAMPUS,
                 $campusesTypesToApply,
                 [
@@ -1307,29 +1325,8 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                foreach ($this->getCampuses() as $c) {
-                    if ($c->name !== null && ! Utilities::termExists($c->name, self::TAX_CAMPUS)) {
-                        $term = Utilities::insertTerm(
-                            $c->name,
-                            self::TAX_CAMPUS,
-                            [
-                                'description' => $c->name,
-                                'slug'        => sanitize_title($c->code)
-                            ]
-                        );
-                        if (is_wp_error($term)) {
-                            new TouchPointWP_WPError($term);
-                        } else {
-                            update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $c->id);
-                        }
-
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
-        // TODO remove defunct campuses (including all of them, if disabled)
 
         // Divisions & Programs
         $divisionTypesToApply = [];
@@ -1338,7 +1335,7 @@ function getLabels(string $singular, string $plural): array
         }
         // TODO allow this taxonomy to be applied to other post types as an option.
         if (count($divisionTypesToApply) > 0) {
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_DIV,
                 $divisionTypesToApply,
                 [
@@ -1359,75 +1356,13 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                $enabledDivisions = $this->settings->dv_divisions;
-                foreach ($this->getDivisions() as $d) {
-                    if (in_array('div' . $d->id, $enabledDivisions)) {
-                        // Program
-                        $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-                        if ($pTermInfo === null && $d->pName !== null) {
-                            $pTermInfo = Utilities::insertTerm(
-                                $d->pName,
-                                self::TAX_DIV,
-                                [
-                                    'description' => $d->pName,
-                                    'slug'        => sanitize_title($d->pName)
-                                ]
-                            );
-                            if (is_wp_error($pTermInfo)) {
-                                new TouchPointWP_WPError($pTermInfo);
-                            } else {
-                                update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
-                            }
-
-                            self::queueFlushRewriteRules();
-                        }
-
-                        // Division
-                        $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-                        if ($dTermInfo === null && $d->dName !== null) {
-                            $dTermInfo = Utilities::insertTerm(
-                                $d->dName,
-                                self::TAX_DIV,
-                                [
-                                    'description' => $d->dName,
-                                    'parent'      => $pTermInfo['term_id'],
-                                    'slug'        => sanitize_title($d->dName)
-                                ]
-                            );
-                            if (is_wp_error($dTermInfo)) {
-                                new TouchPointWP_WPError($dTermInfo);
-                            } else {
-                                update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
-                            }
-
-                            self::queueFlushRewriteRules();
-                        }
-                    } else {
-                        // Remove terms that are disabled from importing.
-
-                        // Delete disabled divisions.  Get program, so we delete the right division.
-                        $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-                        if ($pTermInfo !== null) {
-                            $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-                            if ($dTermInfo !== null) {
-                                wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
-                                self::queueFlushRewriteRules();
-                            }
-                        }
-
-                        // Program
-                        // TODO remove programs that no longer have a division selected for use as a term.
-                        // TODO remove program & div terms that are no longer present in TouchPoint
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
 
         if ($this->settings->enable_involvements === "on") {
 
             // Weekdays
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_WEEKDAY,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1447,25 +1382,10 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                for ($di = 0; $di < 7; $di++) {
-                    $name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
-                    if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
-                        Utilities::insertTerm(
-                            $name,
-                            self::TAX_WEEKDAY,
-                            [
-                                'description' => $name,
-                                'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
 
             // Tenses
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_TENSE,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1485,31 +1405,11 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                foreach (
-                    [
-                        TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
-                        TouchPointWP::TAX_TENSE_PRESENT => 'Current',
-                        TouchPointWP::TAX_TENSE_PAST => 'Past',
-                    ] as $slug => $name
-                ) {
-                    if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
-                        Utilities::insertTerm(
-                            $name,
-                            self::TAX_TENSE,
-                            [
-                                'description' => $name,
-                                'slug'        => $slug
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
 
             // Time of Day
             /** @noinspection SpellCheckingInspection */
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_DAYTIME,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1529,32 +1429,7 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                $timesOfDay = [
-                    'Late Night',
-                    'Early Morning',
-                    'Morning',
-                    'Midday',
-                    'Afternoon',
-                    'Evening',
-                    'Night'
-                ];
-                foreach ($timesOfDay as $tod) {
-                    if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
-                        $slug = str_replace(" ", "", $tod);
-                        $slug = strtolower($slug);
-                        Utilities::insertTerm(
-                            $tod,
-                            self::TAX_DAYTIME,
-                            [
-                                'description' => $tod,
-                                'slug'        => $slug
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
 
         // Age Groups
@@ -1563,7 +1438,7 @@ function getLabels(string $singular, string $plural): array
             $ageGroupTypesToApply = Involvement_PostTypeSettings::getPostTypes();
         }
         $ageGroupTypesToApply[] = 'user';
-        $rt = register_taxonomy(
+        register_taxonomy(
             self::TAX_AGEGROUP,
             $ageGroupTypesToApply,
             [
@@ -1583,26 +1458,12 @@ function getLabels(string $singular, string $plural): array
                 ],
             ]
         );
-        if (! is_wp_error($rt)) {
-            foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
-                if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
-                    Utilities::insertTerm(
-                        $ag,
-                        self::TAX_AGEGROUP,
-                        [
-                            'description' => $ag,
-                            'slug'        => sanitize_title($ag)
-                        ]
-                    );
-                    self::queueFlushRewriteRules();
-                }
-            }
-        }
+        // Terms inserted via insertTerms method
 
 
         // Involvement Marital Status
         if ($this->settings->enable_involvements === "on") {
-            $rt = register_taxonomy(
+            register_taxonomy(
                 self::TAX_INV_MARITAL,
                 Involvement_PostTypeSettings::getPostTypes(),
                 [
@@ -1622,21 +1483,7 @@ function getLabels(string $singular, string $plural): array
                     ],
                 ]
             );
-            if (! is_wp_error($rt)) {
-                foreach (['mostly_single', 'mostly_married'] as $ms) {
-                    if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
-                        Utilities::insertTerm(
-                            $ms,
-                            self::TAX_INV_MARITAL,
-                            [
-                                'description' => $ms,
-                                'slug'        => sanitize_title($ms)
-                            ]
-                        );
-                        self::queueFlushRewriteRules();
-                    }
-                }
-            }
+            // Terms inserted via insertTerms method
         }
 
         // Global Partner Category
@@ -1672,6 +1519,245 @@ function getLabels(string $singular, string $plural): array
         }
     }
 
+    /**
+     * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.
+     *
+     * @param object[]  $list
+     * @param string $taxonomy
+     * @param bool   $forceIdUpdate
+     *
+     * @return void
+     */
+    protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+    {
+        foreach ($list as $i) {
+            if ($i->name === null) {
+                continue;
+            }
+            // In addition to making sure term exists, make sure it has the correct meta id, too.
+            $term = Utilities::termExists($i->name, $taxonomy);
+            $idUpdate = $forceIdUpdate;
+            if (!$term) {
+                $term = Utilities::insertTerm(
+                    $i->name,
+                    $taxonomy,
+                    [
+                        'description' => $i->name,
+                        'slug'        => sanitize_title($i->name)
+                    ]
+                );
+                if (is_wp_error($term)) {
+                    new TouchPointWP_WPError($term);
+                    $term = null;
+                }
+                $idUpdate = true;
+            }
+            if ($term !== null && isset($term['term_id']) && $idUpdate) {
+                update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
+            }
+            if ($idUpdate) {
+                self::queueFlushRewriteRules();
+            }
+        }
+    }
+
+    public static bool $forceTermLookupIdUpdate = false;
+
+    /**
+     * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
+     * loaded.)
+     *
+     * @return void
+     */
+    public function insertTerms()
+    {
+        // Resident Codes
+        $this->insertTermsForLookupBasedTaxonomy(
+            $this->getResCodes(),
+            self::TAX_RESCODE,
+            self::$forceTermLookupIdUpdate
+        );
+        // TODO remove defunct res codes
+
+        // Campuses
+        if ($this->settings->enable_campuses === "on") {
+            $this->insertTermsForLookupBasedTaxonomy(
+                $this->getCampuses(),
+                self::TAX_CAMPUS,
+                self::$forceTermLookupIdUpdate
+            );
+        }
+        // TODO remove defunct campuses (including all of them, if disabled)
+
+        // Age Groups
+        foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
+            if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
+                Utilities::insertTerm(
+                    $ag,
+                    self::TAX_AGEGROUP,
+                    [
+                        'description' => $ag,
+                        'slug'        => sanitize_title($ag)
+                    ]
+                );
+                self::queueFlushRewriteRules();
+            }
+        }
+
+        // Involvements and TODO Events
+        $postTypesToApply = [];
+        if ($this->settings->enable_involvements === "on") {
+            $postTypesToApply = Involvement_PostTypeSettings::getPostTypes();
+        }
+        if (count($postTypesToApply) > 0) {
+
+            // Divisions & Programs
+            $enabledDivisions = $this->settings->dv_divisions;
+            foreach ($this->getDivisions() as $d) {
+                if (in_array('div' . $d->id, $enabledDivisions)) {
+                    // Program
+                    $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
+                    if ($pTermInfo === null && $d->pName !== null) {
+                        $pTermInfo = Utilities::insertTerm(
+                            $d->pName,
+                            self::TAX_DIV,
+                            [
+                                'description' => $d->pName,
+                                'slug'        => sanitize_title($d->pName)
+                            ]
+                        );
+                        if (is_wp_error($pTermInfo)) {
+                            new TouchPointWP_WPError($pTermInfo);
+                        } else {
+                            update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
+                        }
+
+                        self::queueFlushRewriteRules();
+                    }
+
+                    // Division
+                    $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+                    if ($dTermInfo === null && $d->dName !== null) {
+                        $dTermInfo = Utilities::insertTerm(
+                            $d->dName,
+                            self::TAX_DIV,
+                            [
+                                'description' => $d->dName,
+                                'parent'      => $pTermInfo['term_id'],
+                                'slug'        => sanitize_title($d->dName)
+                            ]
+                        );
+                        if (is_wp_error($dTermInfo)) {
+                            new TouchPointWP_WPError($dTermInfo);
+                        } else {
+                            update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
+                        }
+
+                        self::queueFlushRewriteRules();
+                    }
+                } else {
+                    // Remove terms that are disabled from importing.
+
+                    // Delete disabled divisions.  Get program, so we delete the right division.
+                    $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
+                    if ($pTermInfo !== null) {
+                        $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+                        if ($dTermInfo !== null) {
+                            wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
+                            self::queueFlushRewriteRules();
+                        }
+                    }
+
+                    // Program
+                    // TODO remove programs that no longer have a division selected for use as a term.
+                    // TODO remove program & div terms that are no longer present in TouchPoint
+                }
+            }
+
+            // Weekdays
+            for ($di = 0; $di < 7; $di++) {
+                $name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
+                if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
+                    Utilities::insertTerm(
+                        $name,
+                        self::TAX_WEEKDAY,
+                        [
+                            'description' => $name,
+                            'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+
+            // Tense
+            foreach (
+                [
+                    TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
+                    TouchPointWP::TAX_TENSE_PRESENT => 'Current',
+                    TouchPointWP::TAX_TENSE_PAST => 'Past',
+                ] as $slug => $name
+            ) {
+                if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
+                    Utilities::insertTerm(
+                        $name,
+                        self::TAX_TENSE,
+                        [
+                            'description' => $name,
+                            'slug'        => $slug
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+
+            // Time of Day
+            $timesOfDay = [
+                'Late Night',
+                'Early Morning',
+                'Morning',
+                'Midday',
+                'Afternoon',
+                'Evening',
+                'Night'
+            ];
+            foreach ($timesOfDay as $tod) {
+                if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
+                    $slug = str_replace(" ", "", $tod);
+                    $slug = strtolower($slug);
+                    Utilities::insertTerm(
+                        $tod,
+                        self::TAX_DAYTIME,
+                        [
+                            'description' => $tod,
+                            'slug'        => $slug
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+        }
+
+        // Involvements
+        if ($this->settings->enable_involvements === "on") {
+
+            // Involvement Marital Status
+            foreach (['mostly_single', 'mostly_married'] as $ms) {
+                if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
+                    Utilities::insertTerm(
+                        $ms,
+                        self::TAX_INV_MARITAL,
+                        [
+                            'description' => $ms,
+                            'slug'        => sanitize_title($ms)
+                        ]
+                    );
+                    self::queueFlushRewriteRules();
+                }
+            }
+        }
+    }
+
     private static array $divisionTerms = [];
 
     /**
@@ -1749,9 +1835,7 @@ public function activation()
     {
         self::queueFlushRewriteRules();
 
-        $this->createTables();
-
-        $this->settings->migrate();
+        $this->migrate(true);
     }
 
     /**
@@ -1793,26 +1877,6 @@ protected static function clearScheduledHooks(): void
         wp_clear_scheduled_hook(Report::CRON_HOOK);
     }
 
-    /**
-     * Create or update database tables
-     */
-    protected function createTables(): void
-    {
-        global $wpdb;
-        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-        // IP Geo Caching table
-        $tableName = $wpdb->base_prefix . self::TABLE_IP_GEO;
-        $sql = "CREATE TABLE $tableName (
-            id int(10) unsigned NOT NULL auto_increment,
-            ip varbinary(16) NOT NULL UNIQUE,
-            updatedDT datetime DEFAULT NOW(),
-            data text NOT NULL,
-            PRIMARY KEY  (id)
-        )";
-        dbDelta($sql);
-    }
-
     /**
      * Drop database tables at uninstallation.
      */
@@ -1835,7 +1899,7 @@ protected static function dropTables(): void
      */
     private function _log_version_number()
     {
-        update_option(self::TOKEN . '_version', self::VERSION, false);
+        update_option(self::TOKEN . '_version', self::VERSION, true);
     }
 
     /**
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index ae6bc5a7..4fc95411 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -88,7 +88,7 @@ public static function api(array $uri): bool
                 if (!TouchPointWP::currentUserIsAdmin()) {
                     return false;
                 }
-                TouchPointWP::instance()->settings->migrate();
+                TouchPointWP::instance()->migrate(true);
                 exit;
 
             case "phpinfo":
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 7bf47ed0..0f9e8dfc 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -180,6 +180,31 @@ public function hasValidApiSettings(): bool
                $this->getWithoutDefault('api_pass') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER);
     }
 
+    /**
+     * Used internally to determine if a particular setting should be auto-loaded.
+     *
+     * @param string $settingName
+     *
+     * @return bool
+     */
+    private function settingShouldBeAutoLoaded(string $settingName): bool
+    {
+        if (str_contains($settingName, '_cron_last_run')) {
+            return true;
+        }
+        foreach (self::settingsFields() as $page) {
+            foreach ($page['fields'] as $f) {
+                if ($f['id'] === $settingName) {
+                    if (isset($f['autoload'])) {
+                        return !!$f['autoload'];
+                    }
+                    return false;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Build settings fields
      *
@@ -213,6 +238,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                     'callback'    => fn($new) => $this->validation_updateScriptsIfChanged($new, 'enable_authentication'),
                 ],
                 [
@@ -221,6 +247,7 @@ private function settingsFields($includeDetail = false): array
                     'description' => __('Add a crazy-simple RSVP button to WordPress event pages.', 'TouchPoint-WP'),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_involvements',
@@ -231,6 +258,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_people_lists',
@@ -241,6 +269,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_global',
@@ -251,6 +280,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'enable_campuses',
@@ -261,6 +291,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'checkbox',
                     'default'     => '',
+                    'autoload'    => true,
                 ],
                 [
                     'id'          => 'system_name',
@@ -1174,16 +1205,18 @@ protected function getWithoutDefault(string $what, $default = self::UNDEFINED_PL
     /**
      * @param string $what
      * @param mixed  $value
-     * @param bool   $autoload
+     * @param ?bool  $autoload
      *
      * @return false|mixed
      */
-    public function set(string $what, $value, bool $autoload = false): bool
+    public function set(string $what, $value, ?bool $autoload = null): bool
     {
+        if ($autoload === null) {
+            $autoload = $this->settingShouldBeAutoLoaded($what);
+        }
         return update_option(TouchPointWP::SETTINGS_PREFIX . $what, $value, $autoload); // TODO MULTI
     }
 
-
     /**
      * Migrate settings from version to version.  This may be called even when a migration isn't necessary.
      */
@@ -1314,14 +1347,7 @@ public function migrate(): void
 
 
         // 0.0.31 - Add lookup IDs to ResCodes
-        foreach (TouchPointWP::instance()->getResCodes() as $rc) {
-            $term = Utilities::termExists($rc->name, TouchPointWP::TAX_RESCODE);
-            if ($term !== null && isset($term['term_id'])) {
-                if (update_term_meta($term['term_id'], TouchPointWP::TAXMETA_LOOKUP_ID, $rc->id)) {
-                    TouchPointWP::queueFlushRewriteRules();
-                }
-            }
-        }
+        TouchPointWP::$forceTermLookupIdUpdate = true;
 
 
         // Update version string
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 2e76ee39..a6622d74 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -18,8 +18,7 @@ def print_exception():  # From https://stackoverflow.com/a/20264059/2339939
     lineno = tb.tb_lineno
     filename = f.f_code.co_filename
     linecache.checkcache(filename)
-    line = linecache.getline(filename, lineno, f.f_globals)
-    print('EXCEPTION IN ({}, LINE {} "{}"): {}'.format(filename, lineno, line.strip(), exc_obj))
+    print('{} (L{})'.format(exc_obj, lineno))
 
 
 def get_person_info_for_sync(person_obj):
@@ -1166,6 +1165,9 @@ def get_person_info_for_sync(person_obj):
                 model.Title = "Login"
                 model.Header = "Processing..."
 
+                if response == "":
+                    raise Exception("Could not communicate with WordPress server.")
+
                 response = json.loads(response)
 
                 if "error" in response:
@@ -1199,10 +1201,8 @@ def get_person_info_for_sync(person_obj):
             print("<p>Please email the following error message to <b>" + model.Setting("AdminMail",
                                                                                        "the church staff") + "</b>.</p><pre>")
             print(response)
-            print("</pre>")
-            print("<!-- Exception Raised: ")
             print_exception()
-            print(" -->")
+            print("</pre>")
 
 if not apiCalled:
     model.Title = "Invalid Request"

From 61188fee1fac77d8619b4dbdb09cd10aec7ef7a7 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Fri, 21 Jul 2023 22:49:32 -0400
Subject: [PATCH 020/423] Further updates to which options are autoloaded.

---
 src/TouchPoint-WP/TouchPointWP.php          |  1 +
 src/TouchPoint-WP/TouchPointWP_Settings.php | 25 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index a1485e9a..0ea5b308 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1552,6 +1552,7 @@ protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxono
                 }
                 $idUpdate = true;
             }
+            // Update the term meta if term is new, or if id update is forced.
             if ($term !== null && isset($term['term_id']) && $idUpdate) {
                 update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
             }
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 0f9e8dfc..1b57163e 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -189,7 +189,10 @@ public function hasValidApiSettings(): bool
      */
     private function settingShouldBeAutoLoaded(string $settingName): bool
     {
-        if (str_contains($settingName, '_cron_last_run')) {
+        if (str_contains($settingName, '_cron_last_run')
+            || $settingName === "DEBUG"
+            || $settingName === "meta_familyEvFields" // because it's used when registering the taxonomies on every init.
+        ) {
             return true;
         }
         foreach (self::settingsFields() as $page) {
@@ -313,6 +316,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => 'mychurch.tpsdb.com',
                     'callback'    => [$this, 'validation_lowercase']
                 ],
@@ -338,6 +342,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -349,6 +354,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text_secret',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => $this->passwordPlaceholder('api_pass'),
                     'callback'    => fn($new) => $this->validation_secret($new, 'api_pass')
                 ],
@@ -361,6 +367,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'WebApi',
+                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -372,6 +379,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
+                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -389,7 +397,8 @@ private function settingsFields($includeDetail = false): array
         ];
 
         // Add Script generation section if necessary settings are established.
-        if ($this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
+        if ($includeDetail
+            && $this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
             && $this->hasValidApiSettings()) {
             /** @noinspection HtmlUnknownTarget */
             $this->settings['basic']['fields'][] = [
@@ -535,6 +544,7 @@ private function settingsFields($includeDetail = false): array
                         'type'        => 'textarea',
                         'label'       => __('Involvement Post Types', 'TouchPoint-WP'),
                         'default'     => '[]',
+                        'autoload'    => true,
                         'hidden'      => true,
                         'description' => !$includeThis ? "" : function() {
                             TouchPointWP::requireScript("base");
@@ -617,6 +627,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'partners',
+                        'autoload'    => true,
                         'placeholder' => 'partners',
                         'callback'    => fn($new) => $this->validation_slug($new, 'global_slug')
                     ],
@@ -708,6 +719,7 @@ private function settingsFields($includeDetail = false): array
                         'type'        => 'select',
                         'options'     => $includeThis ? $this->parent->getFamilyEvFieldsAsKVArray('code', true) : [],
                         'default'     => [],
+                        'autoload'    => true,
                     ],
                 ],
             ];
@@ -764,6 +776,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Divisions',
+                    'autoload'    => true,
                     'placeholder' => 'Divisions'
                 ],
                 [
@@ -775,6 +788,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Division',
+                    'autoload'    => true,
                     'placeholder' => 'Division'
                 ],
                 [
@@ -786,6 +800,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'div',
+                    'autoload'    => true,
                     'placeholder' => 'div',
                     'callback'    => fn($new) => $this->validation_slug($new, 'dv_slug')
                 ],
@@ -844,6 +859,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'Campuses',
+                        'autoload'    => true,
                         'placeholder' => 'Campuses'
                     ],
                     [
@@ -855,6 +871,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'Campus',
+                        'autoload'    => true,
                         'placeholder' => 'Campus'
                     ],
                     [
@@ -866,6 +883,7 @@ private function settingsFields($includeDetail = false): array
                         ),
                         'type'        => 'text',
                         'default'     => 'campus',
+                        'autoload'    => true,
                         'placeholder' => 'campus',
                         'callback'    => fn($new) => $this->validation_slug($new, 'camp_slug')
                     ]
@@ -886,6 +904,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Resident Codes',
+                    'autoload'    => true,
                     'placeholder' => 'Resident Codes'
                 ],
                 [
@@ -897,6 +916,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'Resident Code',
+                    'autoload'    => true,
                     'placeholder' => 'Resident Code'
                 ],
                 [
@@ -908,6 +928,7 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'rescodes',
+                    'autoload'    => true,
                     'placeholder' => 'rescodes',
                     'callback'    => fn($new) => $this->validation_slug($new, 'rc_slug')
                 ]

From 6016dcc603736026e2fc64449d763bbeb24a4911 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Tue, 8 Aug 2023 07:24:16 -0400
Subject: [PATCH 021/423] Adding filter for report classes

---
 src/TouchPoint-WP/Report.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 837ac966..7d01c0e3 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -35,6 +35,8 @@ class Report implements api, module, JsonSerializable, updatesViaCron
     public const NAME_META_KEY = self::META_PREFIX . "name";
     public const P1_META_KEY = self::META_PREFIX . "p1";
     public const DEFAULT_CONTENT = '';
+    public const FIGURE_CLASS_FILTER = TouchPointWP::SETTINGS_PREFIX . "rpt_figure_class";
+    public const FIGURE_CLASS_DEFAULT = "TouchPoint-report";
 
 
     public static bool $_isLoaded = false;
@@ -286,7 +288,8 @@ public static function reportShortcode($params = [], string $content = ""): stri
 
         // Add Figure elt with a unique ID
         $idAttr = "id=\"" . wp_unique_id('tp-report-') . "\"";
-        $rc = "<figure $idAttr>\n\t" . str_replace("\n", "\n\t", $rc);
+        $class = apply_filters(self::FIGURE_CLASS_FILTER, self::FIGURE_CLASS_DEFAULT);
+        $rc = "<figure $idAttr class=\"$class\">\n\t" . str_replace("\n", "\n\t", $rc);
 
         // If desired, add a caption that indicates when the table was last updated.
         if ($params['showupdated']) {

From 117a69b4e51be03c6dcae169ee8ea6456caab4ff Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Thu, 10 Aug 2023 15:57:38 -0400
Subject: [PATCH 022/423] Updates related to changed dev environment

---
 .gitignore     | 3 ++-
 .idea/misc.xml | 1 -
 .idea/php.xml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0380c8f9..2f612cad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ node_modules
 package-lock.json
 
 /build/
-/touchpoint-wp.zip
\ No newline at end of file
+/touchpoint-wp.zip
+/composer.phar
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 591fc5ab..691dd2ff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
diff --git a/.idea/php.xml b/.idea/php.xml
index 05d47f11..299cb8ee 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -13,6 +13,7 @@
     <include_path>
       <path value="$PROJECT_DIR$/../WordPressDemo" />
       <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/../TenthDev/app/public" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.4">

From 8ef8f5e60a95562f868a6970e7c7f6b66dd5fd1f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Aug 2023 22:14:55 -0400
Subject: [PATCH 023/423] Resolving an issue with how settings are defined

---
 src/TouchPoint-WP/TouchPointWP_Settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 1b57163e..707ca003 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1401,7 +1401,7 @@ public function updateDeployedScripts(): void
      */
     public function registerSettings(): void
     {
-        $currentSection = false;
+        $currentSection = 'basic'; // basic is the default.
         if (isset($_POST['tab']) && $_POST['tab']) {
             $currentSection = $_POST['tab'];
         } elseif (isset($_GET['tab']) && $_GET['tab']) {
@@ -1411,7 +1411,7 @@ public function registerSettings(): void
         $this->settings = $this->settingsFields($currentSection);
         foreach ($this->settings as $section => $data) {
             // Check posted/selected tab.
-            if ($currentSection && $currentSection !== $section) {
+            if ($currentSection !== $section) {
                 continue;
             }
 

From 2d2e31ad4a5822628b1c8d6fe5edfaeb2e3bf770 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 25 Aug 2023 17:23:17 -0400
Subject: [PATCH 024/423] Merging buxfixes and optimizations from Next

---
 src/TouchPoint-WP/TouchPointWP.php          | 2 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 0ea5b308..de450c2c 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1552,7 +1552,7 @@ protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxono
                 }
                 $idUpdate = true;
             }
-            // Update the term meta if term is new, or if id update is forced.
+	        // Update the term meta if term is new, or if id update is forced.
             if ($term !== null && isset($term['term_id']) && $idUpdate) {
                 update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
             }
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 707ca003..1a38ecd4 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -316,7 +316,6 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
-                    'autoload'    => true,
                     'placeholder' => 'mychurch.tpsdb.com',
                     'callback'    => [$this, 'validation_lowercase']
                 ],
@@ -342,7 +341,6 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
-                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -354,7 +352,6 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text_secret',
                     'default'     => '',
-                    'autoload'    => true,
                     'placeholder' => $this->passwordPlaceholder('api_pass'),
                     'callback'    => fn($new) => $this->validation_secret($new, 'api_pass')
                 ],
@@ -367,7 +364,6 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => 'WebApi',
-                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -379,7 +375,6 @@ private function settingsFields($includeDetail = false): array
                     ),
                     'type'        => 'text',
                     'default'     => '',
-                    'autoload'    => true,
                     'placeholder' => '',
                 ],
                 [
@@ -719,7 +714,6 @@ private function settingsFields($includeDetail = false): array
                         'type'        => 'select',
                         'options'     => $includeThis ? $this->parent->getFamilyEvFieldsAsKVArray('code', true) : [],
                         'default'     => [],
-                        'autoload'    => true,
                     ],
                 ],
             ];

From 8ac7869ff927be5f4db23d81c735a9f7a9d607e1 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Mon, 14 Aug 2023 22:29:41 -0400
Subject: [PATCH 025/423] Reworking build procedure to maintain a local build
 directory during development.

---
 .gitignore                       |  4 +---
 build.sh                         | 19 +++++++++----------
 generateI18n_1forTranslation.ps1 |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f612cad..236fe5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@ composer.lock
 /assets/images/people
 /TouchPointWP_ErrorLog.txt
 /.phpdoc/
-/phpDocumentor.phar
-/wp-cli.phar
+*.phar
 
 /.idea/workspace.xml
 /.idea/usage.statistics.xml
@@ -24,4 +23,3 @@ package-lock.json
 
 /build/
 /touchpoint-wp.zip
-/composer.phar
diff --git a/build.sh b/build.sh
index b69c25e7..772b2e07 100644
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,7 @@ uglifyjs -o build/assets/js/meeting-defer.min.js -- assets/js/meeting-defer.js
 uglifyjs -o build/assets/js/partner-defer.min.js -- assets/js/partner-defer.js
 cp -r assets build
 cd ./build || exit
-zip -r ../touchpoint-wp.zip assets
+#zip -r ../touchpoint-wp.zip assets
 cd ..
 
 
@@ -35,15 +35,14 @@ cp -r ./i18n ./build/i18n
 
 php ./wp-cli.phar i18n make-json ./build/i18n
 php ./wp-cli.phar i18n make-mo ./build/i18n
-cd ./build || exit
-zip -r ../touchpoint-wp.zip i18n
-cd ..
 
-zip -r touchpoint-wp.zip ./ext
-zip -r touchpoint-wp.zip ./src
+cp -r ./ext ./build/ext
+cp -r ./src ./build/src
 
-find . -maxdepth 1 -iname "*.php" -exec zip touchpoint-wp.zip {} \;
-find . -maxdepth 1 -iname "*.md" -exec zip touchpoint-wp.zip {} \;
-find . -maxdepth 1 -iname "*.json" -exec zip touchpoint-wp.zip {} \;
+find . -maxdepth 1 -iname "*.php" -exec cp {} build/ \;
+find . -maxdepth 1 -iname "*.md" -exec cp {} build/ \;
+find . -maxdepth 1 -iname "*.json" -exec cp {} build/ \;
 
-rm -r build
\ No newline at end of file
+cd ./build || exit
+find . -exec zip ../touchpoint-wp.zip {} \;
+cd ..
diff --git a/generateI18n_1forTranslation.ps1 b/generateI18n_1forTranslation.ps1
index cc5a901d..e23662c6 100644
--- a/generateI18n_1forTranslation.ps1
+++ b/generateI18n_1forTranslation.ps1
@@ -7,5 +7,5 @@ if (!(test-path $pharFile -newerThan $compareDt))
     Invoke-WebRequest https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -OutFile $pharFile
 }
 
-php .\wp-cli.phar i18n make-pot . i18n/TouchPoint-WP.pot
+php .\wp-cli.phar i18n make-pot . i18n/TouchPoint-WP.pot --exclude=build
 php .\wp-cli.phar i18n update-po i18n/TouchPoint-WP.pot
\ No newline at end of file

From 00facce0819283efd340a85baa46511a29257465 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Mon, 14 Aug 2023 22:30:57 -0400
Subject: [PATCH 026/423] Adding jetbrains run profiles

---
 .idea/runConfigurations/Build__WSL_.xml         | 17 +++++++++++++++++
 .../i18n__1_for_Translation.xml                 | 17 +++++++++++++++++
 .idea/runConfigurations/i18n__2_for_Publish.xml | 17 +++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 .idea/runConfigurations/Build__WSL_.xml
 create mode 100644 .idea/runConfigurations/i18n__1_for_Translation.xml
 create mode 100644 .idea/runConfigurations/i18n__2_for_Publish.xml

diff --git a/.idea/runConfigurations/Build__WSL_.xml b/.idea/runConfigurations/Build__WSL_.xml
new file mode 100644
index 00000000..d2225246
--- /dev/null
+++ b/.idea/runConfigurations/Build__WSL_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build (WSL)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="wsl -e ./build.sh" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/i18n__1_for_Translation.xml b/.idea/runConfigurations/i18n__1_for_Translation.xml
new file mode 100644
index 00000000..8f161b58
--- /dev/null
+++ b/.idea/runConfigurations/i18n__1_for_Translation.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="i18n #1 for Translation" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="powershell ./generateI18n_1forTranslation.ps1" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/i18n__2_for_Publish.xml b/.idea/runConfigurations/i18n__2_for_Publish.xml
new file mode 100644
index 00000000..30b2968d
--- /dev/null
+++ b/.idea/runConfigurations/i18n__2_for_Publish.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="i18n #2 for Publish" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="powershell ./generateI18n_2forPublish.ps1" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

From 1d0588c0d661dfbd4de5bc21f30a54e332cf2e71 Mon Sep 17 00:00:00 2001
From: James K <jkrrv@jkrrv.org>
Date: Tue, 15 Aug 2023 15:25:10 -0400
Subject: [PATCH 027/423] build improvements

---
 .github/workflows/releases.yml | 4 ++--
 .idea/misc.xml                 | 3 ++-
 build.sh                       | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 5b1c26a6..5d315037 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -1,10 +1,10 @@
+name: Create Release
+
 on:
   push:
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
-name: Create Release
-
 jobs:
   build:
     name: Create Release
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 691dd2ff..ec30493f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="Python 3.10 (TouchPointScripts)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 772b2e07..1f1eb7ad 100644
--- a/build.sh
+++ b/build.sh
@@ -24,12 +24,13 @@ uglifyjs -o build/assets/js/meeting-defer.min.js -- assets/js/meeting-defer.js
 uglifyjs -o build/assets/js/partner-defer.min.js -- assets/js/partner-defer.js
 cp -r assets build
 cd ./build || exit
-#zip -r ../touchpoint-wp.zip assets
 cd ..
 
 
 # compile translations
-wget -O wp-cli.phar https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+if [ ! -f wp-cli.phar ]; then
+    wget -O wp-cli.phar https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+fi
 
 cp -r ./i18n ./build/i18n
 

From d27cbf2f9e628278e89db2fbaef1f8ba52d1e768 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Aug 2023 22:12:14 -0400
Subject: [PATCH 028/423] Settings for Meeting Calendars

---
 .idea/misc.xml                              |   1 -
 i18n/TouchPoint-WP-es_ES.po                 | 390 ++++++++++---------
 i18n/TouchPoint-WP.pot                      | 392 +++++++++++---------
 src/TouchPoint-WP/TouchPointWP_Settings.php |  74 +++-
 4 files changed, 504 insertions(+), 353 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ec30493f..d436a9a5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index cb174921..dc3f5a94 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -50,7 +50,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -118,13 +118,13 @@ msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:169
 #: src/TouchPoint-WP/Involvement.php:1419
-#: src/TouchPoint-WP/TouchPointWP.php:1422
+#: src/TouchPoint-WP/TouchPointWP.php:1372
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:173
 #: src/TouchPoint-WP/Involvement.php:1445
-#: src/TouchPoint-WP/TouchPointWP.php:1504
+#: src/TouchPoint-WP/TouchPointWP.php:1419
 msgid "Time of Day"
 msgstr "Hora del día"
 
@@ -133,7 +133,7 @@ msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
 #: src/templates/admin/invKoForm.php:181
-#: src/TouchPoint-WP/TouchPointWP.php:1558
+#: src/TouchPoint-WP/TouchPointWP.php:1448
 msgid "Age Group"
 msgstr "Grupo de edad"
 
@@ -177,19 +177,19 @@ msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:137
+#: src/TouchPoint-WP/Auth.php:138
 msgid "Sign in with your %s account"
 msgstr "Inicie sesión con su cuenta de %s"
 
-#: src/TouchPoint-WP/Auth.php:392
+#: src/TouchPoint-WP/Auth.php:391
 msgid "Your login token expired."
 msgstr "Su token de inicio de sesión caducó."
 
-#: src/TouchPoint-WP/Auth.php:407
+#: src/TouchPoint-WP/Auth.php:406
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
-#: src/TouchPoint-WP/Auth.php:419
+#: src/TouchPoint-WP/Auth.php:418
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
@@ -303,110 +303,110 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2404
+#: src/TouchPoint-WP/TouchPointWP.php:2484
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2458
+#: src/TouchPoint-WP/TouchPointWP.php:2538
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2461
+#: src/TouchPoint-WP/TouchPointWP.php:2541
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2464
+#: src/TouchPoint-WP/TouchPointWP.php:2544
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2469
-#: src/TouchPoint-WP/TouchPointWP.php:2470
+#: src/TouchPoint-WP/TouchPointWP.php:2549
+#: src/TouchPoint-WP/TouchPointWP.php:2550
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2597
-#: src/TouchPoint-WP/TouchPointWP.php:2635
+#: src/TouchPoint-WP/TouchPointWP.php:2677
+#: src/TouchPoint-WP/TouchPointWP.php:2715
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2605
-#: src/TouchPoint-WP/TouchPointWP.php:2642
+#: src/TouchPoint-WP/TouchPointWP.php:2685
+#: src/TouchPoint-WP/TouchPointWP.php:2722
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2762
+#: src/TouchPoint-WP/TouchPointWP.php:2842
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:204
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:235
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:205
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:236
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:209
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:240
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:210
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:241
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:220
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:252
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:221
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:253
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:227
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:228
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:261
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:237
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:271
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:238
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:247
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:282
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:248
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:267
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:268
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:278
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:279
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:290
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:329
 msgid ""
 "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't \r\n"
 "                        using the custom mobile app, leave this blank."
@@ -414,48 +414,48 @@ msgstr ""
 "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras oblicuas. \r\n"
 "Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:303
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:341
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:314
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:353
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:354
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:326
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:366
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:367
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:337
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:378
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:379
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:348
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:390
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:391
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:366
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:372
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:409
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:415
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid ""
 "Once your settings on this page are set and saved, use this tool to generate\r\n"
 "the scripts needed for TouchPoint in a convenient installation package.  "
@@ -463,369 +463,369 @@ msgstr ""
 "Una vez que haya configurado y guardado su configuración en esta página, \r\n"
 "use esta herramienta para generar los scripts necesarios para TouchPoint en un conveniente paquete de instalación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:414
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:429
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:430
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:391
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:392
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:403
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:404
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:414
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:415
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:425
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:660
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:705
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:426
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:448
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard TouchPoint login page, add '"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:501
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:510
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:511
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:478
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:484
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:527
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:528
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:543
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:505
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:548
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:533
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:534
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:578
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:538
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:539
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:549
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:593
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:550
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:594
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:560
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:561
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:605
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:571
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:615
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:572
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:616
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:626
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:627
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:594
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:595
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:605
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:606
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:616
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:617
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:627
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:628
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:638
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:649
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:694
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:695
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:706
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:717
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:688
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:734
 msgid "Events Calendar"
 msgstr "Calendario de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:689
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:735
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr "Integre con el calendario de eventos de ModernTribe."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:742
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr "Para usar los eventos de su calendario de eventos en la aplicación móvil personalizada, configure el proveedor en <code>Wordpress Plugin - Modern Tribe</code> y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:698
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:744
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:713
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:759
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:714
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:760
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:724
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:725
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:824
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:829
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:840
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:841
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:853
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:903
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:904
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:911
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:810
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:912
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:923
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:924
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:831
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:935
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
 msgid "The root path for the Campus Taxonomy"
 msgstr "El camino raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:847
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:969
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:981
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1138
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1086
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1087
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1194
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1195
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1118
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1226
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1346
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1449
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1462
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1578
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1629
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -993,7 +993,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2703
+#: src/TouchPoint-WP/TouchPointWP.php:2783
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1049,7 +1049,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: src/TouchPoint-WP/Involvement.php:1467
-#: src/TouchPoint-WP/TouchPointWP.php:1597
+#: src/TouchPoint-WP/TouchPointWP.php:1473
 msgid "Marital Status"
 msgstr "Estado civil"
 
@@ -1175,12 +1175,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:783
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:879
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:778
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1284,7 +1284,7 @@ msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi l
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:342
 msgid "The username of a user account in TouchPoint with API permissions."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos de API."
 
@@ -1309,7 +1309,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:86
-#: src/TouchPoint-WP/TouchPointWP.php:907
+#: src/TouchPoint-WP/TouchPointWP.php:961
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1328,115 +1328,115 @@ msgstr "Datos proporcionados no válidos."
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:293
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1228
+#: src/TouchPoint-WP/TouchPointWP.php:1282
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1281
+#: src/TouchPoint-WP/TouchPointWP.php:1314
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1333
+#: src/TouchPoint-WP/TouchPointWP.php:1345
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1421
+#: src/TouchPoint-WP/TouchPointWP.php:1371
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1422
+#: src/TouchPoint-WP/TouchPointWP.php:1372
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1459
+#: src/TouchPoint-WP/TouchPointWP.php:1394
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1460
+#: src/TouchPoint-WP/TouchPointWP.php:1395
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1460
+#: src/TouchPoint-WP/TouchPointWP.php:1395
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1503
+#: src/TouchPoint-WP/TouchPointWP.php:1418
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1504
+#: src/TouchPoint-WP/TouchPointWP.php:1419
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1557
+#: src/TouchPoint-WP/TouchPointWP.php:1447
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1558
+#: src/TouchPoint-WP/TouchPointWP.php:1448
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1596
+#: src/TouchPoint-WP/TouchPointWP.php:1472
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1597
+#: src/TouchPoint-WP/TouchPointWP.php:1473
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1641
+#: src/TouchPoint-WP/TouchPointWP.php:1503
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1201
+#: src/TouchPoint-WP/TouchPointWP.php:1255
 msgid "Search %s"
 msgstr "Buscar %s"
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1203
+#: src/TouchPoint-WP/TouchPointWP.php:1257
 msgid "All %s"
 msgstr "Todos los %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1205
+#: src/TouchPoint-WP/TouchPointWP.php:1259
 msgid "Edit %s"
 msgstr "Editar %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1207
+#: src/TouchPoint-WP/TouchPointWP.php:1261
 msgid "Update %s"
 msgstr "Actualizar %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1209
+#: src/TouchPoint-WP/TouchPointWP.php:1263
 msgid "Add New %s"
 msgstr "Agregar Nuevo %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1211
+#: src/TouchPoint-WP/TouchPointWP.php:1265
 msgid "New %s"
 msgstr "Nuevo %s"
 
-#: src/TouchPoint-WP/Report.php:167
+#: src/TouchPoint-WP/Report.php:169
 msgid "TouchPoint Reports"
 msgstr "Informes de TouchPoint"
 
-#: src/TouchPoint-WP/Report.php:168
+#: src/TouchPoint-WP/Report.php:170
 msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:295
+#: src/TouchPoint-WP/Report.php:298
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
@@ -1447,3 +1447,43 @@ msgstr "Cada 15 minutos"
 #: src/TouchPoint-WP/Involvement.php:1395
 msgid "Language"
 msgstr "Idioma"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+msgid "Meeting Calendars"
+msgstr "Calendarios de Reuniones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:772
+msgid "Import Meetings from TouchPoint to a calendar on your website."
+msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:776
+msgid "Meetings Slug"
+msgstr "SLug de Reuniones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+msgid "The root path for Meetings"
+msgstr "El camino raíz para los Reuniones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:789
+msgid "Months of History"
+msgstr "Meses de Historia"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:790
+msgid "Meetings will be kept for the public calendar until the event is this many months in the past.  Note that due to limitations in TouchPoint's approach to events, Meetings cannot be fully updated once they occur."
+msgstr "Las reuniones se mantendrán para el calendario público hasta que el evento sea hace tantos meses. Tenga en cuenta que debido a las limitaciones en el enfoque de los eventos de TouchPoint, las reuniones no se pueden actualizar por completo una vez que ocurren."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:799
+msgid "Months of Future"
+msgstr "Meses de Futuro"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:800
+msgid "Meetings more than this many months in the future will not be imported."
+msgstr "Las reuniones de más de esta cantidad de meses en el futuro no se importarán."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+msgid "Meeting Deletion Handling"
+msgstr "Eliminación de Reuniones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:810
+msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
+msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 743bc964..e0082f43 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-08-14T19:18:55+00:00\n"
+"POT-Creation-Date: 2023-08-15T02:25:51+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: TouchPoint-WP\n"
@@ -53,7 +53,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
 msgid "Divisions to Import"
 msgstr ""
 
@@ -141,13 +141,13 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:169
 #: src/TouchPoint-WP/Involvement.php:1419
-#: src/TouchPoint-WP/TouchPointWP.php:1422
+#: src/TouchPoint-WP/TouchPointWP.php:1372
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:173
 #: src/TouchPoint-WP/Involvement.php:1445
-#: src/TouchPoint-WP/TouchPointWP.php:1504
+#: src/TouchPoint-WP/TouchPointWP.php:1419
 msgid "Time of Day"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgid "Prevailing Marital Status"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:181
-#: src/TouchPoint-WP/TouchPointWP.php:1558
+#: src/TouchPoint-WP/TouchPointWP.php:1448
 msgid "Age Group"
 msgstr ""
 
@@ -239,19 +239,19 @@ msgid "%2.1fmi"
 msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:137
+#: src/TouchPoint-WP/Auth.php:138
 msgid "Sign in with your %s account"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:392
+#: src/TouchPoint-WP/Auth.php:391
 msgid "Your login token expired."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:407
+#: src/TouchPoint-WP/Auth.php:406
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:419
+#: src/TouchPoint-WP/Auth.php:418
 msgid "Session could not be validated."
 msgstr ""
 
@@ -329,7 +329,7 @@ msgid "Language"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1467
-#: src/TouchPoint-WP/TouchPointWP.php:1597
+#: src/TouchPoint-WP/TouchPointWP.php:1473
 msgid "Marital Status"
 msgstr ""
 
@@ -433,7 +433,7 @@ msgid "Invalid Post Type."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:86
-#: src/TouchPoint-WP/TouchPointWP.php:907
+#: src/TouchPoint-WP/TouchPointWP.php:961
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -474,16 +474,16 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:167
+#: src/TouchPoint-WP/Report.php:169
 msgid "TouchPoint Reports"
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:168
+#: src/TouchPoint-WP/Report.php:170
 msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:295
+#: src/TouchPoint-WP/Report.php:298
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
@@ -496,640 +496,680 @@ msgid "Every 15 minutes"
 msgstr ""
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1201
+#: src/TouchPoint-WP/TouchPointWP.php:1255
 msgid "Search %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1203
+#: src/TouchPoint-WP/TouchPointWP.php:1257
 msgid "All %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1205
+#: src/TouchPoint-WP/TouchPointWP.php:1259
 msgid "Edit %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1207
+#: src/TouchPoint-WP/TouchPointWP.php:1261
 msgid "Update %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1209
+#: src/TouchPoint-WP/TouchPointWP.php:1263
 msgid "Add New %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1211
+#: src/TouchPoint-WP/TouchPointWP.php:1265
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1228
+#: src/TouchPoint-WP/TouchPointWP.php:1282
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1281
+#: src/TouchPoint-WP/TouchPointWP.php:1314
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1333
+#: src/TouchPoint-WP/TouchPointWP.php:1345
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1421
+#: src/TouchPoint-WP/TouchPointWP.php:1371
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1422
+#: src/TouchPoint-WP/TouchPointWP.php:1372
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1459
+#: src/TouchPoint-WP/TouchPointWP.php:1394
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1460
+#: src/TouchPoint-WP/TouchPointWP.php:1395
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1460
+#: src/TouchPoint-WP/TouchPointWP.php:1395
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1503
+#: src/TouchPoint-WP/TouchPointWP.php:1418
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1504
+#: src/TouchPoint-WP/TouchPointWP.php:1419
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1557
+#: src/TouchPoint-WP/TouchPointWP.php:1447
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1558
+#: src/TouchPoint-WP/TouchPointWP.php:1448
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1596
+#: src/TouchPoint-WP/TouchPointWP.php:1472
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1597
+#: src/TouchPoint-WP/TouchPointWP.php:1473
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1641
+#: src/TouchPoint-WP/TouchPointWP.php:1503
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2404
+#: src/TouchPoint-WP/TouchPointWP.php:2484
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2458
+#: src/TouchPoint-WP/TouchPointWP.php:2538
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2461
+#: src/TouchPoint-WP/TouchPointWP.php:2541
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2464
+#: src/TouchPoint-WP/TouchPointWP.php:2544
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2469
-#: src/TouchPoint-WP/TouchPointWP.php:2470
+#: src/TouchPoint-WP/TouchPointWP.php:2549
+#: src/TouchPoint-WP/TouchPointWP.php:2550
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2597
-#: src/TouchPoint-WP/TouchPointWP.php:2635
+#: src/TouchPoint-WP/TouchPointWP.php:2677
+#: src/TouchPoint-WP/TouchPointWP.php:2715
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2605
-#: src/TouchPoint-WP/TouchPointWP.php:2642
+#: src/TouchPoint-WP/TouchPointWP.php:2685
+#: src/TouchPoint-WP/TouchPointWP.php:2722
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2703
+#: src/TouchPoint-WP/TouchPointWP.php:2783
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2762
+#: src/TouchPoint-WP/TouchPointWP.php:2842
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:204
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:235
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:205
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:236
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:209
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:240
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:210
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:241
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:220
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:252
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:221
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:253
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:227
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:228
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:261
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:237
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:271
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:238
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:247
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:282
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:248
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:293
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:267
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:268
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:278
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:279
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:290
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:329
 msgid ""
 "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't \r\n"
 "                        using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:303
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:341
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:342
 msgid "The username of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:314
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:353
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:354
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:326
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:366
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:367
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:337
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:378
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:379
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:348
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:390
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:391
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:366
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:372
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:409
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:415
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid ""
 "Once your settings on this page are set and saved, use this tool to generate\r\n"
 "the scripts needed for TouchPoint in a convenient installation package.  "
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:414
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:429
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:430
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:391
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:392
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:403
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:404
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:414
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:415
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:425
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:660
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:705
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:426
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:448
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard TouchPoint login page, add '"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:501
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:510
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:511
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:478
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:484
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:527
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:528
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:543
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:505
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:548
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:533
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:534
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:578
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:538
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:539
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:549
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:593
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:550
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:594
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:560
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:561
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:605
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:571
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:615
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:572
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:616
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:626
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:627
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:594
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:595
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:605
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:606
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:616
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:617
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:627
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:628
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:638
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:649
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:694
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:695
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:706
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:717
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:688
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:734
 msgid "Events Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:689
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:735
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:742
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:698
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:744
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:713
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:759
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:714
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:760
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:724
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+msgid "Meeting Calendars"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:772
+msgid "Import Meetings from TouchPoint to a calendar on your website."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:776
+msgid "Meetings Slug"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+msgid "The root path for Meetings"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:789
+msgid "Months of History"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:790
+msgid "Meetings will be kept for the public calendar until the event is this many months in the past.  Note that due to limitations in TouchPoint's approach to events, Meetings cannot be fully updated once they occur."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:799
+msgid "Months of Future"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:800
+msgid "Meetings more than this many months in the future will not be imported."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+msgid "Meeting Deletion Handling"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:810
+msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:725
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:824
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:829
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:840
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:841
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:853
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:783
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:879
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:778
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:903
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:904
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:911
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:810
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:912
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:923
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:924
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:831
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:935
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:847
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:969
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:981
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1138
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1086
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1087
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1194
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1195
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1118
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1226
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1346
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1449
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1462
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1578
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1629
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 1a38ecd4..22dc6ea8 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -66,6 +66,11 @@
  *
  * @property-read string ec_use_standardizing_style Whether to insert the standardizing stylesheet into mobile app requests.
  *
+ * @property-read string mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
+ * @property-read string mc_hist_months     Number of months of history to keep.
+ * @property-read string mc_future_months   Number of months into the future to import.
+ * @property-read string mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
+ *
  * @property-read string rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
  * @property-read string rc_name_singular   What a resident code should be called, singular (e.g. "Resident Code" or "Zone")
  * @property-read string rc_slug            Slug for resident code taxonomy (e.g. "zones" for church.org/zones)
@@ -403,7 +408,7 @@ private function settingsFields($includeDetail = false): array
                 'description' => strtr(
                     '<p>' . __('Once your settings on this page are set and saved, use this tool to generate
 the scripts needed for TouchPoint in a convenient installation package.  ', 'TouchPoint-WP') .
-'<a href="{uploadUrl}">' . __('Upload the package to {tpName} here', 'TouchPoint-WP') . '</a>.</p>
+'<a href="{uploadUrl}" target="_blank">' . __('Upload the package to {tpName} here', 'TouchPoint-WP') . '</a>.</p>
 <p><a href="{apiUrl}" class="button-secondary" target="tp_zipIfr">' . __('Generate Scripts', 'TouchPoint-WP') . '</a></p>
 <iframe name="tp_zipIfr" style="width:0; height:0; opacity:0;"></iframe>',
                     [
@@ -756,6 +761,60 @@ private function settingsFields($includeDetail = false): array
             ];
         }
 
+		// TODO add some kind of conditional here
+		$includeThis = $includeDetail === true || $includeDetail === 'events';
+		$tribe = TouchPointWP::useTribeCalendar();
+		$this->settings['meetCal'] = [
+			'title'       => __('Meeting Calendars', 'TouchPoint-WP'),
+			'description' => __('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
+			'fields'      => [
+				[
+					'id'          => 'mc_slug',
+					'label'       => __('Meetings Slug', 'TouchPoint-WP'),
+					'description' => __(
+						'The root path for Meetings',
+						'TouchPoint-WP'
+					),
+					'type'        => 'text',
+					'default'     => $tribe ? 'meetings' : 'events',
+					'autoload'    => true,
+					'placeholder' => $tribe ? 'meetings' : 'events',
+					'callback'    => fn($new) => $this->validation_slug($new, 'mc_slug')
+				],
+				[
+					'id'          => 'mc_hist_months',
+					'label'       => __( 'Months of History', 'TouchPoint-WP' ),
+					'description' => __( 'Meetings will be kept for the public calendar until the event is this many months in the past.  Note that due to limitations in TouchPoint\'s approach to events, Meetings cannot be fully updated once they occur.', 'TouchPoint-WP' ),
+					'type'        => 'number',
+					'default'     => 12,
+					'placeholder' => 12,
+					'max'         => 36,
+					'min'         => 0
+				],
+				[
+					'id'          => 'mc_future_months',
+					'label'       => __( 'Months of Future', 'TouchPoint-WP' ),
+					'description' => __( 'Meetings more than this many months in the future will not be imported.', 'TouchPoint-WP' ),
+					'type'        => 'number',
+					'default'     => 12,
+					'placeholder' => 12,
+					'max'         => 60,
+					'min'         => 0
+				],
+				[
+					'id'          => 'mc_deletion_method',
+					'label'       => __( 'Meeting Deletion Handling', 'TouchPoint-WP' ),
+					'description' => __( 'When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?', 'TouchPoint-WP' ),
+					'type'        => 'select',
+					'options'     => [
+						'delete'    => 'Always delete from WordPress.',
+						'cancel'    => 'Mark the occurrence as cancelled.',
+					],
+					'default'     => 'delete',
+				],
+			],
+		];
+
         $includeThis = $includeDetail === true || $includeDetail === 'divisions';
         $this->settings['divisions'] = [
             'title'       => __('Divisions', 'TouchPoint-WP'),
@@ -1429,6 +1488,19 @@ public function registerSettings(): void
                     $args['sanitize_callback'] = fn($new) => null;
                 }
 
+				if ($field['type'] == 'number' && !isset($args['sanitize_callback'])) {
+					$args['sanitize_callback'] = function($new) {
+						$new = intval($new);
+						if (isset($field['min'])) {
+							$new = max($new, $field['min']);
+						}
+						if (isset($field['max'])) {
+							$new = min($new, $field['max']);
+						}
+						return $new;
+					};
+				}
+
                 $option_name = TouchPointWP::SETTINGS_PREFIX . $field['id'];
                 register_setting($this->parent::TOKEN . '_Settings', $option_name, $args);
 

From 470524f4a7f8429b83a7eb8dbdab88bf80c998ad Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 30 Aug 2023 12:00:57 -0400
Subject: [PATCH 029/423] revert temp debugging code

---
 src/TouchPoint-WP/Involvement.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 535687c3..60a33612 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -346,13 +346,6 @@ public static function updateFromTouchPoint(bool $verbose = false)
         $verbose &= TouchPointWP::currentUserIsAdmin();
 
         foreach (self::allTypeSettings() as $k => $type) {
-
-			// TODO this is temp debugging code to allow only one post type to be synced during a force-sync.
-			if ($verbose && isset($_GET['type'])) {
-				if (intval($k) !== intval($_GET['type']))
-					continue;
-			}
-
             if (count($type->importDivs) < 1) {
                 // Don't update if there aren't any divisions selected yet.
                 if ($verbose) {
@@ -2122,19 +2115,11 @@ final protected static function updateInvolvementPostsForType(
             return false;
         }
 
-		$count = 0;
         foreach ($invData as $inv) {
             set_time_limit(15);
-			$count++;
-
-            if ($verbose) {
-                var_dump($inv);
-            }
 
-	        // TODO this is temp debugging code to allow only one post type to be synced during a force-sync.
-	        if ($verbose && isset($_GET['limit'])) {
-		        if ($count > intval($_GET['limit']))
-			        continue;
+	        if ($verbose) {
+		        var_dump($inv);
 	        }
 
 

From 249a45d9d281ee4cfc925cb0a93566590a5085b6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 7 Oct 2023 22:08:56 -0400
Subject: [PATCH 030/423] Spaces to tabs

---
 src/TouchPoint-WP/Auth.php                    |  44 +-
 src/TouchPoint-WP/EventsCalendar.php          |  12 +-
 src/TouchPoint-WP/Involvement.php             | 170 ++--
 .../Involvement_PostTypeSettings.php          |  10 +-
 src/TouchPoint-WP/Person.php                  |  30 +-
 src/TouchPoint-WP/TouchPointWP.php            | 750 +++++++++---------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php   |  20 +-
 src/TouchPoint-WP/TouchPointWP_Exception.php  |  14 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php   | 356 ++++-----
 src/TouchPoint-WP/Utilities.php               |  34 +-
 touchpoint-wp.php                             |  40 +-
 11 files changed, 739 insertions(+), 741 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 8d914b6c..2dd31127 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -127,23 +127,23 @@ public static function footer()
 		// echo to print in footer
 	}
 
-    /**
-     * Renders the link used to log in through TouchPoint.
-     */
-    public static function printLoginLink()
-    {
-        $html = '<p class="touchpoint-wp-auth-form">';
-        $url = self::getLoginUrl();
-        /** @noinspection HtmlUnknownTarget */
-        $html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
-        $html .= sprintf(
-            // translators: %s is "what you call TouchPoint at your church", which is a setting
-            __('Sign in with your %s account', 'TouchPoint-WP'),
-            htmlentities(TouchPointWP::instance()->settings->system_name)
-        );
-        $html .= '</a></p>';
-        echo $html;
-    }
+	/**
+	 * Renders the link used to log in through TouchPoint.
+	 */
+	public static function printLoginLink()
+	{
+		$html = '<p class="touchpoint-wp-auth-form">';
+		$url = self::getLoginUrl();
+		/** @noinspection HtmlUnknownTarget */
+		$html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
+		$html .= sprintf(
+			// translators: %s is "what you call TouchPoint at your church", which is a setting
+			__('Sign in with your %s account', 'TouchPoint-WP'),
+			htmlentities(TouchPointWP::instance()->settings->system_name)
+		);
+		$html .= '</a></p>';
+		echo $html;
+	}
 
 	/**
 	 * Generates the URL used to initiate a sign-in with TouchPoint.
@@ -283,8 +283,8 @@ public static function redirectLoginFormMaybe()
 	public static function removeAdminBarMaybe()
 	{
 		$removeBar = (TouchPointWP::instance()->settings->auth_prevent_admin_bar === 'on')
-		             && ! is_admin()
-		             && ! current_user_can('edit_posts');
+					 && ! is_admin()
+					 && ! current_user_can('edit_posts');
 
 		$removeBar = apply_filters(TouchPointWP::HOOK_PREFIX . 'prevent_admin_bar', $removeBar);
 
@@ -424,9 +424,9 @@ public static function authenticate($user, $username, $password)
 			$s = Session::instance();
 			if ( ! $lst === $s->auth_sessionToken) {
 				return new WP_Error([
-					                    177004,
-					                    __('Session could not be validated.', 'TouchPoint-WP')
-				                    ]);
+										177004,
+										__('Session could not be validated.', 'TouchPoint-WP')
+									]);
 			}
 
 			$p->setLoginTokens(null, null);
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 037a1302..e975ebe4 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -174,8 +174,8 @@ protected static function previewAppList(array $params = []): void
 		foreach ($eventsList as $i => $eo) {
 			echo "<h2>{$eo['title']}</h2>";
 			$url = get_site_url() . "/" .
-			       TouchPointWP::API_ENDPOINT . "/" .
-			       TouchPointWP::API_ENDPOINT_APP_EVENTS . "/" . $i;
+				   TouchPointWP::API_ENDPOINT . "/" .
+				   TouchPointWP::API_ENDPOINT_APP_EVENTS . "/" . $i;
 			echo "<iframe src='$url' style='width:500px; height:500px;'></iframe>";
 		}
 	}
@@ -197,8 +197,8 @@ public static function api(array $uri): bool
 
 		// Preview list
 		if (count($uri['path']) === 3 &&
-		    strtolower($uri['path'][2]) === 'preview' &&
-		    TouchPointWP::currentUserIsAdmin()
+			strtolower($uri['path'][2]) === 'preview' &&
+			TouchPointWP::currentUserIsAdmin()
 		) {
 			EventsCalendar::previewAppList($uri['query']);
 			exit;
@@ -206,8 +206,8 @@ public static function api(array $uri): bool
 
 		// Preview items
 		if (count($uri['path']) === 3 &&
-		    is_numeric($uri['path'][2]) &&
-		    TouchPointWP::currentUserIsAdmin()
+			is_numeric($uri['path'][2]) &&
+			TouchPointWP::currentUserIsAdmin()
 		) {
 			EventsCalendar::previewAppListItem($uri['query'], intval($uri['path'][2]));
 			exit;
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 9323b417..2cf84ca1 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -96,7 +96,7 @@ class Involvement implements api, updatesViaCron, geo, module
 	 * Involvement constructor.
 	 *
 	 * @param $object WP_Post|object an object representing the involvement's post.
-	 *                  Must have post_id AND inv id attributes.
+	 *				  Must have post_id AND inv id attributes.
 	 *
 	 * @throws TouchPointWP_Exception
 	 */
@@ -210,8 +210,8 @@ protected function __construct(object $object)
 		// Geo
 		if (self::getSettingsForPostType($this->invType)->useGeo) {
 			if (property_exists($object, 'geo_lat') &&
-			    $object->geo_lat !== null &&
-			    $object->geo_lat !== '') {
+				$object->geo_lat !== null &&
+				$object->geo_lat !== '') {
 				// Probably a database query result
 				$this->geo = (object)[
 					'lat' => Utilities::toFloatOrNull($object->geo_lat),
@@ -472,7 +472,7 @@ public function useRegistrationForm(): bool
 	{
 		if (!isset($this->_useRegistrationForm)) {
 			$this->_useRegistrationForm = (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true) === '1' ||
-			        intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1);
+					intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1);
 		}
 		return $this->_useRegistrationForm;
 	}
@@ -1023,8 +1023,8 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 		// CSS
 		/** @noinspection SpellCheckingInspection */
 		$params['includecss'] = ! isset($params['includecss']) ||
-		                        $params['includecss'] === true ||
-		                        $params['includecss'] === 'true';
+								$params['includecss'] === true ||
+								$params['includecss'] === 'true';
 
 		// Only group for single post types.
 		$groupBy = null;
@@ -1038,12 +1038,12 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 
 			if ($groupBy !== "" && taxonomy_exists($groupBy)) {
 				$terms = get_terms([
-					                   'taxonomy'   => $groupBy,
-					                   'order'      => $groupByOrder,
-					                   'orderby'    => 'name',
-					                   'hide_empty' => true,
-					                   'fields'     => 'id=>name'
-				                   ]);
+									   'taxonomy'   => $groupBy,
+									   'order'      => $groupByOrder,
+									   'orderby'    => 'name',
+									   'hide_empty' => true,
+									   'fields'     => 'id=>name'
+								   ]);
 			}
 		}
 
@@ -1141,12 +1141,12 @@ private static function getWpPostByInvolvementId($postType, $involvementId)
 		$involvementId = (string)$involvementId;
 
 		$q      = new WP_Query([
-			                       'post_type'   => $postType,
-			                       'meta_key'    => self::INVOLVEMENT_META_KEY,
-			                       'meta_value'  => $involvementId,
-			                       'numberposts' => 2
-			                       // only need one, but if there's two, there should be an error condition.
-		                       ]);
+								   'post_type'   => $postType,
+								   'meta_key'    => self::INVOLVEMENT_META_KEY,
+								   'meta_value'  => $involvementId,
+								   'numberposts' => 2
+								   // only need one, but if there's two, there should be an error condition.
+							   ]);
 		$posts  = $q->get_posts();
 		$counts = count($posts);
 		if ($counts > 1) {  // multiple posts match, which isn't great.
@@ -1322,9 +1322,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 		// Division
 		if (in_array('div', $filters)) {
 			$exclude = $settings->importDivs;
-			if (count(
-				    $exclude
-			    ) == 1) { // Exclude the imported div if there's only one, as all invs would have that div.
+			if (count($exclude) == 1) { // Exclude the imported div if there's only one as all would have it.
 				$mq = ['relation' => "AND"];
 				foreach ($exclude as $e) {
 					$mq[] = [
@@ -1346,11 +1344,11 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			}
 			$dvName = TouchPointWP::instance()->settings->dv_name_singular;
 			$dvList = get_terms([
-				                    'taxonomy'                              => TouchPointWP::TAX_DIV,
-				                    'hide_empty'                            => true,
-				                    'meta_query'                            => $mq,
-				                    TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
-			                    ]);
+									'taxonomy'                              => TouchPointWP::TAX_DIV,
+									'hide_empty'                            => true,
+									'meta_query'                            => $mq,
+									TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
+								]);
 			$dvList = TouchPointWP::orderHierarchicalTerms($dvList, true);
 			if (count($dvList) > 1) {
 				$content .= "<select class=\"$class-filter\" data-involvement-filter=\"div\">";
@@ -1505,11 +1503,11 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 		if (in_array('agegroup', $filters)) {
 			$agName = __("Age", 'TouchPoint-WP');
 			$agList = get_terms([
-				                    'taxonomy'                              => TouchPointWP::TAX_AGEGROUP,
-				                    'hide_empty'                            => true,
-				                    'orderby'                               => 't.id',
-				                    TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
-			                    ]);
+									'taxonomy'                              => TouchPointWP::TAX_AGEGROUP,
+									'hide_empty'                            => true,
+									'orderby'                               => 't.id',
+									TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
+								]);
 			if (is_array($agList) && count($agList) > 1) {
 				$content .= "<select class=\"$class-filter\" data-involvement-filter=\"agegroup\">";
 				$content .= "<option disabled selected>$agName</option><option value=\"\">$any</option>";
@@ -1623,40 +1621,40 @@ public static function ajaxNearby(): void
 		if ( ! $settings) {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-				                 "invList"    => [],
-				                 "error"      => "This involvement type doesn't exist.",
-				                 "error_i18n" => __("This involvement type doesn't exist.", 'TouchPoint-WP')
-			                 ]);
+								 "invList"    => [],
+								 "error"      => "This involvement type doesn't exist.",
+								 "error_i18n" => __("This involvement type doesn't exist.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
 		if ( ! $settings->useGeo) {
 			http_response_code(Http::EXPECTATION_FAILED);
 			echo json_encode([
-				                 "invList"    => [],
-				                 "error"      => "This involvement type doesn't have geographic locations enabled.",
-				                 "error_i18n" => __(
-					                 "This involvement type doesn't have geographic locations enabled.",
-					                 'TouchPoint-WP'
-				                 )
-			                 ]);
+								 "invList"    => [],
+								 "error"      => "This involvement type doesn't have geographic locations enabled.",
+								 "error_i18n" => __(
+									 "This involvement type doesn't have geographic locations enabled.",
+									 'TouchPoint-WP'
+								 )
+							 ]);
 			exit;
 		}
 
 		$r = [];
 
 		if ($lat === "null" || $lng === "null" ||
-		    $lat === null || $lng === null) {
+			$lat === null || $lng === null) {
 			$geoObj = TouchPointWP::instance()->geolocate();
 
 			if ($geoObj === false) {
 				http_response_code(Http::PRECONDITION_FAILED);
 				echo json_encode([
-					                 "invList"    => [],
-					                 "error"      => "Could not locate.",
-					                 "error_i18n" => __("Could not locate.", 'TouchPoint-WP'),
-					                 "geo"        => false
-				                 ]);
+									 "invList"    => [],
+									 "error"      => "Could not locate.",
+									 "error_i18n" => __("Could not locate.", 'TouchPoint-WP'),
+									 "geo"        => false
+								 ]);
 				exit;
 			}
 
@@ -1677,10 +1675,10 @@ public static function ajaxNearby(): void
 		if ($invs === null) {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-				                 "invList"    => [],
-				                 "error"      => sprintf("No %s Found.", $settings->namePlural),
-				                 "error_i18n" => sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural)
-			                 ]);
+								 "invList"    => [],
+								 "error"      => sprintf("No %s Found.", $settings->namePlural),
+								 "error_i18n" => sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural)
+							 ]);
 			exit;
 		}
 
@@ -1714,12 +1712,12 @@ public static function ajaxNearby(): void
 	 * @param int    $limit Number of results to return.  0-100 inclusive.
 	 *
 	 * @return object[]|null  An array of database query result objects, or null if the location isn't provided or
-	 *     valid.
+	 *	 valid.
 	 */
 	private static function getInvsNear(float $lat, float $lng, string $postType, int $limit = 3): ?array
 	{
 		if ($lat > 90 || $lat < -90 ||
-		    $lng > 180 || $lng < -180
+			$lng > 180 || $lng < -180
 		) {
 			return null;
 		}
@@ -1895,8 +1893,8 @@ public static function updateCron(): void
 	public function getDistance(bool $useHiForFalse = false)
 	{
 		if ( ! isset(self::$compareGeo->lat) || ! isset(self::$compareGeo->lng) ||
-		     ! isset($this->geo->lat) || ! isset($this->geo->lng) ||
-		     $this->geo->lat === null || $this->geo->lng === null) {
+			 ! isset($this->geo->lat) || ! isset($this->geo->lng) ||
+			 $this->geo->lat === null || $this->geo->lng === null) {
 			return $useHiForFalse ? 25000 : false;
 		}
 
@@ -2127,9 +2125,9 @@ final protected static function updateInvolvementPostsForType(
 		foreach ($invData as $inv) {
 			set_time_limit(15);
 
-	        if ($verbose) {
-		        var_dump($inv);
-	        }
+			if ($verbose) {
+				var_dump($inv);
+			}
 
 
 			////////////////////////
@@ -2230,7 +2228,7 @@ final protected static function updateInvolvementPostsForType(
 			}
 
 			if (in_array("registrationEnded", $typeSets->excludeIf) &&
-			    $inv->regEnd !== null && $inv->regEnd < $now) {
+				$inv->regEnd !== null && $inv->regEnd < $now) {
 				if ($verbose) {
 					echo "<p>Stopping processing because Involvements whose registrations have ended are excluded.  Involvement will be deleted from WordPress.</p>";
 				}
@@ -2447,7 +2445,7 @@ final protected static function updateInvolvementPostsForType(
 			if ($typeSets->useGeo) {
 				// Handle locations
 				if (property_exists($inv, "lat") && $inv->lat !== null &&
-				    property_exists($inv, "lng") && $inv->lng !== null) {
+					property_exists($inv, "lng") && $inv->lng !== null) {
 					update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat);
 					update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng);
 				} else {
@@ -2546,10 +2544,10 @@ final protected static function updateInvolvementPostsForType(
 
 		// Delete posts that are no longer current
 		$q        = new WP_Query([
-			                         'post_type'    => $typeSets->postType,
-			                         'nopaging'     => true,
-			                         'post__not_in' => $postsToKeep
-		                         ]);
+									 'post_type'    => $typeSets->postType,
+									 'nopaging'     => true,
+									 'post__not_in' => $postsToKeep
+								 ]);
 		$removals = 0;
 		foreach ($q->get_posts() as $post) {
 			set_time_limit(10);
@@ -2744,7 +2742,7 @@ public function toJsonLD(): ?array
 	 * Get notable attributes, such as gender restrictions, as strings.
 	 *
 	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent inv, not needed
-	 *     here.)
+	 *	 here.)
 	 *
 	 * @return string[]
 	 */
@@ -2789,13 +2787,13 @@ public function notableAttributes(array $exclude = []): array
 		$r = array_filter($r, fn($i) => ! in_array($i, $exclude));
 
 		if ($this->hasGeo() &&
-		    (
-			    $exclude === [] ||
-			    (
-				    $this->locationName !== null &&
-				    ! in_array($this->locationName, $exclude)
-			    )
-		    )
+			(
+				$exclude === [] ||
+				(
+					$this->locationName !== null &&
+					! in_array($this->locationName, $exclude)
+				)
+			)
 		) {
 			$dist = $this->getDistance();
 			if ($dist !== false) {
@@ -2909,7 +2907,7 @@ public static function getJsInstantiationString(): string
 		$listStr = json_encode($queue);
 
 		return "\ttpvm.addEventListener('Involvement_class_loaded', function() {
-        TP_Involvement.fromObjArray($listStr);\n\t});\n";
+		TP_Involvement.fromObjArray($listStr);\n\t});\n";
 	}
 
 	public function getTouchPointId(): int
@@ -2937,9 +2935,9 @@ private static function ajaxInvJoin(): void
 		} else {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-				                 'error'      => "Invalid Post Type.",
-				                 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => "Invalid Post Type.",
+								 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
@@ -2991,9 +2989,9 @@ private static function ajaxContact(): void
 		if (!$validate) {
 			http_response_code(Http::BAD_REQUEST);
 			echo json_encode([
-				                 'error'      => $result,
-				                 'error_i18n' => __("Contact Blocked for Spam.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => $result,
+								 'error_i18n' => __("Contact Blocked for Spam.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
@@ -3001,9 +2999,9 @@ private static function ajaxContact(): void
 		if (!!$settings) {
 			if (!self::allowContact($inputData->invType)) {
 				echo json_encode([
-					                 'error'      => "Contact Prohibited.",
-					                 'error_i18n' => __("Contact Prohibited.", 'TouchPoint-WP')
-				                 ]);
+									 'error'      => "Contact Prohibited.",
+									 'error_i18n' => __("Contact Prohibited.", 'TouchPoint-WP')
+								 ]);
 				exit;
 			}
 
@@ -3014,9 +3012,9 @@ private static function ajaxContact(): void
 		} else {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-				                 'error'      => "Invalid Post Type.",
-				                 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => "Invalid Post Type.",
+								 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index 3dee09d2..57dd8cfc 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -167,11 +167,11 @@ public static function getForInvType(string $postType): ?Involvement_PostTypeSet
 		$prefixLength = strlen(self::POST_TYPE_PREFIX);
 		foreach (self::instance() as $type) {
 			if ($type->postType === $postType ||
-			    $type->__get('postType') === $postType ||
-			    (
-				    substr($type->postType, 0, $prefixLength) === self::POST_TYPE_PREFIX &&
-				    substr($type->postType, $prefixLength) === $postType
-			    )
+				$type->__get('postType') === $postType ||
+				(
+					substr($type->postType, 0, $prefixLength) === self::POST_TYPE_PREFIX &&
+					substr($type->postType, $prefixLength) === $postType
+				)
 			) {
 				return $type;
 			}
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index f63e2c0e..a26189d9 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -41,7 +41,7 @@
  * @property-read ?WP_Term resCode  The ResCode taxonomy, if present
  * @property ?int          rescode_term_id   The ResCode term ID
  * @property ?string       $loginSessionToken  A token that is saved on the Session variable and used to ensure links
- *     aren't used between sessions.
+ *	 aren't used between sessions.
  * @property ?string       $loginToken    A token used to validate the user.
  */
 class Person extends WP_User implements api, JsonSerializable, module, updatesViaCron
@@ -105,7 +105,7 @@ class Person extends WP_User implements api, JsonSerializable, module, updatesVi
 		'user_activation_key',
 		'spam',
 		'show_admin_bar_front',
-//        'role', // Excluding prevents this from being set through __set
+//		'role', // Excluding prevents this from being set through __set
 		'locale'
 	];
 
@@ -435,7 +435,7 @@ public static function peopleListShortcode($params = [], string $content = ""):
 				self::$_indexingQueries['inv'][$iid] = [
 					'invId'          => $iid,
 					'memTypes'       => null,
-//                    'subGroups' => null,
+//					'subGroups' => null,
 					'with_subGroups' => false // populated below
 				];
 			}
@@ -723,11 +723,11 @@ protected static function updateFromTouchPoint(bool $verbose = false)
 						self::$_indexingQueries['inv'][$iid] = [
 							'invId'          => $iid,
 							'memTypes'       => $type->leaderTypeInts(),
-//                           'subGroups' => null,
+//						   'subGroups' => null,
 							'with_subGroups' => false
 						];
 					} elseif (is_array(self::$_indexingQueries['inv'][$iid]['memTypes'])) {
-						$r                                               = array_merge(
+						$r = array_merge(
 							self::$_indexingQueries['inv'][$iid]['memTypes'],
 							$type->leaderTypeInts()
 						);
@@ -1168,7 +1168,7 @@ protected function resCode(): ?WP_Term
 	 *
 	 * @param ?string $context A reference to where the action buttons are meant to be used.
 	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
-	 *     elements.
+	 *	 elements.
 	 *
 	 * @return string
 	 */
@@ -1537,9 +1537,9 @@ public static function ident($inputData): array
 		if (!$valid) {
 			http_response_code(Http::BAD_REQUEST);
 			echo json_encode([
-				                 'error'      => $comment,
-				                 'error_i18n' => __("Registration Blocked for Spam.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => $comment,
+								 'error_i18n' => __("Registration Blocked for Spam.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 		unset($valid, $comment);
@@ -1605,9 +1605,9 @@ private static function ajaxSrc(): void
 		if ($onBehalfOf === null) {
 			http_response_code(Http::UNAUTHORIZED);
 			echo json_encode([
-				                 "error"      => "Not Authorized.",
-				                 "error_i18n" => __("You may need to sign in.", 'TouchPoint-WP')
-			                 ]);
+								 "error"      => "Not Authorized.",
+								 "error_i18n" => __("You may need to sign in.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
@@ -1733,9 +1733,9 @@ private static function ajaxContact(): void
 		if (!$validate) {
 			http_response_code(Http::BAD_REQUEST);
 			echo json_encode([
-				                 'error'      => $result,
-				                 'error_i18n' => __("Contact Blocked for Spam.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => $result,
+								 'error_i18n' => __("Contact Blocked for Spam.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 055552bc..80d53bf8 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -243,9 +243,9 @@ protected function __construct(string $file = '')
 //		add_action( 'admin_enqueue_scripts', [$this, 'admin_enqueue_styles'], 10, 1 ); // TODO restore?
 
 		// Load API for generic admin functions.
-//        if (is_admin()) {
-//            $this->admin(); // SOMEDAY if we ever need to interact with other post types, this should be uncommented.
-//        }
+//		if (is_admin()) {
+//			$this->admin(); // SOMEDAY if we ever need to interact with other post types, this should be uncommented.
+//		}
 
 		add_filter('do_parse_request', [$this, 'parseRequest'], 10, 3);
 
@@ -365,18 +365,18 @@ public static function postHeadersAndFiltering(): string
 
 		if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
 			echo json_encode([
-				                 'error'      => 'Only POST requests are allowed.',
-				                 'error_i18n' => __("Only POST requests are allowed.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => 'Only POST requests are allowed.',
+								 'error_i18n' => __("Only POST requests are allowed.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
 		$inputData = file_get_contents('php://input');
 		if ($inputData[0] !== '{') {
 			echo json_encode([
-				                 'error'      => 'Invalid data provided.',
-				                 'error_i18n' => __("Invalid data provided.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => 'Invalid data provided.',
+								 'error_i18n' => __("Invalid data provided.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
@@ -427,7 +427,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 
 			// App Events Endpoint
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_APP_EVENTS &&
-			    TouchPointWP::useTribeCalendar()
+				TouchPointWP::useTribeCalendar()
 			) {
 				if ( ! EventsCalendar::api($reqUri)) {
 					return $continue;
@@ -436,7 +436,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 
 			// Involvement endpoint
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_INVOLVEMENT &&
-			    $this->settings->enable_involvements === "on"
+				$this->settings->enable_involvements === "on"
 			) {
 				if ( ! Involvement::api($reqUri)) {
 					return $continue;
@@ -445,7 +445,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 
 			// Global Partner endpoint
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_GLOBAL &&
-			    $this->settings->enable_global === "on"
+				$this->settings->enable_global === "on"
 			) {
 				if ( ! Partner::api($reqUri)) {
 					return $continue;
@@ -475,7 +475,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 
 			// Auth endpoints
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_AUTH &&
-			    $this->settings->enable_authentication === "on"
+				$this->settings->enable_authentication === "on"
 			) {
 				if ( ! Auth::api($reqUri)) {
 					return $continue;
@@ -499,7 +499,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 
 			// Geolocate via IP
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_GEOLOCATE &&
-			    count($reqUri['path']) === 2) {
+				count($reqUri['path']) === 2) {
 				$this->ajaxGeolocate();
 			}
 		}
@@ -652,45 +652,45 @@ public function loadLocalizations()
 		load_plugin_textdomain('TouchPoint-WP', false, $dir . '/i18n/');
 	}
 
-    /**
-     * Create or update database tables
-     */
-    protected function createTables(): void
-    {
-        global $wpdb;
-        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-        // IP Geo Caching table
-        $tableName = $wpdb->base_prefix . TouchPointWP::TABLE_IP_GEO;
-        $sql = "CREATE TABLE $tableName (
-            id int(10) unsigned NOT NULL auto_increment,
-            ip varbinary(16) NOT NULL UNIQUE,
-            updatedDT datetime DEFAULT NOW(),
-            data text NOT NULL,
-            PRIMARY KEY  (id)
-        )";
-        dbDelta($sql);
-    }
+	/**
+	 * Create or update database tables
+	 */
+	protected function createTables(): void
+	{
+		global $wpdb;
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
-    /**
+		// IP Geo Caching table
+		$tableName = $wpdb->base_prefix . TouchPointWP::TABLE_IP_GEO;
+		$sql = "CREATE TABLE $tableName (
+			id int(10) unsigned NOT NULL auto_increment,
+			ip varbinary(16) NOT NULL UNIQUE,
+			updatedDT datetime DEFAULT NOW(),
+			data text NOT NULL,
+			PRIMARY KEY  (id)
+		)";
+		dbDelta($sql);
+	}
+
+	/**
 	 * Compare the version numbers to determine if a migration is needed.
 	 */
 	public function migrate($force = false): void
 	{
 		if ($this->settings->version === self::VERSION && !$force) {
-            return;
-        }
+			return;
+		}
 
-        $this->createTables();
+		$this->createTables();
 
-        if (self::$_hasBeenInited) {
-            $this->insertTerms();
-        } else {
-            add_action(self::INIT_ACTION_HOOK, [$this, 'insertTerms']);
-        }
+		if (self::$_hasBeenInited) {
+			$this->insertTerms();
+		} else {
+			add_action(self::INIT_ACTION_HOOK, [$this, 'insertTerms']);
+		}
 
-        $this->settings->migrate();
-    }
+		$this->settings->migrate();
+	}
 
 	/**
 	 * Load the settings, connect the references, and check that there aren't pending migrations.
@@ -752,7 +752,7 @@ public static function load($file): TouchPointWP
 
 		// Load Events if enabled (by presence of Events Calendar plugin)
 		if (self::useTribeCalendar()
-		    && ! class_exists("tp\TouchPointWP\EventsCalendar")) {
+			&& ! class_exists("tp\TouchPointWP\EventsCalendar")) {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 				require_once 'EventsCalendar.php';
 			}
@@ -770,21 +770,21 @@ public static function load($file): TouchPointWP
 	}
 
 	/**
-     * @var bool True of the init process has run.  False if not.  Prevents things from happening twice, which can cause errors.
-     */
-    private static bool $_hasBeenInited = false;
+	 * @var bool True of the init process has run.  False if not.  Prevents things from happening twice, which can cause errors.
+	 */
+	private static bool $_hasBeenInited = false;
 
-    /**
-     * Initialize the plugin.
-     *
-     * @return void
-     */
-    public static function init(): void
-    {
-	    if (self::$_hasBeenInited)
-            return;
+	/**
+	 * Initialize the plugin.
+	 *
+	 * @return void
+	 */
+	public static function init(): void
+	{
+		if (self::$_hasBeenInited)
+			return;
 
-        self::instance()->loadLocalizations();
+		self::instance()->loadLocalizations();
 
 		self::instance()->registerTaxonomies();
 
@@ -796,19 +796,19 @@ public static function init(): void
 
 		self::$_hasBeenInited = true;
 
-        self::requireScript("base");
+		self::requireScript("base");
 
 		do_action(self::INIT_ACTION_HOOK);
 	}
 
 	/**
-     * Prints the inline 'base' script.  This is meant to be called in the wp_head and admin_head, and should only be
-     * called once on a page, but that is not automatically validated.
-     *
-     * @return void
-     */
-    public static function renderBaseInlineScript(): void
-    {
+	 * Prints the inline 'base' script.  This is meant to be called in the wp_head and admin_head, and should only be
+	 * called once on a page, but that is not automatically validated.
+	 *
+	 * @return void
+	 */
+	public static function renderBaseInlineScript(): void
+	{
 		include self::instance()->assets_dir . '/js/base-inline.php';
 	}
 
@@ -823,17 +823,17 @@ public function registerScriptsAndStyles(): void
 			false
 		);
 
-        wp_register_script(
-            self::SHORTCODE_PREFIX . 'base-defer',
-            $this->assets_url . 'js/base-defer' . $this->script_ext,
-            [self::SHORTCODE_PREFIX . 'base', 'wp-i18n'],
-            self::VERSION,
-            true
-        );
-	    wp_set_script_translations(
-            self::SHORTCODE_PREFIX . 'base-defer',
-            'TouchPoint-WP', $this->getJsLocalizationDir()
-        );
+		wp_register_script(
+			self::SHORTCODE_PREFIX . 'base-defer',
+			$this->assets_url . 'js/base-defer' . $this->script_ext,
+			[self::SHORTCODE_PREFIX . 'base', 'wp-i18n'],
+			self::VERSION,
+			true
+		);
+		wp_set_script_translations(
+			self::SHORTCODE_PREFIX . 'base-defer',
+			'TouchPoint-WP', $this->getJsLocalizationDir()
+		);
 
 		wp_register_script(
 			self::SHORTCODE_PREFIX . 'swal2-defer',
@@ -893,9 +893,9 @@ public function registerScriptsAndStyles(): void
 			Partner::registerScriptsAndStyles();
 		}
 
-//        if ( ! ! $this->auth) {
-//            Auth::registerScriptsAndStyles();
-//        }
+//		if ( ! ! $this->auth) {
+//			Auth::registerScriptsAndStyles();
+//		}
 
 		if ( ! ! $this->rsvp) {
 			Meeting::registerScriptsAndStyles();
@@ -966,11 +966,11 @@ public static function requireStyle(string $name = null): void
 	public function filterByTag(?string $tag, ?string $handle): string
 	{
 		if (strpos($tag, 'async') !== false &&
-		    strpos($handle, '-async') > 0) {
+			strpos($handle, '-async') > 0) {
 			$tag = str_replace(' src=', ' async="async" src=', $tag);
 		}
 		if (strpos($tag, 'defer') !== false &&
-		    strpos($handle, '-defer') > 0
+			strpos($handle, '-defer') > 0
 		) {
 			$tag = str_replace('<script ', '<script defer ', $tag);
 		}
@@ -986,9 +986,9 @@ public function ajaxGeolocate(): void
 		if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
 			http_response_code(Http::METHOD_NOT_ALLOWED);
 			echo json_encode([
-				                 'error'      => 'Only GET requests are allowed.',
-				                 'error_i18n' => __("Only GET requests are allowed.", 'TouchPoint-WP')
-			                 ]);
+								 'error'      => 'Only GET requests are allowed.',
+								 'error_i18n' => __("Only GET requests are allowed.", 'TouchPoint-WP')
+							 ]);
 			exit;
 		}
 
@@ -1003,7 +1003,7 @@ public function ajaxGeolocate(): void
 	 * @param bool $useApi Set false to only use cached data, and not the IP API.
 	 *
 	 * @return stdClass|false An object with 'lat', 'lng', and 'human' attributes, if a location could be identified.
-	 *     Or, false if not available.
+	 *	 Or, false if not available.
 	 */
 	public function geolocate(bool $useApi = true, bool $includeRaw = false)
 	{
@@ -1080,7 +1080,7 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false)
 	 * @param bool    $includeIpLoc  Whether to use IP geolocation as a fallback data source.
 	 *
 	 * @return object|false An object with a 'human' attribute, if a location could be identified. Or, false if not
-	 *     available.
+	 *	 available.
 	 */
 	public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true)
 	{
@@ -1200,7 +1200,7 @@ protected function getIpData(string $ip, bool $useApi = true)
 		$this->ipData = $return;
 
 		/** @noinspection SqlResolve */
-        $q = $wpdb->prepare( "
+		$q = $wpdb->prepare( "
 			INSERT INTO $tableName (ip, updatedDt, data)
 			VALUES ('$ip_pton', NOW(), %s) ON DUPLICATE KEY UPDATE updatedDt = NOW(), data = %s;",
 			$return, $return);
@@ -1287,13 +1287,13 @@ function getLabels(string $singular, string $plural): array
 			];
 		}
 
-        // Resident Codes
-        $resCodeTypesToApply = [];
-        if ($this->settings->enable_involvements === "on") {
-            $resCodeTypesToApply = Involvement_PostTypeSettings::getPostTypesWithGeoEnabled();
-        }
-        $resCodeTypesToApply[] = 'user';
-        register_taxonomy(
+		// Resident Codes
+		$resCodeTypesToApply = [];
+		if ($this->settings->enable_involvements === "on") {
+			$resCodeTypesToApply = Involvement_PostTypeSettings::getPostTypesWithGeoEnabled();
+		}
+		$resCodeTypesToApply[] = 'user';
+		register_taxonomy(
 			self::TAX_RESCODE,
 			$resCodeTypesToApply,
 			[
@@ -1318,14 +1318,14 @@ function getLabels(string $singular, string $plural): array
 		);
 		// Terms inserted via insertTerms method
 
-        // Campuses
-        if ($this->settings->enable_campuses === "on") {
-            $campusesTypesToApply = [];
-            if ($this->settings->enable_involvements === "on") {
-                $campusesTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-            }
-            $campusesTypesToApply[] = 'user';
-            register_taxonomy(
+		// Campuses
+		if ($this->settings->enable_campuses === "on") {
+			$campusesTypesToApply = [];
+			if ($this->settings->enable_involvements === "on") {
+				$campusesTypesToApply = Involvement_PostTypeSettings::getPostTypes();
+			}
+			$campusesTypesToApply[] = 'user';
+			register_taxonomy(
 				self::TAX_CAMPUS,
 				$campusesTypesToApply,
 				[
@@ -1346,16 +1346,16 @@ function getLabels(string $singular, string $plural): array
 				]
 			);
 			// Terms inserted via insertTerms method
-        }
-
-        // Divisions & Programs
-        $divisionTypesToApply = [];
-        if ($this->settings->enable_involvements === "on") {
-            $divisionTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-        }
-        // TODO allow this taxonomy to be applied to other post types as an option.
-        if (count($divisionTypesToApply) > 0) {
-            register_taxonomy(
+		}
+
+		// Divisions & Programs
+		$divisionTypesToApply = [];
+		if ($this->settings->enable_involvements === "on") {
+			$divisionTypesToApply = Involvement_PostTypeSettings::getPostTypes();
+		}
+		// TODO allow this taxonomy to be applied to other post types as an option.
+		if (count($divisionTypesToApply) > 0) {
+			register_taxonomy(
 				self::TAX_DIV,
 				$divisionTypesToApply,
 				[
@@ -1379,10 +1379,10 @@ function getLabels(string $singular, string $plural): array
 			// Terms inserted via insertTerms method
 		}
 
-        if ($this->settings->enable_involvements === "on") {
+		if ($this->settings->enable_involvements === "on") {
 
-            // Weekdays
-            register_taxonomy(
+			// Weekdays
+			register_taxonomy(
 				self::TAX_WEEKDAY,
 				Involvement_PostTypeSettings::getPostTypes(),
 				[
@@ -1404,8 +1404,8 @@ function getLabels(string $singular, string $plural): array
 			);
 			// Terms inserted via insertTerms method
 
-            // Tenses
-            register_taxonomy(
+			// Tenses
+			register_taxonomy(
 				self::TAX_TENSE,
 				Involvement_PostTypeSettings::getPostTypes(),
 				[
@@ -1427,9 +1427,9 @@ function getLabels(string $singular, string $plural): array
 			);
 			// Terms inserted via insertTerms method
 
-            // Time of Day
-            /** @noinspection SpellCheckingInspection */
-            register_taxonomy(
+			// Time of Day
+			/** @noinspection SpellCheckingInspection */
+			register_taxonomy(
 				self::TAX_DAYTIME,
 				Involvement_PostTypeSettings::getPostTypes(),
 				[
@@ -1452,13 +1452,13 @@ function getLabels(string $singular, string $plural): array
 			// Terms inserted via insertTerms method
 		}
 
-        // Age Groups
-        $ageGroupTypesToApply = [];
-        if ($this->settings->enable_involvements === "on") {
-            $ageGroupTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-        }
-        $ageGroupTypesToApply[] = 'user';
-        register_taxonomy(
+		// Age Groups
+		$ageGroupTypesToApply = [];
+		if ($this->settings->enable_involvements === "on") {
+			$ageGroupTypesToApply = Involvement_PostTypeSettings::getPostTypes();
+		}
+		$ageGroupTypesToApply[] = 'user';
+		register_taxonomy(
 			self::TAX_AGEGROUP,
 			$ageGroupTypesToApply,
 			[
@@ -1481,9 +1481,9 @@ function getLabels(string $singular, string $plural): array
 		// Terms inserted via insertTerms method
 
 
-        // Involvement Marital Status
-        if ($this->settings->enable_involvements === "on") {
-            register_taxonomy(
+		// Involvement Marital Status
+		if ($this->settings->enable_involvements === "on") {
+			register_taxonomy(
 				self::TAX_INV_MARITAL,
 				Involvement_PostTypeSettings::getPostTypes(),
 				[
@@ -1540,246 +1540,246 @@ function getLabels(string $singular, string $plural): array
 	}
 
 	/**
-     * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.
-     *
-     * @param object[]  $list
-     * @param string $taxonomy
-     * @param bool   $forceIdUpdate
-     *
-     * @return void
-     */
-    protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
-    {
-        foreach ($list as $i) {
-            if ($i->name === null) {
-                continue;
-            }
-            // In addition to making sure term exists, make sure it has the correct meta id, too.
-            $term = Utilities::termExists($i->name, $taxonomy);
-            $idUpdate = $forceIdUpdate;
-            if (!$term) {
-                $term = Utilities::insertTerm(
-                    $i->name,
-                    $taxonomy,
-                    [
-                        'description' => $i->name,
-                        'slug'        => sanitize_title($i->name)
-                    ]
-                );
-                if (is_wp_error($term)) {
-                    new TouchPointWP_WPError($term);
-                    $term = null;
-                }
-                $idUpdate = true;
-            }
-	        // Update the term meta if term is new, or if id update is forced.
-            if ($term !== null && isset($term['term_id']) && $idUpdate) {
-                update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
-            }
-            if ($idUpdate) {
-                self::queueFlushRewriteRules();
-            }
-        }
-    }
-
-    public static bool $forceTermLookupIdUpdate = false;
+	 * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.
+	 *
+	 * @param object[]  $list
+	 * @param string $taxonomy
+	 * @param bool   $forceIdUpdate
+	 *
+	 * @return void
+	 */
+	protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+	{
+		foreach ($list as $i) {
+			if ($i->name === null) {
+				continue;
+			}
+			// In addition to making sure term exists, make sure it has the correct meta id, too.
+			$term = Utilities::termExists($i->name, $taxonomy);
+			$idUpdate = $forceIdUpdate;
+			if (!$term) {
+				$term = Utilities::insertTerm(
+					$i->name,
+					$taxonomy,
+					[
+						'description' => $i->name,
+						'slug'		=> sanitize_title($i->name)
+					]
+				);
+				if (is_wp_error($term)) {
+					new TouchPointWP_WPError($term);
+					$term = null;
+				}
+				$idUpdate = true;
+			}
+			// Update the term meta if term is new, or if id update is forced.
+			if ($term !== null && isset($term['term_id']) && $idUpdate) {
+				update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
+			}
+			if ($idUpdate) {
+				self::queueFlushRewriteRules();
+			}
+		}
+	}
 
-    /**
-     * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
-     * loaded.)
-     *
-     * @return void
-     */
-    public function insertTerms()
-    {
-        // Resident Codes
-        $this->insertTermsForLookupBasedTaxonomy(
-            $this->getResCodes(),
-            self::TAX_RESCODE,
-            self::$forceTermLookupIdUpdate
-        );
-        // TODO remove defunct res codes
-
-        // Campuses
-        if ($this->settings->enable_campuses === "on") {
-            $this->insertTermsForLookupBasedTaxonomy(
-                $this->getCampuses(),
-                self::TAX_CAMPUS,
-                self::$forceTermLookupIdUpdate
-            );
-        }
-        // TODO remove defunct campuses (including all of them, if disabled)
-
-        // Age Groups
-        foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
-            if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
-                Utilities::insertTerm(
-                    $ag,
-                    self::TAX_AGEGROUP,
-                    [
-                        'description' => $ag,
-                        'slug'        => sanitize_title($ag)
-                    ]
-                );
-                self::queueFlushRewriteRules();
-            }
-        }
-
-        // Involvements and TODO Events
-        $postTypesToApply = [];
-        if ($this->settings->enable_involvements === "on") {
-            $postTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-        }
-        if (count($postTypesToApply) > 0) {
-
-            // Divisions & Programs
-            $enabledDivisions = $this->settings->dv_divisions;
-            foreach ($this->getDivisions() as $d) {
-                if (in_array('div' . $d->id, $enabledDivisions)) {
-                    // Program
-                    $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-                    if ($pTermInfo === null && $d->pName !== null) {
-                        $pTermInfo = Utilities::insertTerm(
-                            $d->pName,
-                            self::TAX_DIV,
-                            [
-                                'description' => $d->pName,
-                                'slug'        => sanitize_title($d->pName)
-                            ]
-                        );
-                        if (is_wp_error($pTermInfo)) {
-                            new TouchPointWP_WPError($pTermInfo);
-                        } else {
-                            update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
-                        }
-
-                        self::queueFlushRewriteRules();
-                    }
-
-                    // Division
-                    $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-                    if ($dTermInfo === null && $d->dName !== null) {
-                        $dTermInfo = Utilities::insertTerm(
-                            $d->dName,
-                            self::TAX_DIV,
-                            [
-                                'description' => $d->dName,
-                                'parent'      => $pTermInfo['term_id'],
-                                'slug'        => sanitize_title($d->dName)
-                            ]
-                        );
-                        if (is_wp_error($dTermInfo)) {
-                            new TouchPointWP_WPError($dTermInfo);
-                        } else {
-                            update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
-                        }
-
-                        self::queueFlushRewriteRules();
-                    }
-                } else {
-                    // Remove terms that are disabled from importing.
-
-                    // Delete disabled divisions.  Get program, so we delete the right division.
-                    $pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-                    if ($pTermInfo !== null) {
-                        $dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-                        if ($dTermInfo !== null) {
-                            wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
-                            self::queueFlushRewriteRules();
-                        }
-                    }
-
-                    // Program
-                    // TODO remove programs that no longer have a division selected for use as a term.
-                    // TODO remove program & div terms that are no longer present in TouchPoint
-                }
-            }
-
-            // Weekdays
-            for ($di = 0; $di < 7; $di++) {
-                $name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
-                if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
-                    Utilities::insertTerm(
-                        $name,
-                        self::TAX_WEEKDAY,
-                        [
-                            'description' => $name,
-                            'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
-                        ]
-                    );
-                    self::queueFlushRewriteRules();
-                }
-            }
-
-            // Tense
-            foreach (
-                [
-                    TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
-                    TouchPointWP::TAX_TENSE_PRESENT => 'Current',
-                    TouchPointWP::TAX_TENSE_PAST => 'Past',
-                ] as $slug => $name
-            ) {
-                if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
-                    Utilities::insertTerm(
-                        $name,
-                        self::TAX_TENSE,
-                        [
-                            'description' => $name,
-                            'slug'        => $slug
-                        ]
-                    );
-                    self::queueFlushRewriteRules();
-                }
-            }
-
-            // Time of Day
-            $timesOfDay = [
-                'Late Night',
-                'Early Morning',
-                'Morning',
-                'Midday',
-                'Afternoon',
-                'Evening',
-                'Night'
-            ];
-            foreach ($timesOfDay as $tod) {
-                if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
-                    $slug = str_replace(" ", "", $tod);
-                    $slug = strtolower($slug);
-                    Utilities::insertTerm(
-                        $tod,
-                        self::TAX_DAYTIME,
-                        [
-                            'description' => $tod,
-                            'slug'        => $slug
-                        ]
-                    );
-                    self::queueFlushRewriteRules();
-                }
-            }
-        }
-
-        // Involvements
-        if ($this->settings->enable_involvements === "on") {
-
-            // Involvement Marital Status
-            foreach (['mostly_single', 'mostly_married'] as $ms) {
-                if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
-                    Utilities::insertTerm(
-                        $ms,
-                        self::TAX_INV_MARITAL,
-                        [
-                            'description' => $ms,
-                            'slug'        => sanitize_title($ms)
-                        ]
-                    );
-                    self::queueFlushRewriteRules();
-                }
-            }
-        }
-    }
-
-    private static array $divisionTerms = [];
+	public static bool $forceTermLookupIdUpdate = false;
+
+	/**
+	 * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
+	 * loaded.)
+	 *
+	 * @return void
+	 */
+	public function insertTerms()
+	{
+		// Resident Codes
+		$this->insertTermsForLookupBasedTaxonomy(
+			$this->getResCodes(),
+			self::TAX_RESCODE,
+			self::$forceTermLookupIdUpdate
+		);
+		// TODO remove defunct res codes
+
+		// Campuses
+		if ($this->settings->enable_campuses === "on") {
+			$this->insertTermsForLookupBasedTaxonomy(
+				$this->getCampuses(),
+				self::TAX_CAMPUS,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+		// TODO remove defunct campuses (including all of them, if disabled)
+
+		// Age Groups
+		foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
+			if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
+				Utilities::insertTerm(
+					$ag,
+					self::TAX_AGEGROUP,
+					[
+						'description' => $ag,
+						'slug'        => sanitize_title($ag)
+					]
+				);
+				self::queueFlushRewriteRules();
+			}
+		}
+
+		// Involvements and TODO Events
+		$postTypesToApply = [];
+		if ($this->settings->enable_involvements === "on") {
+			$postTypesToApply = Involvement_PostTypeSettings::getPostTypes();
+		}
+		if (count($postTypesToApply) > 0) {
+
+			// Divisions & Programs
+			$enabledDivisions = $this->settings->dv_divisions;
+			foreach ($this->getDivisions() as $d) {
+				if (in_array('div' . $d->id, $enabledDivisions)) {
+					// Program
+					$pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
+					if ($pTermInfo === null && $d->pName !== null) {
+						$pTermInfo = Utilities::insertTerm(
+							$d->pName,
+							self::TAX_DIV,
+							[
+								'description' => $d->pName,
+								'slug'        => sanitize_title($d->pName)
+							]
+						);
+						if (is_wp_error($pTermInfo)) {
+							new TouchPointWP_WPError($pTermInfo);
+						} else {
+							update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
+						}
+
+						self::queueFlushRewriteRules();
+					}
+
+					// Division
+					$dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+					if ($dTermInfo === null && $d->dName !== null) {
+						$dTermInfo = Utilities::insertTerm(
+							$d->dName,
+							self::TAX_DIV,
+							[
+								'description' => $d->dName,
+								'parent'      => $pTermInfo['term_id'],
+								'slug'        => sanitize_title($d->dName)
+							]
+						);
+						if (is_wp_error($dTermInfo)) {
+							new TouchPointWP_WPError($dTermInfo);
+						} else {
+							update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
+						}
+
+						self::queueFlushRewriteRules();
+					}
+				} else {
+					// Remove terms that are disabled from importing.
+
+					// Delete disabled divisions.  Get program, so we delete the right division.
+					$pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
+					if ($pTermInfo !== null) {
+						$dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+						if ($dTermInfo !== null) {
+							wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
+							self::queueFlushRewriteRules();
+						}
+					}
+
+					// Program
+					// TODO remove programs that no longer have a division selected for use as a term.
+					// TODO remove program & div terms that are no longer present in TouchPoint
+				}
+			}
+
+			// Weekdays
+			for ($di = 0; $di < 7; $di++) {
+				$name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
+				if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
+					Utilities::insertTerm(
+						$name,
+						self::TAX_WEEKDAY,
+						[
+							'description' => $name,
+							'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
+						]
+					);
+					self::queueFlushRewriteRules();
+				}
+			}
+
+			// Tense
+			foreach (
+				[
+					TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
+					TouchPointWP::TAX_TENSE_PRESENT => 'Current',
+					TouchPointWP::TAX_TENSE_PAST => 'Past',
+				] as $slug => $name
+			) {
+				if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
+					Utilities::insertTerm(
+						$name,
+						self::TAX_TENSE,
+						[
+							'description' => $name,
+							'slug'        => $slug
+						]
+					);
+					self::queueFlushRewriteRules();
+				}
+			}
+
+			// Time of Day
+			$timesOfDay = [
+				'Late Night',
+				'Early Morning',
+				'Morning',
+				'Midday',
+				'Afternoon',
+				'Evening',
+				'Night'
+			];
+			foreach ($timesOfDay as $tod) {
+				if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
+					$slug = str_replace(" ", "", $tod);
+					$slug = strtolower($slug);
+					Utilities::insertTerm(
+						$tod,
+						self::TAX_DAYTIME,
+						[
+							'description' => $tod,
+							'slug'        => $slug
+						]
+					);
+					self::queueFlushRewriteRules();
+				}
+			}
+		}
+
+		// Involvements
+		if ($this->settings->enable_involvements === "on") {
+
+			// Involvement Marital Status
+			foreach (['mostly_single', 'mostly_married'] as $ms) {
+				if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
+					Utilities::insertTerm(
+						$ms,
+						self::TAX_INV_MARITAL,
+						[
+							'description' => $ms,
+							'slug'        => sanitize_title($ms)
+						]
+					);
+					self::queueFlushRewriteRules();
+				}
+			}
+		}
+	}
+
+	private static array $divisionTerms = [];
 
 	/**
 	 * @param int $divId
@@ -1793,8 +1793,8 @@ public static function getDivisionTermIdByDivId(int $divId): int
 				[
 					'taxonomy'   => self::TAX_DIV,
 					'hide_empty' => false,
-					'number'     => 1,
-					'fields'     => 'ids',
+					'number'	 => 1,
+					'fields'	 => 'ids',
 					'meta_key'   => self::SETTINGS_PREFIX . 'divId',
 					'meta_value' => $divId
 				]
@@ -2363,7 +2363,7 @@ public function getKeywordsAsKVArray(): array
 	 * Returns an array of objects that correspond to Person Extra Value Fields.  Each has a name and a type.
 	 *
 	 * @param array|null $matches Provide an array of items that should be matched. If provided, only matches are
-	 *     returned.
+	 *	 returned.
 	 *
 	 * @return array
 	 */
@@ -2460,7 +2460,7 @@ public function getFamilyEvFields(?array $matches = null): array
 				array_filter(
 					$fevObj->familyEvFields,
 					fn($f) => in_array($f->hash, $matches) ||
-					          in_array($f->field . " | " . $f->type, $matches)
+							  in_array($f->field . " | " . $f->type, $matches)
 				)
 			);
 		}
@@ -2792,7 +2792,7 @@ private static function parseApiResponse($response)
 
 		// Most likely the issue where a module import failed for no apparent reason.
 		if (property_exists($respDecoded, 'output') &&
-		    strpos($respDecoded->output, "Traceback (most recent call last):") === 0) {
+			strpos($respDecoded->output, "Traceback (most recent call last):") === 0) {
 			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001);
 		}
 
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 803cb190..1691c545 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -29,7 +29,7 @@ class TouchPointWP_AdminAPI implements api
 	 */
 	public function __construct()
 	{
-//        add_action( 'save_post', array( $this, 'save_meta_boxes' ), 10, 1 );
+//		add_action( 'save_post', array( $this, 'save_meta_boxes' ), 10, 1 );
 	}
 
 	/**
@@ -93,15 +93,15 @@ public static function api(array $uri): bool
 					return false;
 				}
 				TouchPointWP::instance()->migrate(true);
-                exit;
-
-            case "phpinfo":
-	            if (!TouchPointWP::currentUserIsAdmin()) {
-		            return false;
-	            }
-	            phpinfo();
-	            exit;
-        }
+				exit;
+
+			case "phpinfo":
+				if (!TouchPointWP::currentUserIsAdmin()) {
+					return false;
+				}
+				phpinfo();
+				exit;
+		}
 
 		return false;
 	}
diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index b3fbe51b..8de9487b 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -87,12 +87,12 @@ protected static function debugMode(): bool
 	public function toJson(): string
 	{
 		return json_encode([
-			                   'error' => [
-				                   'status'   => 'failure',
-				                   'code'     => $this->getCode(),
-				                   'message'  => $this->getMessage(),
-				                   'location' => $this->getFile() . " @ L" . $this->getLine()
-			                   ]
-		                   ]);
+							   'error' => [
+								   'status'   => 'failure',
+								   'code'     => $this->getCode(),
+								   'message'  => $this->getMessage(),
+								   'location' => $this->getFile() . " @ L" . $this->getLine()
+							   ]
+						   ]);
 	}
 }
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 43ac0f25..252b0a75 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -181,44 +181,44 @@ public function hasValidApiSettings(): bool
 		$host = $this->getWithoutDefault('host');
 
 		return ! ($this->getWithoutDefault('api_script_name') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER ||
-		          $host === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER || $host === '' ||
-		          $this->getWithoutDefault('api_user') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER ||
-		          $this->getWithoutDefault('api_pass') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER);
+				  $host === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER || $host === '' ||
+				  $this->getWithoutDefault('api_user') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER ||
+				  $this->getWithoutDefault('api_pass') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER);
+	}
+
+	/**
+	 * Used internally to determine if a particular setting should be auto-loaded.
+	 *
+	 * @param string $settingName
+	 *
+	 * @return bool
+	 */
+	private function settingShouldBeAutoLoaded(string $settingName): bool
+	{
+		if (str_contains($settingName, '_cron_last_run')
+			|| $settingName === "DEBUG"
+			|| $settingName === "meta_familyEvFields" // because it's used when registering the taxonomies on every init.
+		) {
+			return true;
+		}
+		foreach (self::settingsFields() as $page) {
+			foreach ($page['fields'] as $f) {
+				if ($f['id'] === $settingName) {
+					if (isset($f['autoload'])) {
+						return !!$f['autoload'];
+					}
+					return false;
+				}
+			}
+		}
+		return false;
 	}
 
 	/**
-     * Used internally to determine if a particular setting should be auto-loaded.
-     *
-     * @param string $settingName
-     *
-     * @return bool
-     */
-    private function settingShouldBeAutoLoaded(string $settingName): bool
-    {
-        if (str_contains($settingName, '_cron_last_run')
-            || $settingName === "DEBUG"
-            || $settingName === "meta_familyEvFields" // because it's used when registering the taxonomies on every init.
-        ) {
-            return true;
-        }
-        foreach (self::settingsFields() as $page) {
-            foreach ($page['fields'] as $f) {
-                if ($f['id'] === $settingName) {
-                    if (isset($f['autoload'])) {
-                        return !!$f['autoload'];
-                    }
-                    return false;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
 	 * Build settings fields
 	 *
 	 * @param bool|string $includeDetail Set to true to get options from TouchPoint, likely including the API calls. Set
-	 *                      to the key of a specific page to only load options for that page.
+	 *	                  to the key of a specific page to only load options for that page.
 	 *
 	 * @return array Fields to be displayed on settings page
 	 */
@@ -248,81 +248,81 @@ private function settingsFields($includeDetail = false): array
 					'type'        => 'checkbox',
 					'default'     => '',
 					'autoload'    => true,
-                    'callback'    => fn($new) => $this->validation_updateScriptsIfChanged($new, 'enable_authentication'),
-                ],
-                [
-                    'id'          => 'enable_rsvp',
-                    'label'       => __('Enable RSVP Tool', 'TouchPoint-WP'),
-                    'description' => __('Add a crazy-simple RSVP button to WordPress event pages.', 'TouchPoint-WP'),
-                    'type'        => 'checkbox',
-                    'default'     => '',
-                    'autoload'    => true,
-                ],
-                [
-                    'id'          => 'enable_involvements',
-                    'label'       => __('Enable Involvements', 'TouchPoint-WP'),
-                    'description' => __(
-                        'Load Involvements from TouchPoint for involvement listings and entries native in your website.',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'checkbox',
-                    'default'     => '',
-                    'autoload'    => true,
-                ],
-                [
-                    'id'          => 'enable_people_lists',
-                    'label'       => __('Enable Public People Lists', 'TouchPoint-WP'),
-                    'description' => __(
-                        'Import public people listings from TouchPoint (e.g. staff or elders)',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'checkbox',
-                    'default'     => '',
-                    'autoload'    => true,
-                ],
-                [
-                    'id'          => 'enable_global',
-                    'label'       => __('Enable Global Partner Listings', 'TouchPoint-WP'),
-                    'description' => __(
-                        'Import ministry partners from TouchPoint to list publicly.',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'checkbox',
-                    'default'     => '',
-                    'autoload'    => true,
-                ],
-                [
-                    'id'          => 'enable_campuses',
-                    'label'       => __('Enable Campuses', 'TouchPoint-WP'),
-                    'description' => __(
-                        "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)",
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'checkbox',
-                    'default'     => '',
-                    'autoload'    => true,
-                ],
-                [
-                    'id'          => 'system_name',
-                    'label'       => __('Display Name', 'TouchPoint-WP'),
-                    'description' => __(
-                        'What your church calls your TouchPoint database.',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'text',
-                    'default'     => 'TouchPoint',
-                    'placeholder' => 'TouchPoint'
-                ],
-                [
-                    'id'          => 'host',
-                    'label'       => __('TouchPoint Host Name', 'TouchPoint-WP'),
-                    'description' => __(
-                        'The domain for your TouchPoint database, without the https or any slashes.',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'text',
-                    'default'     => '',
-                    'autoload'    => true,
+					'callback'    => fn($new) => $this->validation_updateScriptsIfChanged($new, 'enable_authentication'),
+				],
+				[
+					'id'          => 'enable_rsvp',
+					'label'       => __('Enable RSVP Tool', 'TouchPoint-WP'),
+					'description' => __('Add a crazy-simple RSVP button to WordPress event pages.', 'TouchPoint-WP'),
+					'type'        => 'checkbox',
+					'default'     => '',
+					'autoload'    => true,
+				],
+				[
+					'id'          => 'enable_involvements',
+					'label'       => __('Enable Involvements', 'TouchPoint-WP'),
+					'description' => __(
+						'Load Involvements from TouchPoint for involvement listings and entries native in your website.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox',
+					'default'     => '',
+					'autoload'    => true,
+				],
+				[
+					'id'          => 'enable_people_lists',
+					'label'       => __('Enable Public People Lists', 'TouchPoint-WP'),
+					'description' => __(
+						'Import public people listings from TouchPoint (e.g. staff or elders)',
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox',
+					'default'     => '',
+					'autoload'    => true,
+				],
+				[
+					'id'          => 'enable_global',
+					'label'       => __('Enable Global Partner Listings', 'TouchPoint-WP'),
+					'description' => __(
+						'Import ministry partners from TouchPoint to list publicly.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox',
+					'default'     => '',
+					'autoload'    => true,
+				],
+				[
+					'id'          => 'enable_campuses',
+					'label'       => __('Enable Campuses', 'TouchPoint-WP'),
+					'description' => __(
+						"Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)",
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox',
+					'default'     => '',
+					'autoload'    => true,
+				],
+				[
+					'id'          => 'system_name',
+					'label'       => __('Display Name', 'TouchPoint-WP'),
+					'description' => __(
+						'What your church calls your TouchPoint database.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'text',
+					'default'     => 'TouchPoint',
+					'placeholder' => 'TouchPoint'
+				],
+				[
+					'id'          => 'host',
+					'label'       => __('TouchPoint Host Name', 'TouchPoint-WP'),
+					'description' => __(
+						'The domain for your TouchPoint database, without the https or any slashes.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'text',
+					'default'     => '',
+					'autoload'    => true,
 					'placeholder' => 'mychurch.tpsdb.com',
 					'callback'    => [$this, 'validation_lowercase']
 				],
@@ -348,7 +348,7 @@ private function settingsFields($includeDetail = false): array
 					'type'        => 'text',
 					'default'     => '',
 					'autoload'    => true,
-                    'placeholder' => '',
+					'placeholder' => '',
 				],
 				[
 					'id'          => 'api_pass',
@@ -359,7 +359,7 @@ private function settingsFields($includeDetail = false): array
 					),
 					'type'        => 'text_secret',
 					'default'     => '',
-                    'autoload'    => true,
+					'autoload'    => true,
 					'placeholder' => $this->passwordPlaceholder('api_pass'),
 					'callback'    => fn($new) => $this->validation_secret($new, 'api_pass')
 				],
@@ -372,7 +372,7 @@ private function settingsFields($includeDetail = false): array
 					),
 					'type'        => 'text',
 					'default'     => 'WebApi',
-                    'autoload'    => true,
+					'autoload'    => true,
 					'placeholder' => '',
 				],
 				[
@@ -384,7 +384,7 @@ private function settingsFields($includeDetail = false): array
 					),
 					'type'        => 'text',
 					'default'     => '',
-                    'autoload'    => true,
+					'autoload'    => true,
 					'placeholder' => '',
 				],
 				[
@@ -403,8 +403,8 @@ private function settingsFields($includeDetail = false): array
 
 		// Add Script generation section if necessary settings are established.
 		if ($includeDetail
-            && $this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
-		    && $this->hasValidApiSettings()) {
+			&& $this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
+			&& $this->hasValidApiSettings()) {
 			/** @noinspection HtmlUnknownTarget */
 			$this->settings['basic']['fields'][] = [
 				'id'          => 'generate-scripts',
@@ -483,7 +483,7 @@ private function settingsFields($includeDetail = false): array
 		}
 
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_authentication') === "on") { // TODO MULTI
-//            $includeThis = $includeDetail === true || $includeDetail === 'authentication';
+//			$includeThis = $includeDetail === true || $includeDetail === 'authentication';
 			$this->settings['authentication'] = [
 				'title'       => __('Authentication', 'TouchPoint-WP'),
 				'description' => __('Allow users to log into WordPress using TouchPoint.', 'TouchPoint-WP'),
@@ -551,7 +551,7 @@ private function settingsFields($includeDetail = false): array
 						'label'       => __('Involvement Post Types', 'TouchPoint-WP'),
 						'default'     => '[]',
 						'autoload'    => true,
-                        'hidden'      => true,
+						'hidden'      => true,
 						'description' => ! $includeThis ? "" : function () {
 							TouchPointWP::requireScript("base");
 							TouchPointWP::requireScript("knockout-defer");
@@ -635,7 +635,7 @@ private function settingsFields($includeDetail = false): array
 						'type'        => 'text',
 						'default'     => 'partners',
 						'autoload'    => true,
-                        'placeholder' => 'partners',
+						'placeholder' => 'partners',
 						'callback'    => fn($new) => $this->validation_slug($new, 'global_slug')
 					],
 					[
@@ -726,7 +726,7 @@ private function settingsFields($includeDetail = false): array
 						'type'        => 'select',
 						'options'     => $includeThis ? $this->parent->getFamilyEvFieldsAsKVArray('code', true) : [],
 						'default'     => "",
-                        'autoload'    => true,
+						'autoload'    => true,
 					],
 				],
 			];
@@ -747,14 +747,14 @@ private function settingsFields($includeDetail = false): array
 							'<input type="url" value="{apiUrl}" readonly style="width: 100%;" />' .
 							'<a href="{previewUrl}" class="btn">' . __('Preview', 'TouchPoint-WP') . '</a>',
 							[
-								'{apiUrl}'     => get_site_url() . "/" .
-								                  TouchPointWP::API_ENDPOINT . "/" .
-								                  TouchPointWP::API_ENDPOINT_APP_EVENTS . "?v=" .
-								                  TouchPointWP::VERSION,
+								'{apiUrl}'	   => get_site_url() . "/" .
+												  TouchPointWP::API_ENDPOINT . "/" .
+												  TouchPointWP::API_ENDPOINT_APP_EVENTS . "?v=" .
+												  TouchPointWP::VERSION,
 								'{previewUrl}' => get_site_url() . "/" .
-								                  TouchPointWP::API_ENDPOINT . "/" .
-								                  TouchPointWP::API_ENDPOINT_APP_EVENTS . "/preview/?v=" .
-								                  TouchPointWP::VERSION
+												  TouchPointWP::API_ENDPOINT . "/" .
+												  TouchPointWP::API_ENDPOINT_APP_EVENTS . "/preview/?v=" .
+												  TouchPointWP::VERSION
 							]
 						),
 					],
@@ -823,22 +823,22 @@ private function settingsFields($includeDetail = false): array
 			],
 		];
 
-        $includeThis = $includeDetail === true || $includeDetail === 'divisions';
-        $this->settings['divisions'] = [
-            'title'       => __('Divisions', 'TouchPoint-WP'),
-            'description' => __('Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.', 'TouchPoint-WP'),
-            'fields'      => [
-                [
-                    'id'          => 'dv_name_plural',
-                    'label'       => __('Division Name (Plural)', 'TouchPoint-WP'),
-                    'description' => __(
-                        'What you call Divisions at your church',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'text',
-                    'default'     => 'Divisions',
-                    'autoload'    => true,
-                    'placeholder' => 'Divisions'
+		$includeThis = $includeDetail === true || $includeDetail === 'divisions';
+		$this->settings['divisions'] = [
+			'title'       => __('Divisions', 'TouchPoint-WP'),
+			'description' => __('Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.', 'TouchPoint-WP'),
+			'fields'      => [
+				[
+					'id'          => 'dv_name_plural',
+					'label'       => __('Division Name (Plural)', 'TouchPoint-WP'),
+					'description' => __(
+						'What you call Divisions at your church',
+						'TouchPoint-WP'
+					),
+					'type'        => 'text',
+					'default'     => 'Divisions',
+					'autoload'    => true,
+					'placeholder' => 'Divisions'
 				],
 				[
 					'id'          => 'dv_name_singular',
@@ -850,18 +850,18 @@ private function settingsFields($includeDetail = false): array
 					'type'        => 'text',
 					'default'     => 'Division',
 					'autoload'    => true,
-                    'placeholder' => 'Division'
-                ],
-                [
-                    'id'          => 'dv_slug',
-                    'label'       => __('Division Slug', 'TouchPoint-WP'),
-                    'description' => __(
-                        'The root path for the Division Taxonomy',
-                        'TouchPoint-WP'
-                    ),
-                    'type'        => 'text',
-                    'default'     => 'div',
-                    'autoload'    => true,
+					'placeholder' => 'Division'
+				],
+				[
+					'id'          => 'dv_slug',
+					'label'       => __('Division Slug', 'TouchPoint-WP'),
+					'description' => __(
+						'The root path for the Division Taxonomy',
+						'TouchPoint-WP'
+					),
+					'type'        => 'text',
+					'default'     => 'div',
+					'autoload'    => true,
 					'placeholder' => 'div',
 					'callback'    => fn($new) => $this->validation_slug($new, 'dv_slug')
 				],
@@ -922,7 +922,7 @@ private function settingsFields($includeDetail = false): array
 						'type'        => 'text',
 						'default'     => 'Campuses',
 						'autoload'    => true,
-                        'placeholder' => 'Campuses'
+						'placeholder' => 'Campuses'
 					],
 					[
 						'id'          => 'camp_name_singular',
@@ -934,7 +934,7 @@ private function settingsFields($includeDetail = false): array
 						'type'        => 'text',
 						'default'     => 'Campus',
 						'autoload'    => true,
-                        'placeholder' => 'Campus'
+						'placeholder' => 'Campus'
 					],
 					[
 						'id'          => 'camp_slug',
@@ -945,7 +945,7 @@ private function settingsFields($includeDetail = false): array
 						),
 						'type'        => 'text',
 						'default'     => 'campus',
-                        'autoload'    => true,
+						'autoload'    => true,
 						'placeholder' => 'campus',
 						'callback'    => fn($new) => $this->validation_slug($new, 'camp_slug')
 					]
@@ -967,7 +967,7 @@ private function settingsFields($includeDetail = false): array
 					'type'        => 'text',
 					'default'     => 'Resident Codes',
 					'autoload'    => true,
-                    'placeholder' => 'Resident Codes'
+					'placeholder' => 'Resident Codes'
 				],
 				[
 					'id'          => 'rc_name_singular',
@@ -979,7 +979,7 @@ private function settingsFields($includeDetail = false): array
 					'type'        => 'text',
 					'default'     => 'Resident Code',
 					'autoload'    => true,
-                    'placeholder' => 'Resident Code'
+					'placeholder' => 'Resident Code'
 				],
 				[
 					'id'          => 'rc_slug',
@@ -990,7 +990,7 @@ private function settingsFields($includeDetail = false): array
 					),
 					'type'        => 'text',
 					'default'     => 'rescodes',
-                    'autoload'    => true,
+					'autoload'    => true,
 					'placeholder' => 'rescodes',
 					'callback'    => fn($new) => $this->validation_slug($new, 'rc_slug')
 				]
@@ -1291,23 +1291,23 @@ protected function getWithoutDefault(string $what, $default = self::UNDEFINED_PL
 	 * @param string $what
 	 * @param mixed  $value
 	 * @param ?bool  $autoload
-     *
-     * @return false|mixed
-     */
-    public function set(string $what, $value, ?bool $autoload = null): bool
-    {
-        if ($autoload === null) {
-            $autoload = $this->settingShouldBeAutoLoaded($what);
-        }
+	 *
+	 * @return false|mixed
+	 */
+	public function set(string $what, $value, ?bool $autoload = null): bool
+	{
+		if ($autoload === null) {
+			$autoload = $this->settingShouldBeAutoLoaded($what);
+		}
 		return update_option(TouchPointWP::SETTINGS_PREFIX . $what, $value, $autoload); // TODO MULTI
 	}
 
-    /**
-     * Migrate settings from version to version.  This may be called even when a migration isn't necessary.
-     */
-    public function migrate(): void
-    {
-        global $wpdb;
+	/**
+	 * Migrate settings from version to version.  This may be called even when a migration isn't necessary.
+	 */
+	public function migrate(): void
+	{
+		global $wpdb;
 
 		try {
 			$this->updateDeployedScripts();
@@ -1363,7 +1363,7 @@ public function migrate(): void
 			// Remove the old settings
 			foreach (wp_load_alloptions() as $option => $value) {
 				if (strpos($option, TouchPointWP::SETTINGS_PREFIX . 'sg_') === 0 ||
-				    strpos($option, TouchPointWP::SETTINGS_PREFIX . 'cs_') === 0) {
+					strpos($option, TouchPointWP::SETTINGS_PREFIX . 'cs_') === 0) {
 					delete_option($option); // TODO MULTI
 				}
 			}
@@ -1431,8 +1431,8 @@ public function migrate(): void
 		}
 
 
-        // 0.0.31 - Add lookup IDs to ResCodes
-        TouchPointWP::$forceTermLookupIdUpdate = true;
+		// 0.0.31 - Add lookup IDs to ResCodes
+		TouchPointWP::$forceTermLookupIdUpdate = true;
 
 
 		// Update version string
@@ -1512,8 +1512,8 @@ public function registerSettings(): void
 					};
 				}
 
-                $option_name = TouchPointWP::SETTINGS_PREFIX . $field['id'];
-                register_setting($this->parent::TOKEN . '_Settings', $option_name, $args);
+				$option_name = TouchPointWP::SETTINGS_PREFIX . $field['id'];
+				register_setting($this->parent::TOKEN . '_Settings', $option_name, $args);
 
 				// Add field to page.
 				add_settings_field(
@@ -1545,7 +1545,7 @@ public function registerSettings(): void
 	 */
 	protected function getDefaultValueForSetting(string $id)
 	{
-        if (substr($id, 0, 7) === "enable") {
+		if (substr($id, 0, 7) === "enable") {
 			// Prevents settings content from needing to be generated for these settings.
 			return '';
 		}
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 27fcb3dc..df578c90 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -319,9 +319,9 @@ public static function hslToHex(int $h, int $s, int $l): string
 		};
 
 		return "#" .
-		       str_pad(dechex($f(0)), 2, 0, STR_PAD_LEFT) .
-		       str_pad(dechex($f(8)), 2, 0, STR_PAD_LEFT) .
-		       str_pad(dechex($f(4)), 2, 0, STR_PAD_LEFT);
+			   str_pad(dechex($f(0)), 2, 0, STR_PAD_LEFT) .
+			   str_pad(dechex($f(8)), 2, 0, STR_PAD_LEFT) .
+			   str_pad(dechex($f(4)), 2, 0, STR_PAD_LEFT);
 	}
 
 	/**
@@ -332,10 +332,10 @@ public static function hslToHex(int $h, int $s, int $l): string
 	 * @param int|null   $parent Optional. ID of parent term under which to confine the exists search.
 	 *
 	 * @return mixed Returns null if the term does not exist.
-	 *               Returns the term ID if no taxonomy is specified and the term ID exists.
-	 *               Returns an array of the term ID and the term taxonomy ID if the taxonomy is specified and the
-	 *                  pairing exists.
-	 *               Returns 0 if term ID 0 is passed to the function.
+	 *			   Returns the term ID if no taxonomy is specified and the term ID exists.
+	 *			   Returns an array of the term ID and the term taxonomy ID if the taxonomy is specified and the
+	 *				  pairing exists.
+	 *			   Returns 0 if term ID 0 is passed to the function.
 	 *
 	 * @see term_exists()
 	 */
@@ -423,10 +423,10 @@ public static function createGuid(): string
 		$hyphen = chr(45); // "-"
 
 		return substr($char, 0, 8) . $hyphen
-		       . substr($char, 8, 4) . $hyphen
-		       . substr($char, 12, 4) . $hyphen
-		       . substr($char, 16, 4) . $hyphen
-		       . substr($char, 20, 12);
+			   . substr($char, 8, 4) . $hyphen
+			   . substr($char, 12, 4) . $hyphen
+			   . substr($char, 16, 4) . $hyphen
+			   . substr($char, 20, 12);
 	}
 
 	/**
@@ -538,12 +538,12 @@ public static function standardizeHTags(int $maxAllowed, string $input): string
 
 			if ($o < 7) {
 				$input = str_ireplace(["<h$i ", "<h$i>", "</h$i>"],
-				                      ["<h$o ", "<h$o>", "</h$o>"],
-				                      $input);
+									  ["<h$o ", "<h$o>", "</h$o>"],
+									  $input);
 			} else {
 				$input = str_ireplace(["<h$i ", "<h$i>", "</h$i>"],
-				                      ["<p><strong ", "<p><strong>", "</strong></p>"],
-				                      $input);
+									  ["<p><strong ", "<p><strong>", "</strong></p>"],
+									  $input);
 			}
 		}
 
@@ -733,7 +733,7 @@ public static function getClientIp(): ?string
 	public static function validateRegistrantEmailAddress(string $nickname, string $emailAddress, string &$resultComment = null): bool {
 		// CleanTalk filter
 		if (file_exists(ABSPATH . '/wp-content/plugins/cleantalk-spam-protect/cleantalk.php')
-		    || function_exists('ct_test_registration')) {
+			|| function_exists('ct_test_registration')) {
 
 			if ( ! function_exists('ct_test_registration')) {
 				include_once(ABSPATH . '/wp-content/plugins/cleantalk-spam-protect/cleantalk.php');
@@ -767,7 +767,7 @@ public static function validateMessage(string $nickname, string $emailAddress, s
 	{
 		// CleanTalk filter
 		if (file_exists(ABSPATH . '/wp-content/plugins/cleantalk-spam-protect/cleantalk.php')
-		    || function_exists('ct_test_message')) {
+			|| function_exists('ct_test_message')) {
 
 			if ( ! function_exists('ct_test_message')) {
 				include_once(ABSPATH . '/wp-content/plugins/cleantalk-spam-protect/cleantalk.php');
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 4b606a89..c0f85331 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -29,35 +29,35 @@
 
 // die if called directly.
 if ( ! defined('WPINC')) {
-    die;
+	die;
 }
 
 define("TOUCHPOINT_COMPOSER_ENABLED", file_exists(__DIR__ . '/vendor/autoload.php'));
 
 /*** Load everything **/
 if (TOUCHPOINT_COMPOSER_ENABLED) {
-    /** @noinspection PhpIncludeInspection
-     *  @noinspection RedundantSuppression
-     */
-    require_once __DIR__ . '/vendor/autoload.php';
+	/** @noinspection PhpIncludeInspection
+	 *  @noinspection RedundantSuppression
+	 */
+	require_once __DIR__ . '/vendor/autoload.php';
 } else {
-    require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Exception.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_WPError.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Settings.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Exception.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_WPError.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Settings.php";
 
-    require_once __DIR__ . "/src/TouchPoint-WP/api.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/module.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Cleanup.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Geo.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/geo.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/api.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/module.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Cleanup.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Geo.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/geo.php";
 
-    require_once __DIR__ . "/src/TouchPoint-WP/Person.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Involvement.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Location.php";
-    require_once __DIR__ . "/src/TouchPoint-WP/Report.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Person.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Involvement.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Location.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Report.php";
 }
 
 /*** Load (set action hooks, etc.) ***/

From 00cf250d016ebd46de983832e8aa4bc9bfdd7471 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 14 Oct 2023 00:14:47 -0400
Subject: [PATCH 031/423] - Moved Taxonomies to their own class. - A LOT of
 refactoring related to that. - Resolves an issue where unused or outdated
 terms never disappear - Finish adding ability to apply ResCode and Division
 taxonomy to other post types. Closes #155

---
 .idea/misc.xml                              |   1 -
 src/TouchPoint-WP/Involvement.php           |  58 +-
 src/TouchPoint-WP/Meeting.php               |   2 +
 src/TouchPoint-WP/Partner.php               |  32 +-
 src/TouchPoint-WP/Person.php                |   8 +-
 src/TouchPoint-WP/Taxonomies.php            | 904 ++++++++++++++++++++
 src/TouchPoint-WP/TouchPointWP.php          | 642 +-------------
 src/TouchPoint-WP/TouchPointWP_Settings.php |  77 +-
 src/TouchPoint-WP/Utilities.php             |  98 +--
 src/templates/admin/invKoForm.php           |   4 +-
 touchpoint-wp.php                           |   1 +
 11 files changed, 1058 insertions(+), 769 deletions(-)
 create mode 100644 src/TouchPoint-WP/Taxonomies.php

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 60dd7bab..4c167176 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Black">
     <option name="sdkName" value="Python 3.10 (TouchPointScripts)" />
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 2cf84ca1..592639b0 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -148,16 +148,16 @@ protected function __construct(object $object)
 		}
 
 		$postTerms = [
-			TouchPointWP::TAX_RESCODE,
-			TouchPointWP::TAX_AGEGROUP,
-			TouchPointWP::TAX_WEEKDAY,
-			TouchPointWP::TAX_TENSE,
-			TouchPointWP::TAX_DAYTIME,
-			TouchPointWP::TAX_INV_MARITAL,
-			TouchPointWP::TAX_DIV
+			Taxonomies::TAX_RESCODE,
+			Taxonomies::TAX_AGEGROUP,
+			Taxonomies::TAX_WEEKDAY,
+			Taxonomies::TAX_TENSE,
+			Taxonomies::TAX_DAYTIME,
+			Taxonomies::TAX_INV_MARITAL,
+			Taxonomies::TAX_DIV
 		];
 		if (TouchPointWP::instance()->settings->enable_campuses === "on") {
-			$postTerms[] = TouchPointWP::TAX_CAMPUS;
+			$postTerms[] = Taxonomies::TAX_CAMPUS;
 		}
 
 		$terms = wp_get_post_terms(
@@ -810,7 +810,7 @@ public function getDivisionsStrings(): array
 				];
 			}
 
-			$this->divisions = wp_get_post_terms($this->post_id, TouchPointWP::TAX_DIV, ['meta_query' => $mq]);
+			$this->divisions = wp_get_post_terms($this->post_id, Taxonomies::TAX_DIV, ['meta_query' => $mq]);
 		}
 
 		$out = [];
@@ -1060,7 +1060,7 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 			}
 			if (count($divs) > 0) {
 				$taxQuery[] = [
-					'taxonomy' => TouchPointWP::TAX_DIV,
+					'taxonomy' => Taxonomies::TAX_DIV,
 					'field'    => 'ID',
 					'terms'    => $divs
 				];
@@ -1344,7 +1344,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			}
 			$dvName = TouchPointWP::instance()->settings->dv_name_singular;
 			$dvList = get_terms([
-									'taxonomy'                              => TouchPointWP::TAX_DIV,
+									'taxonomy'                              => Taxonomies::TAX_DIV,
 									'hide_empty'                            => true,
 									'meta_query'                            => $mq,
 									TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
@@ -1392,7 +1392,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			$rcName = TouchPointWP::instance()->settings->rc_name_singular;
 			$rcList = get_terms(
 				[
-					'taxonomy'                              => TouchPointWP::TAX_RESCODE,
+					'taxonomy'                              => Taxonomies::TAX_RESCODE,
 					'hide_empty'                            => true,
 					TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
 				]
@@ -1419,7 +1419,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			}
 			$cList = get_terms(
 				[
-					'taxonomy'                              => TouchPointWP::TAX_CAMPUS,
+					'taxonomy'                              => Taxonomies::TAX_CAMPUS,
 					'hide_empty'                            => true,
 					TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
 				]
@@ -1443,7 +1443,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			$wdName = __("Weekday", 'TouchPoint-WP');
 			$wdList = get_terms(
 				[
-					'taxonomy'                              => TouchPointWP::TAX_WEEKDAY,
+					'taxonomy'                              => Taxonomies::TAX_WEEKDAY,
 					'hide_empty'                            => true,
 					'orderby'                               => 'id',
 					TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
@@ -1469,7 +1469,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			$todName = __("Time of Day", 'TouchPoint-WP');
 			$todList = get_terms(
 				[
-					'taxonomy'                              => TouchPointWP::TAX_DAYTIME,
+					'taxonomy'                              => Taxonomies::TAX_DAYTIME,
 					'hide_empty'                            => true,
 					'orderby'                               => 'id',
 					TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
@@ -1503,7 +1503,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 		if (in_array('agegroup', $filters)) {
 			$agName = __("Age", 'TouchPoint-WP');
 			$agList = get_terms([
-									'taxonomy'                              => TouchPointWP::TAX_AGEGROUP,
+									'taxonomy'                              => Taxonomies::TAX_AGEGROUP,
 									'hide_empty'                            => true,
 									'orderby'                               => 't.id',
 									TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
@@ -2384,7 +2384,7 @@ final protected static function updateInvolvementPostsForType(
 			}
 
 			// Start and end dates
-			$tense = TouchPointWP::TAX_TENSE_PRESENT;
+			$tense = Taxonomies::TAX_TENSE_PRESENT;
 			if ($inv->firstMeeting !== null && $inv->firstMeeting < $now) { // First meeting already happened.
 				$inv->firstMeeting = null; // We don't need to list info from the past.
 			}
@@ -2409,10 +2409,10 @@ final protected static function updateInvolvementPostsForType(
 
 			// Tense
 			if ($inv->firstMeeting !== null) {
-				$tense = TouchPointWP::TAX_TENSE_FUTURE;
+				$tense = Taxonomies::TAX_TENSE_FUTURE;
 			}
 			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, [$tense], TouchPointWP::TAX_TENSE, false);
+			wp_set_post_terms($post->ID, [$tense], Taxonomies::TAX_TENSE, false);
 
 			// Update meetings and schedules
 			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "meetings", $inv->meetings);
@@ -2424,11 +2424,11 @@ final protected static function updateInvolvementPostsForType(
 				$dayTerms[] = Utilities::getDayOfWeekShortForNumber_noI18n(intval($k[1]));
 			}
 			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $dayTerms, TouchPointWP::TAX_WEEKDAY, false);
+			wp_set_post_terms($post->ID, $dayTerms, Taxonomies::TAX_WEEKDAY, false);
 
 			// Time of day taxonomy
 			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $timeTerms, TouchPointWP::TAX_DAYTIME, false);
+			wp_set_post_terms($post->ID, $timeTerms, Taxonomies::TAX_DAYTIME, false);
 
 
 			////////////////
@@ -2456,10 +2456,10 @@ final protected static function updateInvolvementPostsForType(
 				// Handle Resident Code
 				if (property_exists($inv, "resCodeName") && $inv->resCodeName !== null) {
 					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [$inv->resCodeName], TouchPointWP::TAX_RESCODE, false);
+					wp_set_post_terms($post->ID, [$inv->resCodeName], Taxonomies::TAX_RESCODE, false);
 				} else {
 					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [], TouchPointWP::TAX_RESCODE, false);
+					wp_set_post_terms($post->ID, [], Taxonomies::TAX_RESCODE, false);
 				}
 			}
 
@@ -2471,10 +2471,10 @@ final protected static function updateInvolvementPostsForType(
 			if (TouchPointWP::instance()->settings->enable_campuses === "on") {
 				if (property_exists($inv, "campusName") && $inv->campusName !== null) {
 					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [$inv->campusName], TouchPointWP::TAX_CAMPUS, false);
+					wp_set_post_terms($post->ID, [$inv->campusName], Taxonomies::TAX_CAMPUS, false);
 				} else {
 					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [], TouchPointWP::TAX_CAMPUS, false);
+					wp_set_post_terms($post->ID, [], Taxonomies::TAX_CAMPUS, false);
 				}
 			}
 
@@ -2494,15 +2494,15 @@ final protected static function updateInvolvementPostsForType(
 				}
 			}
 			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $maritalTax, TouchPointWP::TAX_INV_MARITAL, false);
+			wp_set_post_terms($post->ID, $maritalTax, Taxonomies::TAX_INV_MARITAL, false);
 
 			// Handle Age Groups
 			if ($inv->age_groups === null) {
 				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, [], TouchPointWP::TAX_AGEGROUP, false);
+				wp_set_post_terms($post->ID, [], Taxonomies::TAX_AGEGROUP, false);
 			} else {
 				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, $inv->age_groups, TouchPointWP::TAX_AGEGROUP, false);
+				wp_set_post_terms($post->ID, $inv->age_groups, Taxonomies::TAX_AGEGROUP, false);
 			}
 
 
@@ -2521,7 +2521,7 @@ final protected static function updateInvolvementPostsForType(
 				}
 			}
 			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $divs, TouchPointWP::TAX_DIV, false);
+			wp_set_post_terms($post->ID, $divs, Taxonomies::TAX_DIV, false);
 
 			if ($verbose) {
 				echo "<p>Division Terms:</p>";
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 83d8516c..5810a997 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -21,6 +21,8 @@
  */
 abstract class Meeting implements api, module
 {
+	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . "meeting";
+	
 	/**
 	 * Register scripts and styles to be used on display pages.
 	 */
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index e97d3ad8..43680789 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -121,7 +121,7 @@ protected function __construct(object $object)
 		$terms = wp_get_post_terms(
 			$this->post_id,
 			[
-				TouchPointWP::TAX_GP_CATEGORY
+				Taxonomies::TAX_GP_CATEGORY
 			]
 		);
 
@@ -148,7 +148,7 @@ protected function __construct(object $object)
 
 			// Primary category
 			if (TouchPointWP::instance()->settings->global_primary_tax !== "") {
-				$this->category = array_filter($terms, fn($t) => $t->taxonomy === TouchPointWP::TAX_GP_CATEGORY);
+				$this->category = array_filter($terms, fn($t) => $t->taxonomy === Taxonomies::TAX_GP_CATEGORY);
 			}
 		}
 
@@ -332,6 +332,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
 		$postsToKeep = [];
 		$count       = 0;
+		$termsToKeep = [];
 
 		foreach ($familyData->people as $f) {
 			/** @var object $f */
@@ -386,14 +387,15 @@ public static function updateFromTouchPoint(bool $verbose = false)
 			// Excerpt / Summary
 			$post->post_excerpt = self::getFamEvAsContent($summaryEv, $f, null);
 
-			// Partner Category
+			// Partner Category  This can't be moved to Taxonomy class because values aren't know.n.
 			if ($categoryEv !== '') {
 				$category = $f->familyEV->$categoryEv->value ?? null;
 				// Insert Term if new
-				if ($category !== null && ! Utilities::termExists($category, TouchPointWP::TAX_GP_CATEGORY)) {
-					Utilities::insertTerm(
+				$term = Taxonomies::termExists($category, Taxonomies::TAX_GP_CATEGORY);
+				if ($category !== null && ! $term) {
+					$term = Taxonomies::insertTerm(
 						$category,
-						TouchPointWP::TAX_GP_CATEGORY,
+						Taxonomies::TAX_GP_CATEGORY,
 						[
 							'description' => $category,
 							'slug'        => sanitize_title($category)
@@ -401,8 +403,11 @@ public static function updateFromTouchPoint(bool $verbose = false)
 					);
 					TouchPointWP::queueFlushRewriteRules();
 				}
-				// Apply term to post
-				wp_set_post_terms($post->ID, $category, TouchPointWP::TAX_GP_CATEGORY, false);
+				if ( !! $term && ! ! $term['term_id']) {
+					$termsToKeep[] = $term['term_id'];
+					// Apply term to post
+					wp_set_post_terms($post->ID, $term['term_id'], Taxonomies::TAX_GP_CATEGORY, false);
+				}
 			}
 
 			// Title & Slug
@@ -491,13 +496,18 @@ public static function updateFromTouchPoint(bool $verbose = false)
 				'post__not_in' => $postsToKeep
 			]
 		);
-
 		foreach ($q->get_posts() as $post) {
 			set_time_limit(10);
 			wp_delete_post($post->ID, true);
 			$count++;
 		}
 
+		// Delete terms that are no longer used
+		$terms = get_terms(['taxonomy' => Taxonomies::TAX_GP_CATEGORY, 'hide_empty' => false, 'exclude' => $termsToKeep]);
+		foreach ($terms as $term) {
+			wp_delete_term($term->term_id, Taxonomies::TAX_GP_CATEGORY);
+		}
+
 		if ($count !== 0) {
 			TouchPointWP::instance()->settings->set('global_cron_last_run', time());
 		}
@@ -752,12 +762,12 @@ protected static final function filterDropdownHtml($params = []): string
 		if (in_array('partner_category', $filters)
 		    && TouchPointWP::instance()->settings->global_primary_tax !== "") {
 
-			$tax     = get_taxonomy(TouchPointWP::TAX_GP_CATEGORY);
+			$tax     = get_taxonomy(Taxonomies::TAX_GP_CATEGORY);
 			$name    = substr($tax->name, strlen(TouchPointWP::SETTINGS_PREFIX));
 			$content .= "<select class=\"$class-filter\" data-partner-filter=\"$name\">";
 			$content .= "<option disabled selected>$tax->label</option>";
 			$content .= "<option value=\"\">$any</option>";
-			foreach (get_terms(TouchPointWP::TAX_GP_CATEGORY) as $t) {
+			foreach (get_terms(Taxonomies::TAX_GP_CATEGORY) as $t) {
 				$content .= "<option value=\"$t->slug\">$t->name</option>";
 			}
 			$content .= "</select>";
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index a26189d9..c6f9aa57 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -948,11 +948,11 @@ public static function updatePersonFromApiData($pData, bool $allowCreation, bool
 		$person->picture = $pData->Picture;
 
 		// resCodes and Campuses
-		$person->rescode_term_id = TouchPointWP::getTaxTermId(TouchPointWP::TAX_RESCODE, $pData->ResCode);
+		$person->rescode_term_id = Taxonomies::getTaxTermId(Taxonomies::TAX_RESCODE, $pData->ResCode);
 		if (TouchPointWP::instance()->settings->enable_campuses !== "on") {
 			$person->campus_term_id = null;
 		} else {
-			$person->campus_term_id = TouchPointWP::getTaxTermId(TouchPointWP::TAX_CAMPUS, $pData->CampusId);
+			$person->campus_term_id = Taxonomies::getTaxTermId(Taxonomies::TAX_CAMPUS, $pData->CampusId);
 		}
 
 		// Deliberately do not update usernames or passwords, as those could be set by any number of places for any number of reasons.
@@ -1135,7 +1135,7 @@ protected function campus(): ?WP_Term
 			if ($this->campus_term_id === null) {
 				$this->_campus = null;
 			} else {
-				$this->_campus = WP_Term::get_instance($this->campus_term_id, TouchPointWP::TAX_CAMPUS);
+				$this->_campus = WP_Term::get_instance($this->campus_term_id, Taxonomies::TAX_CAMPUS);
 			}
 			$this->_campusLoaded = true;
 		}
@@ -1154,7 +1154,7 @@ protected function resCode(): ?WP_Term
 			if ($this->rescode_term_id === null) {
 				$this->_resCode = null;
 			} else {
-				$this->_resCode = WP_Term::get_instance($this->rescode_term_id, TouchPointWP::TAX_RESCODE);
+				$this->_resCode = WP_Term::get_instance($this->rescode_term_id, Taxonomies::TAX_RESCODE);
 			}
 			$this->_resCodeLoaded = true;
 		}
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
new file mode 100644
index 00000000..ea5097bb
--- /dev/null
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -0,0 +1,904 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use WP_Error;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+/**
+ * Everything related to the plugin's Taxonomies.
+ */
+abstract class Taxonomies
+{
+	public const TAX_TENSE_PRESENT = "present";
+	public const TAX_INV_MARITAL = TouchPointWP::HOOK_PREFIX . "inv_marital";
+	public const TAX_TENSE_PAST = "past";
+	public const TAX_DIV = TouchPointWP::HOOK_PREFIX . "div";
+	public const TAX_AGEGROUP = TouchPointWP::HOOK_PREFIX . "agegroup";
+	public const TAX_RESCODE = TouchPointWP::HOOK_PREFIX . "rescode";
+	public const TAX_CAMPUS = TouchPointWP::HOOK_PREFIX . "campus";
+	public const TAX_GP_CATEGORY = TouchPointWP::HOOK_PREFIX . "partner_category";
+	public const TAX_WEEKDAY = TouchPointWP::HOOK_PREFIX . "weekday";
+	public const TAX_TENSE_FUTURE = "future";
+	public const TAX_DAYTIME = TouchPointWP::HOOK_PREFIX . "timeOfDay";
+	public const TAX_TENSE = TouchPointWP::HOOK_PREFIX . "tense";
+	public const TAXMETA_LOOKUP_ID = TouchPointWP::HOOK_PREFIX . "lookup_id";
+
+
+	public static bool $forceTermLookupIdUpdate = false;
+	private static array $termExistsCache = [];
+
+	/**
+	 * Create the label strings for taxonomies, just in case they ever become visible to the user.
+	 *
+	 * @param string $singular
+	 * @param string $plural
+	 *
+	 * @return array
+	 */
+	protected static function getLabels(string $singular, string $plural): array
+	{
+		return [
+			'name'          => $singular,
+			'singular_name' => $plural,
+			/* translators: %s: taxonomy name, plural */
+			'search_items'  => sprintf(__('Search %s', 'TouchPoint-WP'), $plural),
+			/* translators: %s: taxonomy name, plural */
+			'all_items'     => sprintf(__('All %s', 'TouchPoint-WP'), $plural),
+			/* translators: %s: taxonomy name, singular */
+			'edit_item'     => sprintf(__('Edit %s', 'TouchPoint-WP'), $singular),
+			/* translators: %s: taxonomy name, singular */
+			'update_item'   => sprintf(__('Update %s', 'TouchPoint-WP'), $singular),
+			/* translators: %s: taxonomy name, singular */
+			'add_new_item'  => sprintf(__('Add New %s', 'TouchPoint-WP'), $singular),
+			/* translators: %s: taxonomy name, singular */
+			'new_item_name' => sprintf(__('New %s', 'TouchPoint-WP'), $singular),
+			'menu_name'     => $plural
+		];
+	}
+
+	/**
+	 * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.  Also
+	 * removes any items that are no longer present in the list.
+	 *
+	 * @param string[] $list where the slug is the key and the name is the value.
+	 * @param string   $taxonomy
+	 * @param bool     $forceIdUpdate
+	 *
+	 * @return void
+	 */
+	public static function insertTermsForArrayBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+	{
+		$existingIds = [];
+		foreach ($list as $slug => $name) {
+			// In addition to making sure term exists, make sure it has the correct meta id, too.
+			$term = self::termExists($name, $taxonomy);
+			$idUpdate = $forceIdUpdate;
+			if ( ! $term) {
+				$term = self::insertTerm(
+					$name,
+					$taxonomy,
+					[
+						'description' => $name,
+						'slug'        => $slug
+					]
+				);
+				if (is_wp_error($term)) {
+					new TouchPointWP_WPError($term);
+					$term = null;
+				}
+				if ($idUpdate) {
+					TouchPointWP::queueFlushRewriteRules();
+				}
+			}
+			if ( ! ! $term) {
+				$existingIds[] = $term['term_id'];
+			}
+		}
+
+		// Delete any terms that are no longer current.
+		$terms = get_terms(['taxonomy' => $taxonomy, 'hide_empty' => false, 'exclude' => $existingIds]);
+		foreach ($terms as $term) {
+			wp_delete_term($term->term_id, $taxonomy);
+		}
+	}
+
+	/**
+	 * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.  Also
+	 * removes any items that are no longer present in the list.
+	 *
+	 * @param object[] $list
+	 * @param string   $taxonomy
+	 * @param bool     $forceIdUpdate
+	 *
+	 * @return void
+	 */
+	public static function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+	{
+		$existingIds = [];
+		foreach ($list as $i) {
+			if ($i->name === null) {
+				continue;
+			}
+			// In addition to making sure term exists, make sure it has the correct meta id, too.
+			$term = self::termExists($i->name, $taxonomy);
+			$idUpdate = $forceIdUpdate;
+			if ( ! $term) {
+				$term = self::insertTerm(
+					$i->name,
+					$taxonomy,
+					[
+						'description' => $i->name,
+						'slug'        => sanitize_title($i->name)
+					]
+				);
+				if (is_wp_error($term)) {
+					new TouchPointWP_WPError($term);
+					$term = null;
+				}
+				$idUpdate = true;
+			}
+			// Update the term meta if term is new, or if id update is forced.
+			if ($term !== null && isset($term['term_id']) && $idUpdate) {
+				update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
+			}
+			if ($idUpdate) {
+				TouchPointWP::queueFlushRewriteRules();
+			}
+			if ( ! ! $term) {
+				$existingIds[] = $term['term_id'];
+			}
+		}
+
+		// Delete any terms that are no longer current.
+		$terms = get_terms(['taxonomy' => $taxonomy, 'hide_empty' => false, 'exclude' => $existingIds]);
+		foreach ($terms as $term) {
+			wp_delete_term($term->term_id, $taxonomy);
+		}
+	}
+
+	/**
+	 * Get the term id for a given taxonomy and value.
+	 *
+	 * @param $taxonomy string Taxonomy name
+	 * @param $value int|string The Lookup ID or name or slug of the term.
+	 *
+	 * @return ?int
+	 *
+	 * @since 0.0.32
+	 */
+	public static function getTaxTermId(string $taxonomy, $value): ?int
+	{
+		$args = [
+			'taxonomy'   => $taxonomy,
+			'hide_empty' => false,
+			'fields'     => 'ids'
+		];
+
+		if (is_numeric($value)) {
+			// by lookup id
+			$args['meta_key']   = self::TAXMETA_LOOKUP_ID;
+			$args['meta_value'] = $value;
+		} else {
+			// by name
+			$args['name'] = $value;
+			$t            = get_terms($args);
+			if (count($t) > 0) {
+				return $t[0];
+			}
+
+			// by slug
+			unset($args['name']);
+			$args['slug'] = $value;
+		}
+		$t = get_terms($args);
+		if (count($t) > 0) {
+			return $t[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Filter to add a tp_post_type option to get_terms that takes either a string of one post type or an array of post
+	 * types.
+	 *
+	 * @param $clauses
+	 * @param $taxonomy
+	 * @param $args
+	 *
+	 * Hat tip https://dfactory.eu/wp-how-to-get-terms-post-type/
+	 *
+	 * @return mixed
+	 */
+	public static function getTermsClauses($clauses, $taxonomy, $args): array
+	{
+		if (isset($args[TouchPointWP::HOOK_PREFIX . 'post_type']) && ! empty($args[TouchPointWP::HOOK_PREFIX . 'post_type']) && $args['fields'] !== 'count') {
+			global $wpdb;
+
+			$post_types = [];
+
+			if (is_array($args[TouchPointWP::HOOK_PREFIX . 'post_type'])) {
+				foreach ($args[TouchPointWP::HOOK_PREFIX . 'post_type'] as $cpt) {
+					$post_types[] = "'" . $cpt . "'";
+				}
+			} else {
+				$post_types[] = "'" . $args[TouchPointWP::HOOK_PREFIX . 'post_type'] . "'";
+			}
+
+			if ( ! empty($post_types)) {
+				$clauses['fields'] = 'DISTINCT ' . str_replace(
+						'tt.*',
+						'tt.term_taxonomy_id, tt.taxonomy, tt.description, tt.parent',
+						$clauses['fields']
+					) . ', COUNT(p.post_type) AS count';
+				$clauses['join'] .= ' LEFT JOIN ' . $wpdb->term_relationships . ' AS r ON r.term_taxonomy_id = tt.term_taxonomy_id LEFT JOIN ' . $wpdb->posts . ' AS p ON p.ID = r.object_id';
+				$clauses['where'] .= ' AND (p.post_type IN (' . implode(
+						',',
+						$post_types
+					) . ') OR (tt.parent = 0 AND tt.count = 0))';
+				$clauses['orderby'] = 'GROUP BY t.term_id ' . $clauses['orderby'];
+			}
+		}
+
+		return $clauses;
+	}
+
+	/**
+	 * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
+	 * loaded.)
+	 *
+	 * @param TouchPointWP $instance
+	 *
+	 * @return void
+	 */
+	public static function insertTerms(TouchPointWP $instance)
+	{
+		// Resident Codes
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_RESCODE);
+		if (count($types) > 0) {
+			self::insertTermsForLookupBasedTaxonomy(
+				$instance->getResCodes(),
+				self::TAX_RESCODE,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Campuses
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_CAMPUS);
+		if (count($types) > 0) {
+			self::insertTermsForLookupBasedTaxonomy(
+				$instance->getCampuses(),
+				self::TAX_CAMPUS,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Age Groups
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_AGEGROUP);
+		if (count($types) > 0) {
+			$taxTerms = [
+				"20" => "20s",
+				"30" => "30s",
+				"40" => "40s",
+				"50" => "50s",
+				"60" => "60s",
+				"70" => "70+"
+			];
+			self::insertTermsForArrayBasedTaxonomy(
+				$taxTerms,
+				self::TAX_AGEGROUP,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Divisions: Involvements and Events
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_DIV);
+		if (count($types) > 0) {
+			$existingIds = [];
+			$enabledDivisions = $instance->settings->dv_divisions;
+			foreach ($instance->getDivisions() as $d) {
+				if (!in_array('div' . $d->id, $enabledDivisions)) {
+					continue;
+				}
+				if (!$d->pName || !$d->dName) {
+					continue;
+				}
+
+				// Program
+				$idUpdate = self::$forceTermLookupIdUpdate;
+				$pTermInfo = self::termExists($d->pName, self::TAX_DIV, 0);
+				if (! $pTermInfo) {
+					$pTermInfo = self::insertTerm(
+						$d->pName,
+						self::TAX_DIV,
+						[
+							'description' => $d->pName,
+							'slug'        => sanitize_title($d->pName)
+						]
+					);
+					$idUpdate = true;
+					if (is_wp_error($pTermInfo)) {
+						new TouchPointWP_WPError($pTermInfo);
+						$pTermInfo = null;
+						continue;
+					}
+				}
+				$proId = get_term_meta($pTermInfo['term_id'], TouchPointWP::SETTINGS_PREFIX . 'programId', true);
+				if ($idUpdate || $proId !== intval($d->proId)) {
+					update_term_meta(
+						$pTermInfo['term_id'],
+						TouchPointWP::SETTINGS_PREFIX . 'programId',
+						intval($d->proId)
+					);
+					TouchPointWP::queueFlushRewriteRules();
+				}
+				if ( !! $pTermInfo) {
+					$existingIds[] = $pTermInfo['term_id'];
+				}
+
+				// Division
+				$idUpdate = self::$forceTermLookupIdUpdate;
+				$dTermInfo = self::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
+				if (! $dTermInfo) {
+					$dTermInfo = self::insertTerm(
+						$d->dName,
+						self::TAX_DIV,
+						[
+							'description' => $d->dName,
+							'slug'        => sanitize_title($d->dName),
+							'parent'      => $pTermInfo['term_id']
+						]
+					);
+					$idUpdate = true;
+					if (is_wp_error($dTermInfo)) {
+						new TouchPointWP_WPError($dTermInfo);
+						$dTermInfo = null;
+						continue;
+					}
+				}
+				$divId = get_term_meta($dTermInfo['term_id'], TouchPointWP::SETTINGS_PREFIX . 'divId', true);
+				if ($idUpdate || $divId !== intval($d->id)) {
+					update_term_meta(
+						$dTermInfo['term_id'],
+						TouchPointWP::SETTINGS_PREFIX . 'divId',
+						intval($d->id)
+					);
+					TouchPointWP::queueFlushRewriteRules();
+				}
+				if ( !! $dTermInfo) {
+					$existingIds[] = $dTermInfo['term_id'];
+				}
+			}
+
+			// Delete any terms that are no longer current.
+			$terms = get_terms(['taxonomy' => self::TAX_DIV, 'hide_empty' => false, 'exclude' => $existingIds]);
+			foreach ($terms as $term) {
+				wp_delete_term($term->term_id, self::TAX_DIV);
+			}
+		}
+
+		// Weekdays
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_WEEKDAY);
+		if (count($types) > 0) {
+			// Weekdays
+			$days = [
+				'sun' => 'Sundays',
+				'mon' => 'Mondays',
+				'tue' => 'Tuesdays',
+				'wed' => 'Wednesdays',
+				'thu' => 'Thursdays',
+				'fri' => 'Fridays',
+				'sat' => 'Saturdays',
+			];
+			self::insertTermsForArrayBasedTaxonomy(
+				$days,
+				self::TAX_WEEKDAY,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Tenses
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_TENSE);
+		if (count($types) > 0) {
+			$tenses = [
+				self::TAX_TENSE_FUTURE  => 'Upcoming',
+				self::TAX_TENSE_PRESENT => 'Current',
+				self::TAX_TENSE_PAST    => 'Past',
+			];
+			self::insertTermsForArrayBasedTaxonomy(
+				$tenses,
+				self::TAX_TENSE,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Time of Day
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_DAYTIME);
+		if (count($types) > 0) {
+			// Time of Day
+			$timesOfDay = [
+				'latenight'    => 'Late Night',
+				'earlymorning' => 'Early Morning',
+				'morning'      => 'Morning',
+				'midday'       => 'Midday',
+				'afternoon'    => 'Afternoon',
+				'evening'      => 'Evening',
+				'night'        => 'Night'
+			];
+			self::insertTermsForArrayBasedTaxonomy(
+				$timesOfDay,
+				self::TAX_DAYTIME,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Marital Status
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_INV_MARITAL);
+		if (count($types) > 0) {
+			$maritalStatuses = [
+				'mostly_single'  => 'Mostly Single',
+				'mostly_married' => 'Mostly Married'
+			];
+			self::insertTermsForArrayBasedTaxonomy(
+				$maritalStatuses,
+				self::TAX_INV_MARITAL,
+				self::$forceTermLookupIdUpdate
+			);
+		}
+
+		// Partner categories can't be included here because the values are only known at sync.
+	}
+
+	/**
+	 * Wrapper for the WordPress term_exists function to reduce database calls
+	 *
+	 * @param int|string $term The term to check. Accepts term ID, slug, or name.
+	 * @param string     $taxonomy Optional. The taxonomy name to use.
+	 * @param int|null   $parent Optional. ID of parent term under which to confine the exists search.
+	 *
+	 * @return mixed Returns null if the term does not exist.
+	 *			   Returns the term ID if no taxonomy is specified and the term ID exists.
+	 *			   Returns an array of the term ID and the term taxonomy ID if the taxonomy is specified and the
+	 *				  pairing exists.
+	 *			   Returns 0 if term ID 0 is passed to the function.
+	 *
+	 * @see term_exists()
+	 */
+	public static function termExists($term, string $taxonomy = "", ?int $parent = null)
+	{
+		$key = $term . "|" . $taxonomy . "|" . $parent;
+		if ( ! array_key_exists($key, self::$termExistsCache)) {
+			self::$termExistsCache[$key] = term_exists($term, $taxonomy, $parent);
+		}
+
+		return self::$termExistsCache[$key];
+	}
+
+	/**
+	 * Wrapper for the WordPress wp_insert_term function to reduce database calls
+	 *
+	 * Add a new term to the database.
+	 *
+	 * A non-existent term is inserted in the following sequence:
+	 * 1. The term is added to the term table, then related to the taxonomy.
+	 * 2. If everything is correct, several actions are fired.
+	 * 3. The 'term_id_filter' is evaluated.
+	 * 4. The term cache is cleaned.
+	 * 5. Several more actions are fired.
+	 * 6. An array is returned containing the `term_id` and `term_taxonomy_id`.
+	 *
+	 * If the 'slug' argument is not empty, then it is checked to see if the term
+	 * is invalid. If it is not a valid, existing term, it is added and the term_id
+	 * is given.
+	 *
+	 * If the taxonomy is hierarchical, and the 'parent' argument is not empty,
+	 * the term is inserted and the term_id will be given.
+	 *
+	 * Error handling:
+	 * If `$taxonomy` does not exist or `$term` is empty,
+	 * a WP_Error object will be returned.
+	 *
+	 * If the term already exists on the same hierarchical level,
+	 * or the term slug and name are not unique, a WP_Error object will be returned.
+	 *
+	 * @param string       $term The term name to add.
+	 * @param string       $taxonomy The taxonomy to which to add the term.
+	 * @param array|string $args {
+	 *     Optional. Array or query string of arguments for inserting a term.
+	 *
+	 * @type string        $alias_of Slug of the term to make this term an alias of.
+	 *                               Default empty string. Accepts a term slug.
+	 * @type string        $description The term description. Default empty string.
+	 * @type int           $parent The id of the parent term. Default 0.
+	 * @type string        $slug The term slug to use. Default empty string.
+	 * }
+	 * @return array|WP_Error {
+	 *     An array of the new term data, WP_Error otherwise.
+	 *
+	 * @type int           $term_id The new term ID.
+	 * @type int|string    $term_taxonomy_id The new term taxonomy ID. Can be a numeric string.
+	 * }
+	 *
+	 * @see wp_insert_term()
+	 */
+	public static function insertTerm(string $term, string $taxonomy, $args = [])
+	{
+		$parent = $args['parent'] ?? null;
+		$key    = $term . "|" . $taxonomy . "|" . $parent;
+		$r      = wp_insert_term($term, $taxonomy, $args);
+		if ( ! is_wp_error($r)) {
+			self::$termExistsCache[$key] = $r;
+		}
+
+		return $r;
+	}
+
+	/**
+	 * @param TouchPointWP $instance
+	 * @param string       $taxonomy
+	 *
+	 * @return array
+	 */
+	protected static function getPostTypesForTaxonomy(TouchPointWP $instance, string $taxonomy): array
+	{
+		$types = [];
+
+		switch ($taxonomy) {
+			case self::TAX_RESCODE:
+				if ($instance->settings->enable_involvements === "on") {
+					$types = Involvement_PostTypeSettings::getPostTypesWithGeoEnabled();
+				}
+				if ($instance->settings->rc_additional_post_types) {
+					$types = array_merge(
+						$types,
+						$instance->settings->rc_additional_post_types
+					);
+				}
+				if ($instance->settings->enable_meeting_cal === "on") {
+					$types[] = Meeting::POST_TYPE;
+				}
+				$types[] = 'user';
+				return $types;
+
+			case self::TAX_CAMPUS:
+				if ($instance->settings->enable_campuses !== "on") {
+					return $types;
+				}
+				if ($instance->settings->enable_involvements === "on") {
+					$types = Involvement_PostTypeSettings::getPostTypes();
+				}
+				if ($instance->settings->enable_meeting_cal === "on") {
+					$types[] = Meeting::POST_TYPE;
+				}
+				$types[] = 'user';
+				return $types;
+
+			case self::TAX_DIV:
+				if ($instance->settings->enable_involvements === "on") {
+					$types = Involvement_PostTypeSettings::getPostTypes();
+				}
+				if ($instance->settings->enable_meeting_cal === "on") {
+					$types[] = Meeting::POST_TYPE;
+				}
+				if ($instance->settings->dv_additional_post_types) {
+					$types = array_merge(
+						$types,
+						$instance->settings->dv_additional_post_types
+					);
+				}
+				return $types;
+
+			case self::TAX_AGEGROUP:
+				if ($instance->settings->enable_involvements === "on") {
+					$types = Involvement_PostTypeSettings::getPostTypes();
+				}
+				$types[] = 'user';
+				return $types;
+
+			case self::TAX_WEEKDAY:
+			case self::TAX_TENSE:
+			case self::TAX_INV_MARITAL:
+				if ($instance->settings->enable_involvements === "on") {
+					$types = Involvement_PostTypeSettings::getPostTypes();
+				}
+				return $types;
+
+			case self::TAX_GP_CATEGORY:
+				if ($instance->settings->enable_involvements === "on"
+				    && class_exists('\tp\TouchPointWP\Partner', false)) {
+					return [\tp\TouchPointWP\Partner::POST_TYPE];
+				}
+
+		}
+
+		return $types;
+	}
+
+	/**
+	 * Register the taxonomies.
+	 *
+	 * @param TouchPointWP $instance
+	 *
+	 * @return void
+	 */
+	public static function registerTaxonomies(TouchPointWP $instance): void
+	{
+		// Resident Codes
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_RESCODE);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_RESCODE,
+				$types,
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __('Classify posts by their general locations.', 'TouchPoint-WP'),
+					'labels'            => self::getLabels(
+						$instance->settings->rc_name_singular,
+						$instance->settings->rc_name_plural
+					),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => true,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => $instance->settings->rc_slug,
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+		}
+
+		// Campuses
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_CAMPUS);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_CAMPUS,
+				$types,
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __('Classify posts by their church campus.', 'TouchPoint-WP'),
+					'labels'            =>  self::getLabels(
+						$instance->settings->camp_name_singular,
+						$instance->settings->camp_name_plural
+					),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => true,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => $instance->settings->camp_slug,
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+		}
+
+		// Divisions & Programs
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_DIV);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_DIV,
+				$types,
+				[
+					'hierarchical'      => true,
+					'show_ui'           => true,
+					/* translators: %s: taxonomy name, singular */
+					'description'       => sprintf(
+						__('Classify things by %s.', 'TouchPoint-WP'),
+						$instance->settings->dv_name_singular
+					),
+					'labels'            =>  self::getLabels(
+						$instance->settings->dv_name_singular,
+						$instance->settings->dv_name_plural
+					),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => false,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => $instance->settings->dv_slug,
+						'with_front'   => false,
+						'hierarchical' => true
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+		}
+
+		// Weekdays
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_WEEKDAY);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_WEEKDAY,
+				$types,
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __('Classify involvements by the day on which they meet.', 'TouchPoint-WP'),
+					'labels'            =>  self::getLabels(__('Weekday', 'TouchPoint-WP'), __('Weekdays', 'TouchPoint-WP')),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => true,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => 'weekday',
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+
+		}
+
+		// Tenses
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_TENSE);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_TENSE,
+				$types,
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __(
+						'Classify involvements by tense (present, future, past)',
+						'TouchPoint-WP'
+					),
+					'labels'            =>  self::getLabels(__("Tense", 'TouchPoint-WP'), __("Tenses", 'TouchPoint-WP')),
+					'public'            => true,
+					'show_in_rest'      => false,
+					'show_admin_column' => false,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => 'tense',
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+
+			// Time of Day
+			/** @noinspection SpellCheckingInspection */
+			register_taxonomy(
+				self::TAX_DAYTIME,
+				Involvement_PostTypeSettings::getPostTypes(),
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __(
+						'Classify involvements by the portion of the day in which they meet.',
+						'TouchPoint-WP'
+					),
+					'labels'            =>  self::getLabels(
+						__('Time of Day', 'TouchPoint-WP'),
+						__('Times of Day', 'TouchPoint-WP')
+					),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => true,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => 'timeofday',
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+		}
+
+		// Age Groups
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_AGEGROUP);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_AGEGROUP,
+				$types,
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __('Classify involvements and users by their age groups.', 'TouchPoint-WP'),
+					'labels'            => self::getLabels(
+						__('Age Group', 'TouchPoint-WP'),
+						__('Age Groups', 'TouchPoint-WP')
+					),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => true,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => self::TAX_AGEGROUP,
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+		}
+
+		// Involvement Marital Status
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_INV_MARITAL);
+		if (count($types) > 0) {
+			register_taxonomy(
+				self::TAX_INV_MARITAL,
+				$types,
+				[
+					'hierarchical'      => false,
+					'show_ui'           => false,
+					'description'       => __(
+						'Classify involvements by whether participants are mostly single or married.',
+						'TouchPoint-WP'
+					),
+					'labels'            =>  self::getLabels(
+						__('Marital Status', 'TouchPoint-WP'),
+						__('Marital Statuses', 'TouchPoint-WP')
+					),
+					'public'            => true,
+					'show_in_rest'      => true,
+					'show_admin_column' => true,
+
+					// Control the slugs used for this taxonomy
+					'rewrite'           => [
+						'slug'         => self::TAX_INV_MARITAL,
+						'with_front'   => false,
+						'hierarchical' => false
+					],
+				]
+			);
+			// Terms inserted via insertTerms method
+		}
+
+		// Global Partner Category
+		$types = self::getPostTypesForTaxonomy($instance, self::TAX_GP_CATEGORY);
+		if ($types > 0) {
+			$tax = $instance->settings->global_primary_tax;
+			if ($tax !== "" &&
+			    $instance->settings->enable_global === "on" &&
+			    count($instance->getFamilyEvFields([$tax])) > 0) {
+				$tax    = $instance->getFamilyEvFields([$tax])[0];
+				$plural = $tax->field . "s"; // TODO Sad, but works.  i18n someday.
+				register_taxonomy(
+					self::TAX_GP_CATEGORY,
+					$types,
+					[
+						'hierarchical'      => false,
+						'show_ui'           => false,
+						'description'       => __('Classify Partners by category chosen in settings.', 'TouchPoint-WP'),
+						'labels'            => self::getLabels($tax->field, $plural),
+						'public'            => true,
+						'show_in_rest'      => true,
+						'show_admin_column' => true,
+
+						// Control the slugs used for this taxonomy
+						'rewrite'           => [
+							'slug'         => self::TAX_GP_CATEGORY,
+							'with_front'   => false,
+							'hierarchical' => false
+						],
+					]
+				);
+				// Terms are inserted on sync.
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 80d53bf8..292ff181 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -6,15 +6,14 @@
 namespace tp\TouchPointWP;
 
 use stdClass;
+use tp\TouchPointWP\Utilities\Cleanup;
+use tp\TouchPointWP\Utilities\Http;
+use tp\TouchPointWP\Utilities\Session;
 use WP;
 use WP_Error;
 use WP_Http;
 use WP_Term;
 
-use tp\TouchPointWP\Utilities\Cleanup;
-use tp\TouchPointWP\Utilities\Session;
-use tp\TouchPointWP\Utilities\Http;
-
 
 if ( ! defined('ABSPATH')) {
 	exit;
@@ -81,20 +80,6 @@ class TouchPointWP
 	 */
 	public const SETTINGS_PREFIX = "tp_";
 
-	public const TAX_RESCODE = self::HOOK_PREFIX . "rescode";
-	public const TAX_CAMPUS = self::HOOK_PREFIX . "campus";
-	public const TAX_DIV = self::HOOK_PREFIX . "div";
-	public const TAX_WEEKDAY = self::HOOK_PREFIX . "weekday";
-	public const TAX_TENSE = self::HOOK_PREFIX . "tense";
-	public const TAX_TENSE_PAST = "past";
-	public const TAX_TENSE_PRESENT = "present";
-	public const TAX_TENSE_FUTURE = "future";
-	public const TAX_DAYTIME = self::HOOK_PREFIX . "timeOfDay";
-	public const TAX_AGEGROUP = self::HOOK_PREFIX . "agegroup";
-	public const TAX_INV_MARITAL = self::HOOK_PREFIX . "inv_marital";
-	public const TAX_GP_CATEGORY = self::HOOK_PREFIX . "partner_category";
-	public const TAXMETA_LOOKUP_ID = self::HOOK_PREFIX . "lookup_id";
-
 	/**
 	 * Table Names
 	 */
@@ -252,7 +237,7 @@ protected function __construct(string $file = '')
 		// Adds async and defer attributes to script tags.
 		add_filter('script_loader_tag', [$this, 'filterByTag'], 10, 2);
 
-		add_filter('terms_clauses', [$this, 'getTermsClauses'], 10, 3);
+		add_filter('terms_clauses', [Taxonomies::class, 'getTermsClauses'], 10, 3);
 
 		add_filter('site_transient_update_plugins', [Utilities::class, 'checkForUpdate_transient']);
 
@@ -284,7 +269,6 @@ public static function cronAdd15Minutes($schedules)
 	 * @param string|mixed $text The text to be modified. (should be a string, but this is WordPress, so maybe not.)
 	 *
 	 * @return string The modified text.
-	 * @noinspection SpellCheckingInspection
 	 * @since 0.0.23
 	 *
 	 */
@@ -523,45 +507,6 @@ public static function currentUserIsAdmin(): bool
 		return current_user_can('manage_options');
 	}
 
-	/**
-	 * Filter to add a tp_post_type option to get_terms that takes either a string of one post type or an array of post
-	 * types.
-	 *
-	 * @param $clauses
-	 * @param $taxonomy
-	 * @param $args
-	 *
-	 * Hat tip https://dfactory.eu/wp-how-to-get-terms-post-type/
-	 *
-	 * @return mixed
-	 * @noinspection PhpUnusedParameterInspection  WordPress API
-	 */
-	public function getTermsClauses($clauses, $taxonomy, $args): array
-	{
-		if (isset($args[self::HOOK_PREFIX . 'post_type']) && ! empty($args[self::HOOK_PREFIX . 'post_type']) && $args['fields'] !== 'count') {
-			global $wpdb;
-
-			$post_types = [];
-
-			if (is_array($args[self::HOOK_PREFIX . 'post_type'])) {
-				foreach ($args[self::HOOK_PREFIX . 'post_type'] as $cpt) {
-					$post_types[] = "'" . $cpt . "'";
-				}
-			} else {
-				$post_types[] = "'" . $args[self::HOOK_PREFIX . 'post_type'] . "'";
-			}
-
-			if ( ! empty($post_types)) {
-				$clauses['fields'] = 'DISTINCT ' . str_replace( 'tt.*', 'tt.term_taxonomy_id, tt.taxonomy, tt.description, tt.parent', $clauses['fields'] ) . ', COUNT(p.post_type) AS count';
-				$clauses['join']    .= ' LEFT JOIN ' . $wpdb->term_relationships . ' AS r ON r.term_taxonomy_id = tt.term_taxonomy_id LEFT JOIN ' . $wpdb->posts . ' AS p ON p.ID = r.object_id';
-				$clauses['where'] .= ' AND (p.post_type IN (' . implode( ',', $post_types ) . ') OR (tt.parent = 0 AND tt.count = 0))';
-				$clauses['orderby'] = 'GROUP BY t.term_id ' . $clauses['orderby'];
-			}
-		}
-
-		return $clauses;
-	}
-
 	/**
 	 * Print Dynamic Instantiation scripts.
 	 *
@@ -684,9 +629,9 @@ public function migrate($force = false): void
 		$this->createTables();
 
 		if (self::$_hasBeenInited) {
-			$this->insertTerms();
+			Taxonomies::insertTerms($this);
 		} else {
-			add_action(self::INIT_ACTION_HOOK, [$this, 'insertTerms']);
+			add_action(self::INIT_ACTION_HOOK, [Taxonomies::class, 'insertTerms']);
 		}
 
 		$this->settings->migrate();
@@ -786,7 +731,7 @@ public static function init(): void
 
 		self::instance()->loadLocalizations();
 
-		self::instance()->registerTaxonomies();
+		Taxonomies::registerTaxonomies(self::instance());
 
 		// If any slugs have changed, flush.  Only executes if already enqueued.
 		self::instance()->flushRewriteRules(false);
@@ -1209,575 +1154,6 @@ protected function getIpData(string $ip, bool $useApi = true)
 		return $return;
 	}
 
-	/**
-	 * Get the term id for a given taxonomy and value.
-	 *
-	 * @param $taxonomy string Taxonomy name
-	 * @param $value int|string The Lookup ID or name or slug of the term.
-	 *
-	 * @return ?int
-	 *
-	 * @since 0.0.32
-	 */
-	public static function getTaxTermId(string $taxonomy, $value): ?int
-	{
-		$args = [
-			'taxonomy'   => $taxonomy,
-			'hide_empty' => false,
-			'fields'     => 'ids'
-		];
-
-		if (is_numeric($value)) {
-			// by lookup id
-			$args['meta_key']   = self::TAXMETA_LOOKUP_ID;
-			$args['meta_value'] = $value;
-		} else {
-			// by name
-			$args['name'] = $value;
-			$t            = get_terms($args);
-			if (count($t) > 0) {
-				return $t[0];
-			}
-
-			// by slug
-			unset($args['name']);
-			$args['slug'] = $value;
-		}
-		$t = get_terms($args);
-		if (count($t) > 0) {
-			return $t[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Register the taxonomies.
-	 *
-	 * @return void
-	 */
-	public function registerTaxonomies(): void
-	{
-		/**
-		 * Create the label strings for taxonomies, just in case they ever become visible to the user.
-		 *
-		 * @param string $singular
-		 * @param string $plural
-		 *
-		 * @return array
-		 */
-		function getLabels(string $singular, string $plural): array
-		{
-			return [
-				'name'          => $singular,
-				'singular_name' => $plural,
-				/* translators: %s: taxonomy name, plural */
-				'search_items'  => sprintf(__('Search %s', 'TouchPoint-WP'), $plural),
-				/* translators: %s: taxonomy name, plural */
-				'all_items'     => sprintf(__('All %s', 'TouchPoint-WP'), $plural),
-				/* translators: %s: taxonomy name, singular */
-				'edit_item'     => sprintf(__('Edit %s', 'TouchPoint-WP'), $singular),
-				/* translators: %s: taxonomy name, singular */
-				'update_item'   => sprintf(__('Update %s', 'TouchPoint-WP'), $singular),
-				/* translators: %s: taxonomy name, singular */
-				'add_new_item'  => sprintf(__('Add New %s', 'TouchPoint-WP'), $singular),
-				/* translators: %s: taxonomy name, singular */
-				'new_item_name' => sprintf(__('New %s', 'TouchPoint-WP'), $singular),
-				'menu_name'     => $plural
-			];
-		}
-
-		// Resident Codes
-		$resCodeTypesToApply = [];
-		if ($this->settings->enable_involvements === "on") {
-			$resCodeTypesToApply = Involvement_PostTypeSettings::getPostTypesWithGeoEnabled();
-		}
-		$resCodeTypesToApply[] = 'user';
-		register_taxonomy(
-			self::TAX_RESCODE,
-			$resCodeTypesToApply,
-			[
-				'hierarchical'      => false,
-				'show_ui'           => false,
-				'description'       => __('Classify posts by their general locations.', 'TouchPoint-WP'),
-				'labels'            => getLabels(
-					$this->settings->rc_name_singular,
-					$this->settings->rc_name_plural
-				),
-				'public'            => true,
-				'show_in_rest'      => true,
-				'show_admin_column' => true,
-
-				// Control the slugs used for this taxonomy
-				'rewrite'           => [
-					'slug'         => $this->settings->rc_slug,
-					'with_front'   => false,
-					'hierarchical' => false
-				],
-			]
-		);
-		// Terms inserted via insertTerms method
-
-		// Campuses
-		if ($this->settings->enable_campuses === "on") {
-			$campusesTypesToApply = [];
-			if ($this->settings->enable_involvements === "on") {
-				$campusesTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-			}
-			$campusesTypesToApply[] = 'user';
-			register_taxonomy(
-				self::TAX_CAMPUS,
-				$campusesTypesToApply,
-				[
-					'hierarchical'      => false,
-					'show_ui'           => false,
-					'description'       => __('Classify posts by their church campus.', 'TouchPoint-WP'),
-					'labels'            => getLabels($this->settings->camp_name_singular, $this->settings->camp_name_plural),
-					'public'            => true,
-					'show_in_rest'      => true,
-					'show_admin_column' => true,
-
-					// Control the slugs used for this taxonomy
-					'rewrite'           => [
-						'slug'         => $this->settings->camp_slug,
-						'with_front'   => false,
-						'hierarchical' => false
-					],
-				]
-			);
-			// Terms inserted via insertTerms method
-		}
-
-		// Divisions & Programs
-		$divisionTypesToApply = [];
-		if ($this->settings->enable_involvements === "on") {
-			$divisionTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-		}
-		// TODO allow this taxonomy to be applied to other post types as an option.
-		if (count($divisionTypesToApply) > 0) {
-			register_taxonomy(
-				self::TAX_DIV,
-				$divisionTypesToApply,
-				[
-					'hierarchical'      => true,
-					'show_ui'           => true,
-					/* translators: %s: taxonomy name, singular */
-					'description'       => sprintf(__('Classify things by %s.', 'TouchPoint-WP'), $this->settings->dv_name_singular),
-					'labels'            => getLabels($this->settings->dv_name_singular, $this->settings->dv_name_plural),
-					'public'            => true,
-					'show_in_rest'      => true,
-					'show_admin_column' => false,
-
-					// Control the slugs used for this taxonomy
-					'rewrite'           => [
-						'slug'         => $this->settings->dv_slug,
-						'with_front'   => false,
-						'hierarchical' => true
-					],
-				]
-			);
-			// Terms inserted via insertTerms method
-		}
-
-		if ($this->settings->enable_involvements === "on") {
-
-			// Weekdays
-			register_taxonomy(
-				self::TAX_WEEKDAY,
-				Involvement_PostTypeSettings::getPostTypes(),
-				[
-					'hierarchical'      => false,
-					'show_ui'           => false,
-					'description'       => __('Classify involvements by the day on which they meet.', 'TouchPoint-WP'),
-					'labels'            => getLabels(__('Weekday', 'TouchPoint-WP'), __('Weekdays', 'TouchPoint-WP')),
-					'public'            => true,
-					'show_in_rest'      => true,
-					'show_admin_column' => true,
-
-					// Control the slugs used for this taxonomy
-					'rewrite'           => [
-						'slug'         => 'weekday',
-						'with_front'   => false,
-						'hierarchical' => false
-					],
-				]
-			);
-			// Terms inserted via insertTerms method
-
-			// Tenses
-			register_taxonomy(
-				self::TAX_TENSE,
-				Involvement_PostTypeSettings::getPostTypes(),
-				[
-					'hierarchical'      => false,
-					'show_ui'           => false,
-					'description'       => __('Classify involvements by tense (present, future, past)', 'TouchPoint-WP'),
-					'labels'            => getLabels(__("Tense", 'TouchPoint-WP'), __("Tenses", 'TouchPoint-WP')),
-					'public'            => true,
-					'show_in_rest'      => false,
-					'show_admin_column' => false,
-
-					// Control the slugs used for this taxonomy
-					'rewrite'           => [
-						'slug'         => 'tense',
-						'with_front'   => false,
-						'hierarchical' => false
-					],
-				]
-			);
-			// Terms inserted via insertTerms method
-
-			// Time of Day
-			/** @noinspection SpellCheckingInspection */
-			register_taxonomy(
-				self::TAX_DAYTIME,
-				Involvement_PostTypeSettings::getPostTypes(),
-				[
-					'hierarchical'      => false,
-					'show_ui'           => false,
-					'description'       => __('Classify involvements by the portion of the day in which they meet.', 'TouchPoint-WP'),
-					'labels'            => getLabels(__('Time of Day', 'TouchPoint-WP'), __('Times of Day', 'TouchPoint-WP')),
-					'public'            => true,
-					'show_in_rest'      => true,
-					'show_admin_column' => true,
-
-					// Control the slugs used for this taxonomy
-					'rewrite'           => [
-						'slug'         => 'timeofday',
-						'with_front'   => false,
-						'hierarchical' => false
-					],
-				]
-			);
-			// Terms inserted via insertTerms method
-		}
-
-		// Age Groups
-		$ageGroupTypesToApply = [];
-		if ($this->settings->enable_involvements === "on") {
-			$ageGroupTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-		}
-		$ageGroupTypesToApply[] = 'user';
-		register_taxonomy(
-			self::TAX_AGEGROUP,
-			$ageGroupTypesToApply,
-			[
-				'hierarchical'      => false,
-				'show_ui'           => false,
-				'description'       => __('Classify involvements and users by their age groups.', 'TouchPoint-WP'),
-				'labels'            => getLabels(__('Age Group', 'TouchPoint-WP'), __('Age Groups', 'TouchPoint-WP')),
-				'public'            => true,
-				'show_in_rest'      => true,
-				'show_admin_column' => true,
-
-				// Control the slugs used for this taxonomy
-				'rewrite'           => [
-					'slug'         => self::TAX_AGEGROUP,
-					'with_front'   => false,
-					'hierarchical' => false
-				],
-			]
-		);
-		// Terms inserted via insertTerms method
-
-
-		// Involvement Marital Status
-		if ($this->settings->enable_involvements === "on") {
-			register_taxonomy(
-				self::TAX_INV_MARITAL,
-				Involvement_PostTypeSettings::getPostTypes(),
-				[
-					'hierarchical'      => false,
-					'show_ui'           => false,
-					'description'       => __('Classify involvements by whether participants are mostly single or married.', 'TouchPoint-WP'),
-					'labels'            => getLabels(__('Marital Status', 'TouchPoint-WP'), __('Marital Statuses', 'TouchPoint-WP')),
-					'public'            => true,
-					'show_in_rest'      => true,
-					'show_admin_column' => true,
-
-					// Control the slugs used for this taxonomy
-					'rewrite'           => [
-						'slug'         => self::TAX_INV_MARITAL,
-						'with_front'   => false,
-						'hierarchical' => false
-					],
-				]
-			);
-			// Terms inserted via insertTerms method
-		}
-
-		// Global Partner Category
-		if ($this->settings->enable_global === "on") {
-			$tax = $this->settings->global_primary_tax;
-			if ($tax === "" || $tax === null) {
-				unregister_taxonomy(self::TAX_GP_CATEGORY);
-			} elseif (count($this->getFamilyEvFields([$tax])) > 0) {
-				$tax    = $this->getFamilyEvFields([$tax])[0];
-				$plural = $tax->field . "s"; // TODO Sad, but works.  i18n someday.
-				register_taxonomy(
-					self::TAX_GP_CATEGORY,
-					Partner::POST_TYPE,
-					[
-						'hierarchical'      => false,
-						'show_ui'           => false,
-						'description'       => __('Classify Partners by category chosen in settings.', 'TouchPoint-WP'),
-						'labels'            => getLabels($tax->field, $plural),
-						'public'            => true,
-						'show_in_rest'      => true,
-						'show_admin_column' => true,
-
-						// Control the slugs used for this taxonomy
-						'rewrite'           => [
-							'slug'         => self::TAX_GP_CATEGORY,
-							'with_front'   => false,
-							'hierarchical' => false
-						],
-					]
-				);
-				// Terms are inserted on sync.
-			}
-		}
-	}
-
-	/**
-	 * For the taxonomies that are based on Lookups in the TouchPoint database, insert or update the terms.
-	 *
-	 * @param object[]  $list
-	 * @param string $taxonomy
-	 * @param bool   $forceIdUpdate
-	 *
-	 * @return void
-	 */
-	protected function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
-	{
-		foreach ($list as $i) {
-			if ($i->name === null) {
-				continue;
-			}
-			// In addition to making sure term exists, make sure it has the correct meta id, too.
-			$term = Utilities::termExists($i->name, $taxonomy);
-			$idUpdate = $forceIdUpdate;
-			if (!$term) {
-				$term = Utilities::insertTerm(
-					$i->name,
-					$taxonomy,
-					[
-						'description' => $i->name,
-						'slug'		=> sanitize_title($i->name)
-					]
-				);
-				if (is_wp_error($term)) {
-					new TouchPointWP_WPError($term);
-					$term = null;
-				}
-				$idUpdate = true;
-			}
-			// Update the term meta if term is new, or if id update is forced.
-			if ($term !== null && isset($term['term_id']) && $idUpdate) {
-				update_term_meta($term['term_id'], self::TAXMETA_LOOKUP_ID, $i->id);
-			}
-			if ($idUpdate) {
-				self::queueFlushRewriteRules();
-			}
-		}
-	}
-
-	public static bool $forceTermLookupIdUpdate = false;
-
-	/**
-	 * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
-	 * loaded.)
-	 *
-	 * @return void
-	 */
-	public function insertTerms()
-	{
-		// Resident Codes
-		$this->insertTermsForLookupBasedTaxonomy(
-			$this->getResCodes(),
-			self::TAX_RESCODE,
-			self::$forceTermLookupIdUpdate
-		);
-		// TODO remove defunct res codes
-
-		// Campuses
-		if ($this->settings->enable_campuses === "on") {
-			$this->insertTermsForLookupBasedTaxonomy(
-				$this->getCampuses(),
-				self::TAX_CAMPUS,
-				self::$forceTermLookupIdUpdate
-			);
-		}
-		// TODO remove defunct campuses (including all of them, if disabled)
-
-		// Age Groups
-		foreach (["20s", "30s", "40s", "50s", "60s", "70+"] as $ag) {
-			if ( ! Utilities::termExists($ag, self::TAX_AGEGROUP)) {
-				Utilities::insertTerm(
-					$ag,
-					self::TAX_AGEGROUP,
-					[
-						'description' => $ag,
-						'slug'        => sanitize_title($ag)
-					]
-				);
-				self::queueFlushRewriteRules();
-			}
-		}
-
-		// Involvements and TODO Events
-		$postTypesToApply = [];
-		if ($this->settings->enable_involvements === "on") {
-			$postTypesToApply = Involvement_PostTypeSettings::getPostTypes();
-		}
-		if (count($postTypesToApply) > 0) {
-
-			// Divisions & Programs
-			$enabledDivisions = $this->settings->dv_divisions;
-			foreach ($this->getDivisions() as $d) {
-				if (in_array('div' . $d->id, $enabledDivisions)) {
-					// Program
-					$pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-					if ($pTermInfo === null && $d->pName !== null) {
-						$pTermInfo = Utilities::insertTerm(
-							$d->pName,
-							self::TAX_DIV,
-							[
-								'description' => $d->pName,
-								'slug'        => sanitize_title($d->pName)
-							]
-						);
-						if (is_wp_error($pTermInfo)) {
-							new TouchPointWP_WPError($pTermInfo);
-						} else {
-							update_term_meta($pTermInfo['term_id'], self::SETTINGS_PREFIX . 'programId', $d->proId);
-						}
-
-						self::queueFlushRewriteRules();
-					}
-
-					// Division
-					$dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-					if ($dTermInfo === null && $d->dName !== null) {
-						$dTermInfo = Utilities::insertTerm(
-							$d->dName,
-							self::TAX_DIV,
-							[
-								'description' => $d->dName,
-								'parent'      => $pTermInfo['term_id'],
-								'slug'        => sanitize_title($d->dName)
-							]
-						);
-						if (is_wp_error($dTermInfo)) {
-							new TouchPointWP_WPError($dTermInfo);
-						} else {
-							update_term_meta($dTermInfo['term_id'], self::SETTINGS_PREFIX . 'divId', $d->id);
-						}
-
-						self::queueFlushRewriteRules();
-					}
-				} else {
-					// Remove terms that are disabled from importing.
-
-					// Delete disabled divisions.  Get program, so we delete the right division.
-					$pTermInfo = Utilities::termExists($d->pName, self::TAX_DIV, 0);
-					if ($pTermInfo !== null) {
-						$dTermInfo = Utilities::termExists($d->dName, self::TAX_DIV, $pTermInfo['term_id']);
-						if ($dTermInfo !== null) {
-							wp_delete_term($dTermInfo['term_id'], self::TAX_DIV);
-							self::queueFlushRewriteRules();
-						}
-					}
-
-					// Program
-					// TODO remove programs that no longer have a division selected for use as a term.
-					// TODO remove program & div terms that are no longer present in TouchPoint
-				}
-			}
-
-			// Weekdays
-			for ($di = 0; $di < 7; $di++) {
-				$name = Utilities::getPluralDayOfWeekNameForNumber_noI18n($di);
-				if ( ! Utilities::termExists($name, self::TAX_WEEKDAY)) {
-					Utilities::insertTerm(
-						$name,
-						self::TAX_WEEKDAY,
-						[
-							'description' => $name,
-							'slug'        => Utilities::getDayOfWeekShortForNumber_noI18n($di)
-						]
-					);
-					self::queueFlushRewriteRules();
-				}
-			}
-
-			// Tense
-			foreach (
-				[
-					TouchPointWP::TAX_TENSE_FUTURE => 'Upcoming',
-					TouchPointWP::TAX_TENSE_PRESENT => 'Current',
-					TouchPointWP::TAX_TENSE_PAST => 'Past',
-				] as $slug => $name
-			) {
-				if ( ! Utilities::termExists($slug, self::TAX_TENSE)) {
-					Utilities::insertTerm(
-						$name,
-						self::TAX_TENSE,
-						[
-							'description' => $name,
-							'slug'        => $slug
-						]
-					);
-					self::queueFlushRewriteRules();
-				}
-			}
-
-			// Time of Day
-			$timesOfDay = [
-				'Late Night',
-				'Early Morning',
-				'Morning',
-				'Midday',
-				'Afternoon',
-				'Evening',
-				'Night'
-			];
-			foreach ($timesOfDay as $tod) {
-				if ( ! Utilities::termExists($tod, self::TAX_WEEKDAY)) {
-					$slug = str_replace(" ", "", $tod);
-					$slug = strtolower($slug);
-					Utilities::insertTerm(
-						$tod,
-						self::TAX_DAYTIME,
-						[
-							'description' => $tod,
-							'slug'        => $slug
-						]
-					);
-					self::queueFlushRewriteRules();
-				}
-			}
-		}
-
-		// Involvements
-		if ($this->settings->enable_involvements === "on") {
-
-			// Involvement Marital Status
-			foreach (['mostly_single', 'mostly_married'] as $ms) {
-				if ( ! Utilities::termExists($ms, self::TAX_INV_MARITAL)) {
-					Utilities::insertTerm(
-						$ms,
-						self::TAX_INV_MARITAL,
-						[
-							'description' => $ms,
-							'slug'        => sanitize_title($ms)
-						]
-					);
-					self::queueFlushRewriteRules();
-				}
-			}
-		}
-	}
 
 	private static array $divisionTerms = [];
 
@@ -1791,7 +1167,7 @@ public static function getDivisionTermIdByDivId(int $divId): int
 		if ( ! isset(self::$divisionTerms['d' . $divId])) {
 			$t = get_terms(
 				[
-					'taxonomy'   => self::TAX_DIV,
+					'taxonomy'   => Taxonomies::TAX_DIV,
 					'hide_empty' => false,
 					'number'	 => 1,
 					'fields'	 => 'ids',
@@ -2943,7 +2319,7 @@ public function flushRewriteRules(bool $force = true): void
 	{
 		$s = Session::instance();
 		if ($s->flushRewriteOnNextLoad || $force) {
-			flush_rewrite_rules(true);
+			flush_rewrite_rules();
 			$s->flushRewriteOnNextLoad = null;
 		}
 	}
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 252b0a75..76385daa 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -17,6 +17,7 @@
  *
  * @property-read string       enable_authentication  Whether the Authentication module is included.
  * @property-read string       enable_involvements  Whether the Involvement module is included.
+ * @property-read string       enable_meeting_cal  Whether the Meeting Calendar module is included.
  * @property-read string       enable_people_lists  Whether to allow public People Lists.
  * @property-read string       enable_rsvp        Whether the RSVP module is included.
  * @property-read string       enable_global      Whether to import Global partners.
@@ -67,14 +68,15 @@
  *
  * @property-read string       ec_use_standardizing_style Whether to insert the standardizing stylesheet into mobile app requests.
  *
- * @property-read string mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
- * @property-read string mc_hist_months     Number of months of history to keep.
- * @property-read string mc_future_months   Number of months into the future to import.
- * @property-read string mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
+ * @property-read string       mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
+ * @property-read string       mc_hist_months     Number of months of history to keep.
+ * @property-read string       mc_future_months   Number of months into the future to import.
+ * @property-read string       mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
  *
  * @property-read string       rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
  * @property-read string       rc_name_singular   What a resident code should be called, singular (e.g. "Resident Code" or "Zone")
  * @property-read string       rc_slug            Slug for resident code taxonomy (e.g. "zones" for church.org/zones)
+ * @property-read array        rc_additional_post_types  Which post types should have the division taxonomy.
  *
  * @property-read string       camp_name_plural   What campuses should be called, plural (e.g. "Campuses" or "Languages")
  * @property-read string       camp_name_singular What a campus should be called, singular (e.g. "Campus" or "Language")
@@ -84,6 +86,7 @@
  * @property-read string       dv_name_singular   What a division should be called, singular (e.g. "Division" or "Ministry")
  * @property-read string       dv_slug            Slug for division taxonomy (e.g. "ministries" for church.org/ministries)
  * @property-read array        dv_divisions       Which divisions should be imported
+ * @property-read array        dv_additional_post_types  Which post types should have the division taxonomy.
  */
 class TouchPointWP_Settings
 {
@@ -269,6 +272,17 @@ private function settingsFields($includeDetail = false): array
 					'default'     => '',
 					'autoload'    => true,
 				],
+				[
+					'id'          => 'enable_meeting_cal',
+					'label'       => __('Enable Meeting Calendar', 'TouchPoint-WP'),
+					'description' => __(
+						'Load Meetings from TouchPoint for a calendar, native in your website.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox',
+					'default'     => '',
+					'autoload'    => true,
+				],
 				[
 					'id'          => 'enable_people_lists',
 					'label'       => __('Enable Public People Lists', 'TouchPoint-WP'),
@@ -877,6 +891,19 @@ private function settingsFields($includeDetail = false): array
 					'default'     => [],
 					'callback'    => function($new) { sort($new); return $new; }
 				],
+				[
+					'id'          => 'dv_additional_post_types',
+					'label'       => __('Post Types', 'TouchPoint-WP'),
+					'description' => __(
+						'Select post types which should have Divisions available as a native taxonomy.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox_multi',
+					'options'     => $includeThis ? Utilities::getRegisteredPostTypesAsKVArray() : [],
+					'autoload'    => true,
+					'default'     => [],
+					'callback'    => fn($new) => $this->validation_postTypes($new)
+				],
 			],
 		];
 
@@ -953,6 +980,7 @@ private function settingsFields($includeDetail = false): array
 			];
 		}
 
+		$includeThis = $includeDetail === true || $includeDetail === 'resident_codes';
 		$this->settings['resident_codes'] = [
 			'title'       => __('Resident Codes', 'TouchPoint-WP'),
 			'description' => __('Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations.', 'TouchPoint-WP'),
@@ -993,7 +1021,20 @@ private function settingsFields($includeDetail = false): array
 					'autoload'    => true,
 					'placeholder' => 'rescodes',
 					'callback'    => fn($new) => $this->validation_slug($new, 'rc_slug')
-				]
+				],
+				[
+					'id'          => 'rc_additional_post_types',
+					'label'       => __('Post Types', 'TouchPoint-WP'),
+					'description' => __(
+						'Select post types which should have Resident Codes available as a native taxonomy.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox_multi',
+					'options'     => $includeThis ? Utilities::getRegisteredPostTypesAsKVArray() : [],
+					'autoload'    => true,
+					'default'     => [],
+					'callback'    => fn($new) => $this->validation_postTypes($new)
+				],
 			],
 		];
 
@@ -1430,10 +1471,9 @@ public function migrate(): void
 			rename("../../touchpoint-wp/TouchPoint-WP.php", "../../touchpoint-wp/touchpoint-wp.php");
 		}
 
-
 		// 0.0.31 - Add lookup IDs to ResCodes
-		TouchPointWP::$forceTermLookupIdUpdate = true;
-
+		// 0.0.36 - Cleanup possible duplicate terms
+		Taxonomies::$forceTermLookupIdUpdate = true;
 
 		// Update version string
 		$this->set('version', TouchPointWP::VERSION);
@@ -1684,6 +1724,27 @@ protected function validation_slug($new, string $field): string
 		return $new;
 	}
 
+
+	/**
+	 * Validate that selected post types are actually post types that exist.
+	 *
+	 * @param mixed  $new The new value.
+	 *
+	 * @return string[]
+	 */
+	protected function validation_postTypes(array $new): array
+	{
+		$types = array_keys(Utilities::getRegisteredPostTypesAsKVArray());
+		$r = [];
+		sort($new);
+		foreach ($new as $k => $t) {
+			if (in_array($t, $types)) {
+				$r[] = $t;
+			}
+		}
+		return $r;
+	}
+
 	/**
 	 * Force a value to lowercase; used as a validator
 	 *
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index df578c90..8853c6cf 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -8,7 +8,7 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use Exception;
-use WP_Error;
+use WP_Post_Type;
 
 /**
  * A few tools for managing things.
@@ -325,92 +325,28 @@ public static function hslToHex(int $h, int $s, int $l): string
 	}
 
 	/**
-	 * Wrapper for the WordPress term_exists function to reduce database calls
+	 * Get the registered post types as a Key-Value array.  Excludes post types that start with 'tp_'.
 	 *
-	 * @param int|string $term The term to check. Accepts term ID, slug, or name.
-	 * @param string     $taxonomy Optional. The taxonomy name to use.
-	 * @param int|null   $parent Optional. ID of parent term under which to confine the exists search.
-	 *
-	 * @return mixed Returns null if the term does not exist.
-	 *			   Returns the term ID if no taxonomy is specified and the term ID exists.
-	 *			   Returns an array of the term ID and the term taxonomy ID if the taxonomy is specified and the
-	 *				  pairing exists.
-	 *			   Returns 0 if term ID 0 is passed to the function.
-	 *
-	 * @see term_exists()
-	 */
-	public static function termExists($term, string $taxonomy = "", ?int $parent = null)
-	{
-		$key = $term . "|" . $taxonomy . "|" . $parent;
-		if ( ! array_key_exists($key, self::$termExistsCache)) {
-			self::$termExistsCache[$key] = term_exists($term, $taxonomy, $parent);
-		}
-
-		return self::$termExistsCache[$key];
-	}
-
-	private static array $termExistsCache = [];
-
-
-	/**
-	 * Wrapper for the WordPress wp_insert_term function to reduce database calls
-	 *
-	 * Add a new term to the database.
-	 *
-	 * A non-existent term is inserted in the following sequence:
-	 * 1. The term is added to the term table, then related to the taxonomy.
-	 * 2. If everything is correct, several actions are fired.
-	 * 3. The 'term_id_filter' is evaluated.
-	 * 4. The term cache is cleaned.
-	 * 5. Several more actions are fired.
-	 * 6. An array is returned containing the `term_id` and `term_taxonomy_id`.
-	 *
-	 * If the 'slug' argument is not empty, then it is checked to see if the term
-	 * is invalid. If it is not a valid, existing term, it is added and the term_id
-	 * is given.
-	 *
-	 * If the taxonomy is hierarchical, and the 'parent' argument is not empty,
-	 * the term is inserted and the term_id will be given.
-	 *
-	 * Error handling:
-	 * If `$taxonomy` does not exist or `$term` is empty,
-	 * a WP_Error object will be returned.
-	 *
-	 * If the term already exists on the same hierarchical level,
-	 * or the term slug and name are not unique, a WP_Error object will be returned.
-	 *
-	 * @param string       $term The term name to add.
-	 * @param string       $taxonomy The taxonomy to which to add the term.
-	 * @param array|string $args {
-	 *     Optional. Array or query string of arguments for inserting a term.
-	 *
-	 * @type string        $alias_of Slug of the term to make this term an alias of.
-	 *                               Default empty string. Accepts a term slug.
-	 * @type string        $description The term description. Default empty string.
-	 * @type int           $parent The id of the parent term. Default 0.
-	 * @type string        $slug The term slug to use. Default empty string.
-	 * }
-	 * @return array|WP_Error {
-	 *     An array of the new term data, WP_Error otherwise.
-	 *
-	 * @type int           $term_id The new term ID.
-	 * @type int|string    $term_taxonomy_id The new term taxonomy ID. Can be a numeric string.
-	 * }
-	 *
-	 * @see wp_insert_term()
+	 * @return string[]
 	 */
-	public static function insertTerm(string $term, string $taxonomy, $args = [])
-	{
-		$parent = $args['parent'] ?? null;
-		$key    = $term . "|" . $taxonomy . "|" . $parent;
-		$r      = wp_insert_term($term, $taxonomy, $args);
-		if ( ! is_wp_error($r)) {
-			self::$termExistsCache[$key] = $r;
+	public static function getRegisteredPostTypesAsKVArray(): array{
+		global $wp_post_types;
+		$r = [];
+		$strLen = strlen(TouchPointWP::HOOK_PREFIX);
+		foreach ($wp_post_types as $key => $object) {
+			/** @var $object WP_Post_Type */
+
+			if (substr($key, 0, 3) === 'wp_' ||
+				substr($key, 0, $strLen) === TouchPointWP::HOOK_PREFIX ||
+				$object->show_ui === false) {
+				continue;
+			}
+			$r[$key] = $object->label;
 		}
-
 		return $r;
 	}
 
+
 	/**
 	 * Generates a Microsoft-friendly globally unique identifier (Guid).
 	 *
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 81a1d8e4..a4fc25c1 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -146,8 +146,8 @@
             <td colspan="2">
                 <select id="it-tense" data-bind="value: groupBy, attr: { id: 'it-' + slug() + '-tense'}">
                     <option value=""><?php _e("No Grouping", "TouchPoint-WP"); ?></option>
-                    <option value="-<?php echo TouchPointWP::TAX_TENSE; ?>"><?php _e("Upcoming / Current", "TouchPoint-WP"); ?></option>
-                    <option value="<?php echo TouchPointWP::TAX_TENSE; ?>"><?php _e("Current / Upcoming", "TouchPoint-WP"); ?></option>
+                    <option value="-<?php echo Taxonomies::TAX_TENSE; ?>"><?php _e("Upcoming / Current", "TouchPoint-WP"); ?></option>
+                    <option value="<?php echo Taxonomies::TAX_TENSE; ?>"><?php _e("Current / Upcoming", "TouchPoint-WP"); ?></option>
                 </select>
             </td>
         </tr>
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index c0f85331..b6057c06 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -52,6 +52,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Geo.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Taxonomies.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/geo.php";
 
 	require_once __DIR__ . "/src/TouchPoint-WP/Person.php";

From 1b3d48beaa27b052dcae4678610b13ef3a09053e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 14 Oct 2023 23:40:54 -0400
Subject: [PATCH 032/423] SQL Dialects, version bump, settings.

---
 .idea/sqldialects.xml                       |  1 +
 src/TouchPoint-WP/EventsCalendar.php        |  2 +
 src/TouchPoint-WP/Involvement.php           |  9 +---
 src/TouchPoint-WP/TouchPointWP.php          | 18 +++++++-
 src/TouchPoint-WP/TouchPointWP_Settings.php | 47 +++++++++++--------
 src/python/WebApi.py                        | 51 ++++++++++++++++-----
 touchpoint-wp.php                           |  2 +-
 7 files changed, 90 insertions(+), 40 deletions(-)

diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 56782cab..7accee87 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/src/python" dialect="TSQL" />
     <file url="PROJECT" dialect="MySQL" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index e975ebe4..5fc66a84 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -18,6 +18,8 @@
 /**
  * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
  * mobile app.
+ *
+ * @deprecated since 0.0.36
  */
 abstract class EventsCalendar implements api, module
 {
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 592639b0..ed44fa8d 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -345,7 +345,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
 
-		foreach (self::allTypeSettings() as $k => $type) {
+		foreach (self::allTypeSettings() as $type) {
 			if (count($type->importDivs) < 1) {
 				// Don't update if there aren't any divisions selected yet.
 				if ($verbose) {
@@ -1766,7 +1766,6 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in
 		return $wpdb->get_results($q, 'OBJECT');
 	}
 
-
 	/**
 	 * Create a Involvement object from an object from a database query.
 	 *
@@ -2074,11 +2073,7 @@ public function asGeoIFace(string $type = "unknown"): ?object
 	 *
 	 * @return false|int  False on failure.  Otherwise, the number of updates.
 	 */
-	final protected static function updateInvolvementPostsForType(
-		Involvement_PostTypeSettings $typeSets,
-		$divs,
-		bool $verbose
-	) {
+	final protected static function updateInvolvementPostsForType(Involvement_PostTypeSettings $typeSets, $divs, bool $verbose) {
 		$siteTz = wp_timezone();
 
 		set_time_limit(180);
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 292ff181..d56b3bfa 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -32,7 +32,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.35";
+	public const VERSION = "0.0.36";
 
 	/**
 	 * The Token
@@ -169,6 +169,10 @@ class TouchPointWP
 	 */
 	protected ?bool $global = null;
 
+	/**
+	 * @var ?bool True after the Meeting/Events Calendar feature is loaded.
+	 */
+	protected ?bool $meeting = null;
 
 	/**
 	 * @var ?bool True after the People feature is loaded.
@@ -695,7 +699,15 @@ public static function load($file): TouchPointWP
 			$instance->people = Person::load();
 		}
 
-		// Load Events if enabled (by presence of Events Calendar plugin)
+		// Load Meetings / Events Calendar
+		if ($instance->settings->enable_meeting_cal === "on") {
+			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+				require_once 'Meeting.php';
+			}
+			$instance->meeting = Meeting::load();
+		}
+
+		// Load Tribe module if enabled (by presence of Events Calendar plugin)
 		if (self::useTribeCalendar()
 			&& ! class_exists("tp\TouchPointWP\EventsCalendar")) {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
@@ -1318,6 +1330,8 @@ public static function useTribeCalendarPro(): bool
 	 * Indicates that Tribe Calendar is enabled.
 	 *
 	 * @return bool
+	 *
+	 * @deprecated since 0.0.36 -- Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendar(): bool
 	{
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 76385daa..d7d2c8bb 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -69,8 +69,9 @@
  * @property-read string       ec_use_standardizing_style Whether to insert the standardizing stylesheet into mobile app requests.
  *
  * @property-read string       mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
- * @property-read string       mc_hist_months     Number of months of history to keep.
- * @property-read string       mc_future_months   Number of months into the future to import.
+ * @property-read string       mc_future_days     Number of days into the future to import.
+ * @property-read string       mc_archive_days    Number of days to wait to move something to history.
+ * @property-read string       mc_hist_days       Number of days of history to keep.
  * @property-read string       mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
  *
  * @property-read string       rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
@@ -804,33 +805,43 @@ private function settingsFields($includeDetail = false): array
 					'callback'    => fn($new) => $this->validation_slug($new, 'mc_slug')
 				],
 				[
-					'id'          => 'mc_hist_months',
-					'label'       => __( 'Months of History', 'TouchPoint-WP' ),
-					'description' => __( 'Meetings will be kept for the public calendar until the event is this many months in the past.  Note that due to limitations in TouchPoint\'s approach to events, Meetings cannot be fully updated once they occur.', 'TouchPoint-WP' ),
+					'id'          => 'mc_future_days',
+					'label'       => __('Days of Future', 'TouchPoint-WP'),
+					'description' => __('Meetings more than this many days in the future will not be imported.', 'TouchPoint-WP'),
 					'type'        => 'number',
-					'default'     => 12,
-					'placeholder' => 12,
-					'max'         => 36,
+					'default'     => 365,
+					'placeholder' => 365,
+					'max'         => 1825,
 					'min'         => 0
 				],
 				[
-					'id'          => 'mc_future_months',
-					'label'       => __( 'Months of Future', 'TouchPoint-WP' ),
-					'description' => __( 'Meetings more than this many months in the future will not be imported.', 'TouchPoint-WP' ),
+					'id'          => 'mc_archive_days',
+					'label'       => __('Archive After Days', 'TouchPoint-WP'),
+					'description' => __('Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update.', 'TouchPoint-WP'),
 					'type'        => 'number',
-					'default'     => 12,
-					'placeholder' => 12,
-					'max'         => 60,
+					'default'     => 7,
+					'placeholder' => 7,
+					'max'         => 365,
+					'min'         => 0
+				],
+				[
+					'id'          => 'mc_hist_days',
+					'label'       => __('Days of History', 'TouchPoint-WP'),
+					'description' => __('Meetings will be kept for the public calendar until the event is this many days in the past.', 'TouchPoint-WP'),
+					'type'        => 'number',
+					'default'     => 365,
+					'placeholder' => 365,
+					'max'         => 1825,
 					'min'         => 0
 				],
 				[
 					'id'          => 'mc_deletion_method',
-					'label'       => __( 'Meeting Deletion Handling', 'TouchPoint-WP' ),
-					'description' => __( 'When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?', 'TouchPoint-WP' ),
+					'label'       => __('Meeting Deletion Handling', 'TouchPoint-WP'),
+					'description' => __('When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?', 'TouchPoint-WP'),
 					'type'        => 'select',
 					'options'     => [
-						'delete'    => __( 'Always delete from WordPress', 'TouchPoint-WP' ),
-						'cancel'    => __( 'Mark the occurrence as cancelled', 'TouchPoint-WP' ),
+						'delete'    => __('Always delete from WordPress', 'TouchPoint-WP'),
+						'cancel'    => __('Mark the occurrence as cancelled', 'TouchPoint-WP'),
 					],
 					'default'     => 'delete',
 				],
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 80c924a7..27956377 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "0.0.35"
+VERSION = "0.0.36"
 
 sgContactEvName = "Contact"
 
@@ -88,6 +88,7 @@ def get_person_info_for_sync(person_obj):
 
 if "Divisions" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     divSql = '''
     SELECT d.id,
         CONCAT(p.name, ' : ', d.name) as name,
@@ -103,30 +104,35 @@ def get_person_info_for_sync(person_obj):
 
 if "ResCodes" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     rcSql = '''SELECT Id, Code, Description as Name FROM lookup.ResidentCode'''
     Data.Title = "All Resident Codes"
     Data.resCodes = q.QuerySql(rcSql, {})
 
 if "Campuses" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     rcSql = '''SELECT Id, Code, Description as Name FROM lookup.Campus'''
     Data.Title = "All Campuses"
     Data.campuses = q.QuerySql(rcSql, {})
 
 if "Genders" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     rcSql = '''SELECT Id, Code, Description as Name FROM lookup.Gender'''
     Data.Title = "All Genders"
     Data.genders = q.QuerySql(rcSql, {})
 
 if "Keywords" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     kwSql = '''SELECT KeywordId as Id, Code, Description as Name FROM Keyword ORDER BY Code'''
     Data.Title = "All Keywords"
     Data.keywords = q.QuerySql(kwSql, {})
 
 if "PersonEvFields" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     pevSql = '''SELECT Field, [Type], count(*) as Count,
                 CONCAT('pev', SUBSTRING(CONVERT(NVARCHAR(18), HASHBYTES('MD2', CONCAT([Field], [Type])), 1), 3, 8)) Hash
                 FROM PeopleExtra WHERE [Field] NOT LIKE '%_mv'
@@ -136,6 +142,7 @@ def get_person_info_for_sync(person_obj):
 
 if "FamilyEvFields" in Data.a:
     apiCalled = True
+    # noinspection SqlResolve
     fevSql = '''SELECT Field, [Type], count(*) as Count,
                 CONCAT('fev', SUBSTRING(CONVERT(NVARCHAR(18), HASHBYTES('MD2', CONCAT([Field], [Type])), 1), 3, 8)) Hash
                 FROM FamilyExtra WHERE [Field] NOT LIKE '%_mv'
@@ -148,17 +155,21 @@ def get_person_info_for_sync(person_obj):
     Data.savedSearches = model.DynamicData()
 
     if Data.PeopleId == '':
+        # noinspection SqlResolve
         Data.savedSearches.public = model.SqlListDynamicData("""
             SELECT TOP 100 q.Name, q.QueryId FROM Query q JOIN Users u ON LOWER(q.Owner) = LOWER(u.Username)
             WHERE q.IsPublic = 1 AND q.LastRun > DATEADD(DAY, -90, GETDATE()) AND q.Name <> 'Draft'
             ORDER BY q.Name
         """)
     else:
+        # noinspection SqlResolve
         Data.savedSearches.user = model.SqlListDynamicData("""
             SELECT TOP 100 q.Name, q.QueryId FROM Query q JOIN Users u ON LOWER(q.Owner) = LOWER(u.Username)
             WHERE (u.PeopleId = {0}) AND q.LastRun > DATEADD(DAY, -90, GETDATE()) AND q.Name <> 'Draft'
             ORDER BY q.Name
         """.format(Data.PeopleId))
+
+        # noinspection SqlResolve
         Data.savedSearches.public = model.SqlListDynamicData("""
             SELECT TOP 100 q.Name, q.QueryId FROM Query q JOIN Users u ON LOWER(q.Owner) = LOWER(u.Username)
             WHERE (q.IsPublic = 1 AND u.PeopleId <> {0}) 
@@ -167,6 +178,7 @@ def get_person_info_for_sync(person_obj):
             ORDER BY q.Name
         """.format(Data.PeopleId))
 
+    # noinspection SqlResolve
     Data.savedSearches.flags = model.SqlListDynamicData("""
         SELECT TOP 100 q.Name, q.QueryId FROM Query q
         WHERE q.StatusFlag = 1
@@ -190,9 +202,10 @@ def get_person_info_for_sync(person_obj):
     if hostMemTypes == "":
         hostMemTypes = "NULL"
 
+    # noinspection SqlResolve,SqlUnusedCte,SqlRedundantOrderingDirection
     invSql = '''
         WITH cteTargetOrgs as
-        (    
+        (
         SELECT 
                 o.OrganizationId,
                 o.ParentOrgId as parentInvId,
@@ -237,9 +250,9 @@ def get_person_info_for_sync(person_obj):
         cteMaritalStatus AS 
         (SELECT 
             omi.OrganizationId
-            , SUM(CASE WHEN pi.MaritalStatusId NOT IN ( 0 ) THEN 1 ELSE 0  END)     AS marital_denom
-            , SUM(CASE WHEN pi.MaritalStatusId = 20 THEN 1 ELSE 0  END)             AS marital_married
-            , SUM(CASE WHEN pi.MaritalStatusId NOT IN ( 0, 20 ) THEN 1 ELSE 0  END) AS marital_single
+            , SUM(IIF(pi.MaritalStatusId NOT IN ( 0 ), 1, 0))     AS marital_denom
+            , SUM(IIF(pi.MaritalStatusId = 20, 1, 0))             AS marital_married
+            , SUM(IIF(pi.MaritalStatusId NOT IN ( 0, 20 ), 1, 0)) AS marital_single
             FROM cteOrganizationMembers omi
                 INNER JOIN dbo.People pi WITH(NOLOCK)
                     ON omi.PeopleId = pi.PeopleId
@@ -407,6 +420,7 @@ def get_person_info_for_sync(person_obj):
     Data.invs = groups
 
     # Get Extra Values in use on these involvements
+    # noinspection SqlResolve
     invEvSql = '''SELECT DISTINCT [Field], [Type] FROM OrganizationExtra oe
                   LEFT JOIN DivOrg do ON oe.OrganizationId = do.OrgId WHERE DivId IN ({})'''.format(divs)
 
@@ -420,6 +434,7 @@ def get_person_info_for_sync(person_obj):
     regex = re.compile('[^0-9,]')
     divs = regex.sub('', divs)
 
+    # noinspection SqlResolve
     memTypeSql = '''SELECT DISTINCT om.[MemberTypeId] as id, mt.[Code] as code, mt.[Description] as description 
                     FROM OrganizationMembers om
                     JOIN DivOrg do ON om.OrganizationId = do.OrgId
@@ -438,6 +453,7 @@ def get_person_info_for_sync(person_obj):
 
     # Numeric query
     elif Data.q.isnumeric():
+        # noinspection SqlResolve
         sql = """SELECT TOP 10
                  p1.PeopleId,
                  COALESCE(p1.NickName, p1.FirstName) GoesBy,
@@ -467,6 +483,7 @@ def get_person_info_for_sync(person_obj):
 
     # Single word
     elif Data.q.find(' ') == -1 and Data.q.find(',') == -1:
+        # noinspection SqlResolve
         sql = """SELECT TOP 10
                  p1.PeopleId,
                  COALESCE(p1.NickName, p1.FirstName) GoesBy,
@@ -503,6 +520,7 @@ def get_person_info_for_sync(person_obj):
         else:
             [first, second] = Data.q.split(' ', 1)
 
+        # noinspection SqlResolve
         sql = """SELECT TOP 10
                  p1.PeopleId,
                  COALESCE(p1.NickName, p1.FirstName) GoesBy,
@@ -628,7 +646,7 @@ def get_person_info_for_sync(person_obj):
 
     else:
         # email and zip only
-
+        # noinspection SqlResolve
         sql = """SELECT DISTINCT p1.FamilyId
             FROM People p1
                 JOIN Families f ON p1.FamilyId = f.FamilyId
@@ -642,6 +660,7 @@ def get_person_info_for_sync(person_obj):
     degreesOfSep = int(model.Setting("RegisterRelatedFamilies", "0"))
 
     if degreesOfSep > 1 and len(inData['fid']) > 0:
+        # noinspection SqlResolve
         sql = """SELECT DISTINCT rf1.fid FROM (
             SELECT rf1a.FamilyId fid, rf1a.RelatedFamilyId rid FROM RelatedFamilies rf1a UNION
             SELECT rf1b.RelatedFamilyId fid, rf1b.FamilyId rid FROM RelatedFamilies rf1b UNION
@@ -657,6 +676,7 @@ def get_person_info_for_sync(person_obj):
         inData['fid'] = q.QuerySqlInts(sql)
 
     elif degreesOfSep == 1 and len(inData['fid']) > 0:
+        # noinspection SqlResolve
         sql = """SELECT DISTINCT rf1.fid FROM (
             SELECT rf1a.FamilyId fid, rf1a.RelatedFamilyId rid FROM RelatedFamilies rf1a UNION
             SELECT rf1b.RelatedFamilyId fid, rf1b.FamilyId rid FROM RelatedFamilies rf1b UNION
@@ -688,6 +708,7 @@ def get_person_info_for_sync(person_obj):
     else:
         owner = int(owner)
 
+    # noinspection SqlResolve
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
@@ -737,6 +758,7 @@ def get_person_info_for_sync(person_obj):
     else:
         owner = int(owner)
 
+    # noinspection SqlResolve
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
@@ -806,6 +828,7 @@ def get_person_info_for_sync(person_obj):
     inData = model.JsonDeserialize(Data.data).inputData
 
     Data.success = []
+    # noinspection SqlResolve
     for mtg in q.QuerySql('''
     SELECT  m.meetingId as mtgId,
             m.organizationId as invId,
@@ -905,6 +928,7 @@ def get_person_info_for_sync(person_obj):
         pevSql = []
         for pev in inData['meta']['pev']:
             pevSql.append("([Field] = '{}' AND [Type] = '{}')".format(pev['field'], pev['type']))
+        # noinspection SqlResolve
         pevSql = """SELECT Field, StrValue, DateValue, Data, IntValue, BitValue, [Type],
             CONCAT('pev', SUBSTRING(CONVERT(NVARCHAR(18), HASHBYTES('MD2', CONCAT([Field], [Type])), 1), 3, 8)) Hash
             FROM PeopleExtra
@@ -919,6 +943,7 @@ def get_person_info_for_sync(person_obj):
         for fev in inData['meta']['fev']:
             fevSql.append("([Field] = '{}' AND [Type] = '{}')".format(fev['field'], fev['type']))
         if len(fevSql) > 0:
+            # noinspection SqlResolve
             fevSql = """SELECT Field, StrValue, DateValue, Data, IntValue, BitValue, [Type],
                 CONCAT('fev', SUBSTRING(CONVERT(NVARCHAR(18), HASHBYTES('MD2', CONCAT([Field], [Type])), 1), 3, 8)) Hash
                 FROM FamilyExtra
@@ -926,8 +951,10 @@ def get_person_info_for_sync(person_obj):
         else:
             fevSql = ''
 
+    # noinspection SqlResolve
     invSql = "SELECT om.OrganizationId iid, CONCAT('mt', mt.Id) memType, CONCAT('at', at.Id) attType, om.UserData descr FROM OrganizationMembers om LEFT JOIN lookup.MemberType mt on om.MemberTypeId = mt.Id LEFT JOIN lookup.AttendType at ON mt.AttendanceTypeId = at.Id WHERE om.Pending = 0 AND mt.Inactive = 0 AND at.Guest = 0 AND om.PeopleId = {0} AND om.OrganizationId IN ({1})"
 
+    # noinspection SqlResolve
     famGeoSql = """SELECT geo.Longitude, geo.Latitude 
     FROM AddressInfo ai LEFT JOIN Geocodes geo ON ai.FullAddress = geo.Address WHERE ai.FamilyId = {}"""
 
@@ -1023,17 +1050,17 @@ def get_person_info_for_sync(person_obj):
     Data.Title = 'Running requested reports'
 
     if inData.has_key('reports'):
-        # noinspection SqlConstantCondition,SqlConstantExpression
+        # noinspection SqlResolve,SqlConstantCondition,SqlConstantExpression
         reportsQ = 'SELECT Id, Name, Body, TypeId FROM Content WHERE 1=0'
         sqlPs = {}
         for r in inData['reports']:
             rNameL = r['name'].lower()
-            type = 9999
+            typ = 9999
             if r['type'] == 'sql':
-                type = 4
+                typ = 4
                 if rNameL not in sqlPs:
                     sqlPs[rNameL] = []
-                    reportsQ += " OR (Name = '{}' AND TypeId = {})".format(r['name'], type)
+                    reportsQ += " OR (Name = '{}' AND TypeId = {})".format(r['name'], typ)
                 sqlPs[rNameL].append(r['p1'])
 
         Data.sqlPs = sqlPs
@@ -1080,8 +1107,7 @@ def get_person_info_for_sync(person_obj):
     model.Title = "Logging out..."
     model.Header = "Logging out..."
     model.Script = "<script>document.getElementById('logoutIFrame').onload = function() { window.location = \"" + redir + "\"; }</script>"
-    print(
-        "<iframe id=\"logoutIFrame\" src=\"/Account/LogOff/\" style=\"position:absolute; top:-1000px; left:-10000px; width:2px; height:2px;\" ></iframe>")
+    print("<iframe id=\"logoutIFrame\" src=\"/Account/LogOff/\" style=\"position:absolute; top:-1000px; left:-10000px; width:2px; height:2px;\" ></iframe>")
     apiCalled = True
 
 if ("login" in Data.a or Data.r != '') and model.HttpMethod == "get":  # r parameter implies desired redir after login.
@@ -1115,6 +1141,7 @@ def get_person_info_for_sync(person_obj):
             path = ""
 
             # add host if missing
+            # noinspection HttpUrlsUsage
             if not r[0:8].lower() == "https://" and not r[0:7].lower() == "http://" and not r.split('/', 1)[
                 0].__contains__('.'):
                 if r[0] == '/':
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index b6057c06..1289e676 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.35
+Version:            0.0.36
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From dd82650338d017625afaacb2c89d6e73d44bfcba Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 11:29:52 -0400
Subject: [PATCH 033/423] version bump

---
 composer.json | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e8040e13..595caf68 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/package.json b/package.json
index aba6a642..dfe4f2a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"

From 73cd2f434a99f9c251c7c7847afd9d982813026f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 11:31:40 -0400
Subject: [PATCH 034/423] Resolve an issue when the partner tax isn't defined.

---
 src/TouchPoint-WP/Partner.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 43680789..911d348a 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -118,12 +118,15 @@ protected function __construct(object $object)
 			throw new TouchPointWP_Exception("Could not construct a Partner with the information provided.");
 		}
 
-		$terms = wp_get_post_terms(
-			$this->post_id,
-			[
-				Taxonomies::TAX_GP_CATEGORY
-			]
-		);
+		$terms = [];
+		if (TouchPointWP::instance()->settings->global_primary_tax !== "") {
+			$terms = wp_get_post_terms(
+				$this->post_id,
+				[
+					Taxonomies::TAX_GP_CATEGORY
+				]
+			);
+		}
 
 		if (is_array($terms) && count($terms) > 0) {
 			$hookLength = strlen(TouchPointWP::HOOK_PREFIX);
@@ -503,9 +506,15 @@ public static function updateFromTouchPoint(bool $verbose = false)
 		}
 
 		// Delete terms that are no longer used
-		$terms = get_terms(['taxonomy' => Taxonomies::TAX_GP_CATEGORY, 'hide_empty' => false, 'exclude' => $termsToKeep]);
-		foreach ($terms as $term) {
-			wp_delete_term($term->term_id, Taxonomies::TAX_GP_CATEGORY);
+		if (TouchPointWP::instance()->settings->global_primary_tax !== "") {
+			$terms = get_terms(
+				['taxonomy' => Taxonomies::TAX_GP_CATEGORY, 'hide_empty' => false, 'exclude' => $termsToKeep]
+			);
+			if (!is_wp_error($terms)) {
+				foreach ($terms as $term) {
+					wp_delete_term($term->term_id, Taxonomies::TAX_GP_CATEGORY);
+				}
+			}
 		}
 
 		if ($count !== 0) {

From 964e009511dbdf3b99e69d2e2d2f18ce885ac1d7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 11:34:43 -0400
Subject: [PATCH 035/423] Resolve an issue with button alignment for actions.

---
 assets/template/partials-template-style.css | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index 220c3d9e..a3294d0f 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -84,13 +84,20 @@ article.inv-list-item h2 a {
     text-align: right;
 }
 
+.partner-actions button,
+.partner-actions a.button,
+.involvement-actions button,
+.involvement-actions a.button {
+    display: inline-block;
+}
+
 .partner-list-item .partner-actions button,
 .partner-list-item .partner-actions a.button,
 .inv-list-item .involvement-actions button,
 .inv-list-item .involvement-actions a.button,
 .inv-list-item .child-involvements a {
-    position:relative;
-    z-index:10;
+    position: relative;
+    z-index: 10;
 }
 
 .partner-list-item div.post-meta-single,

From 1af9f25e1a08484f687ea568d725ce48beb75f64 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 11:36:33 -0400
Subject: [PATCH 036/423] Move Templates to override to Module.

---
 src/TouchPoint-WP/Involvement.php | 2 +-
 src/TouchPoint-WP/Partner.php     | 2 +-
 src/TouchPoint-WP/module.php      | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index ed44fa8d..77fca246 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -402,7 +402,7 @@ public static function templateFilter(string $template): string
 	{
 		if (apply_filters(TouchPointWP::HOOK_PREFIX . 'use_default_templates', true, self::class)) {
 			$postTypesToFilter        = Involvement_PostTypeSettings::getPostTypes();
-			$templateFilesToOverwrite = TouchPointWP::TEMPLATES_TO_OVERWRITE;
+			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
 			if (count($postTypesToFilter) == 0) {
 				return $template;
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 911d348a..ee799b4d 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -540,7 +540,7 @@ public static function templateFilter(string $template): string
 	{
 		if (apply_filters(TouchPointWP::HOOK_PREFIX . 'use_default_templates', true, self::class)) {
 			$postTypesToFilter        = self::POST_TYPE;
-			$templateFilesToOverwrite = TouchPointWP::TEMPLATES_TO_OVERWRITE;
+			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
 			if ( ! in_array(ltrim(strrchr($template, '/'), '/'), $templateFilesToOverwrite)) {
 				return $template;
diff --git a/src/TouchPoint-WP/module.php b/src/TouchPoint-WP/module.php
index d58a09a3..8c34d20c 100644
--- a/src/TouchPoint-WP/module.php
+++ b/src/TouchPoint-WP/module.php
@@ -16,4 +16,12 @@ interface module
 	 * @return bool
 	 */
 	public static function load(): bool;
+
+	public const TEMPLATES_TO_OVERWRITE = [
+		'archive.php',
+		'singular.php',
+		'single.php',
+		'index.php',
+		'template-canvas.php'
+	];
 }
\ No newline at end of file

From ed9a5c0a64f9f34e569a8ee466f07e7cf7679ac9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 19:11:40 -0400
Subject: [PATCH 037/423] Resolve an issue with Locations. Revisit of #113.

---
 src/TouchPoint-WP/{Utilities => }/Geo.php | 33 +++++++++++---
 src/TouchPoint-WP/Involvement.php         | 24 +++++-----
 src/TouchPoint-WP/Location.php            | 20 ++++-----
 src/TouchPoint-WP/Partner.php             | 16 +++----
 src/TouchPoint-WP/TouchPointWP.php        | 55 +++++++++++------------
 src/TouchPoint-WP/{geo.php => hasGeo.php} |  4 +-
 touchpoint-wp.php                         |  4 +-
 7 files changed, 89 insertions(+), 67 deletions(-)
 rename src/TouchPoint-WP/{Utilities => }/Geo.php (50%)
 rename src/TouchPoint-WP/{geo.php => hasGeo.php} (88%)

diff --git a/src/TouchPoint-WP/Utilities/Geo.php b/src/TouchPoint-WP/Geo.php
similarity index 50%
rename from src/TouchPoint-WP/Utilities/Geo.php
rename to src/TouchPoint-WP/Geo.php
index 618b210c..b9c7b32f 100644
--- a/src/TouchPoint-WP/Utilities/Geo.php
+++ b/src/TouchPoint-WP/Geo.php
@@ -3,14 +3,32 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP\Utilities;
+namespace tp\TouchPointWP;
+
+use stdClass;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
 
 /**
- * Utility class for geographical attributes and calculations.  Not to be confused with the geo interface.
- * @see \tp\TouchPointWP\geo
+ * A standardized set of fields for geographical information.
  */
-abstract class Geo
+class Geo extends stdClass
 {
+	public ?float $lat = null;
+	public ?float $lng = null;
+	public ?string $human = null;
+	public ?string $type = null;
+
+	public function __construct(?float $lat = null, ?float $lng = null, ?string $human = null, ?string $type = null) {
+		$this->lat = $lat;
+		$this->lng = $lng;
+		$this->human = $human;
+		$this->type = $type;
+	}
+
 	/**
 	 * Get distance between two geographic points by lat/lng pairs.  Returns a number in miles.
 	 *
@@ -28,8 +46,11 @@ public static function distance(float $latA, float $lngA, float $latB, float $ln
 		$latB_r = deg2rad($latB);
 		$lngB_r = deg2rad($lngB);
 
-		return round(3959 * acos(
+		return round(
+			3959 * acos(
 				cos($latA_r) * cos($latB_r) * cos($lngB_r - $lngA_r) + sin($latA_r) * sin($latB_r)
-		), 1);
+			),
+			1
+		);
 	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 77fca246..c42d3299 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -15,7 +15,6 @@
 	require_once "jsonLd.php";
 	require_once "updatesViaCron.php";
 	require_once "Utilities.php";
-	require_once "Utilities/Geo.php";
 	require_once "Involvement_PostTypeSettings.php";
 }
 
@@ -34,7 +33,7 @@
 /**
  * Fundamental object meant to correspond to an Involvement in TouchPoint
  */
-class Involvement implements api, updatesViaCron, geo, module
+class Involvement implements api, updatesViaCron, hasGeo, module
 {
 	use jsInstantiation;
 	use jsonLd;
@@ -1658,6 +1657,10 @@ public static function ajaxNearby(): void
 				exit;
 			}
 
+			if ($geoObj->type == "loc") {
+				$geoObj->type = "ip";
+			}
+
 			$lat = $geoObj->lat;
 			$lng = $geoObj->lng;
 
@@ -1666,6 +1669,7 @@ public static function ajaxNearby(): void
 			$geoObj = TouchPointWP::instance()->reverseGeocode($lat, $lng);
 
 			if ($geoObj !== false) {
+				$geoObj->type = "nav";
 				$r['geo'] = $geoObj;
 			}
 		}
@@ -1897,7 +1901,7 @@ public function getDistance(bool $useHiForFalse = false)
 			return $useHiForFalse ? 25000 : false;
 		}
 
-		return Utilities\Geo::distance(
+		return Geo::distance(
 			$this->geo->lat,
 			$this->geo->lng,
 			self::$compareGeo->lat,
@@ -2049,15 +2053,15 @@ public function hasGeo(): bool
 		return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null;
 	}
 
-	public function asGeoIFace(string $type = "unknown"): ?object
+	public function asGeoIFace(string $type = "unknown"): ?Geo
 	{
 		if ($this->hasGeo()) {
-			return (object)[
-				'lat'   => $this->geo->lat,
-				'lng'   => $this->geo->lng,
-				'human' => $this->name,
-				'type'  => $type
-			];
+			return new Geo(
+				$this->geo->lat,
+				$this->geo->lng,
+				$this->name,
+				$type
+			);
 		}
 
 		return null;
diff --git a/src/TouchPoint-WP/Location.php b/src/TouchPoint-WP/Location.php
index eb548e6a..ffb27c1b 100644
--- a/src/TouchPoint-WP/Location.php
+++ b/src/TouchPoint-WP/Location.php
@@ -9,14 +9,14 @@
  * A Location is generally a physical place, with an internet connection.  These likely correspond to campuses, but
  * don't necessarily need to.
  */
-class Location implements geo
+class Location implements hasGeo
 {
 	protected static ?array $_locations = null;
 
 	public string $name;
 	public ?float $lat;
 	public ?float $lng;
-	public float $radius;
+	public float $radius; // miles
 	public array $ipAddresses;
 
 	protected function __construct($data)
@@ -79,15 +79,15 @@ public function hasGeo(): bool
 		return $this->lat !== null && $this->lng !== null;
 	}
 
-	public function asGeoIFace(string $type = "unknown"): ?object
+	public function asGeoIFace(string $type = "unknown"): ?Geo
 	{
 		if ($this->hasGeo()) {
-			return (object)[
-				'lat'   => $this->lat,
-				'lng'   => $this->lng,
-				'human' => $this->name,
-				'type'  => $type
-			];
+			return new Geo(
+				$this->lat,
+				$this->lng,
+				$this->name,
+				$type
+			);
 		}
 
 		return null;
@@ -97,7 +97,7 @@ public static function getLocationForLatLng(float $lat, float $lng): ?Location
 	{
 		$locs = self::getLocations();
 		foreach ($locs as $l) {
-			$d = Utilities\Geo::distance($lat, $lng, $l->lat, $l->lng);
+			$d = Geo::distance($lat, $lng, $l->lat, $l->lng);
 			if ($d <= $l->radius) {
 				return $l;
 			}
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index ee799b4d..e3239b59 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -26,7 +26,7 @@
 /**
  * An Outreach partner, corresponding to a family in TouchPoint.
  */
-class Partner implements api, JsonSerializable, updatesViaCron, geo, module
+class Partner implements api, JsonSerializable, updatesViaCron, hasGeo, module
 {
 	use jsInstantiation {
 		jsInstantiation::enqueueForJsInstantiation as protected enqueueForJsInstantiationTrait;
@@ -1385,15 +1385,15 @@ public function hasGeo(): bool
 		return $this->geo !== null;
 	}
 
-	public function asGeoIFace(string $type = "unknown"): ?object
+	public function asGeoIFace(string $type = "unknown"): ?Geo
 	{
 		if ($this->hasGeo()) {
-			return (object)[
-				'lat'   => $this->geo->lat,
-				'lng'   => $this->geo->lng,
-				'human' => $this->name,
-				'type'  => $type
-			];
+			return new Geo(
+				$this->geo->lat,
+				$this->geo->lng,
+				$this->name,
+				$type
+			);
 		}
 
 		return null;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index d56b3bfa..f0e7aa5e 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -959,7 +959,7 @@ public function ajaxGeolocate(): void
 	/**
 	 * @param bool $useApi Set false to only use cached data, and not the IP API.
 	 *
-	 * @return stdClass|false An object with 'lat', 'lng', and 'human' attributes, if a location could be identified.
+	 * @return Geo|false An object with 'lat', 'lng', and 'human' attributes, if a location could be identified.
 	 *	 Or, false if not available.
 	 */
 	public function geolocate(bool $useApi = true, bool $includeRaw = false)
@@ -974,7 +974,7 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false)
 		$return = Location::getLocationForIP($ip);
 
 		if ($return !== null && $return->lat !== null && $return->lng !== null) {
-			return $return->asGeoIFace('ip');
+			return $return->asGeoIFace('loc');
 		}
 
 		try {
@@ -1011,24 +1011,18 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false)
 			$human = $d->city . ", " . $d->country_name;
 		}
 
+		$r = new Geo(
+			$d->latitude,
+			$d->longitude,
+			$human,
+			'ip'
+		);
+
 		if ($includeRaw) {
-			/** @see geo::asGeoIFace() */
-			return (object)[
-				'lat' => $d->latitude,
-				'lng' => $d->longitude,
-				'human' => $human,
-				'type' => 'ip',
-				'raw'  => $d
-			];
-		} else {
-			/** @see geo::asGeoIFace() */
-			return (object)[
-				'lat' => $d->latitude,
-				'lng' => $d->longitude,
-				'human' => $human,
-				'type' => 'ip'
-			];
+			$r->raw = $d;
 		}
+
+		return $r;
 	}
 
 	/**
@@ -1036,7 +1030,7 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false)
 	 * @param float   $lng Longitude
 	 * @param bool    $includeIpLoc  Whether to use IP geolocation as a fallback data source.
 	 *
-	 * @return object|false An object with a 'human' attribute, if a location could be identified. Or, false if not
+	 * @return Geo|false An object with a 'human' attribute, if a location could be identified. Or, false if not
 	 *	 available.
 	 */
 	public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true)
@@ -1050,6 +1044,13 @@ public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true
 			return $r->asGeoIFace('loc');
 		}
 
+		if ($includeIpLoc) {
+			$r = Location::getLocationForIP();
+			if ($r !== null) {
+				return $r->asGeoIFace('ip');
+			}
+		}
+
 		if ($this->settings->google_geo_api_key !== "") {
 			$reqData = [
 				'key'      => $this->settings->google_geo_api_key,
@@ -1083,16 +1084,12 @@ public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true
 					$human = $out['locality'] . ", " . $out['country_long'];
 				}
 
-				$out['human'] = $human;
-
-				return (object)$out;
-			}
-		}
-
-		if ($includeIpLoc) {
-			$r = Location::getLocationForIP();
-			if ($r !== null) {
-				return $r->asGeoIFace('loc');
+				return new Geo(
+					$out['lat'],
+					$out['lng'],
+					$human,
+					'nav',
+				);
 			}
 		}
 
diff --git a/src/TouchPoint-WP/geo.php b/src/TouchPoint-WP/hasGeo.php
similarity index 88%
rename from src/TouchPoint-WP/geo.php
rename to src/TouchPoint-WP/hasGeo.php
index 63e137cf..d70f2cc3 100644
--- a/src/TouchPoint-WP/geo.php
+++ b/src/TouchPoint-WP/hasGeo.php
@@ -13,7 +13,7 @@
 /**
  * For classes that have geographic attributes, or potential geographic attributes
  */
-interface geo
+interface hasGeo
 {
 
 	/**
@@ -31,5 +31,5 @@ public function hasGeo(): bool;
 	 *
 	 * @return object|null
 	 */
-	public function asGeoIFace(string $type = "unknown"): ?object;
+	public function asGeoIFace(string $type = "unknown"): ?Geo;
 }
\ No newline at end of file
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 1289e676..0a26ed1b 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -49,11 +49,11 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/api.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/module.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Cleanup.php";
-	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Geo.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Geo.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Taxonomies.php";
-	require_once __DIR__ . "/src/TouchPoint-WP/geo.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/hasGeo.php";
 
 	require_once __DIR__ . "/src/TouchPoint-WP/Person.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Involvement.php";

From 439c59feff5ab8a481b6dd58a0c6569c4b85effa Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 19:33:51 -0400
Subject: [PATCH 038/423] Resolve an issue with removing taxonomy terms that
 are no longer relevant.

---
 src/TouchPoint-WP/Taxonomies.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index ea5097bb..e33befc5 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -104,8 +104,10 @@ public static function insertTermsForArrayBasedTaxonomy(array $list, string $tax
 
 		// Delete any terms that are no longer current.
 		$terms = get_terms(['taxonomy' => $taxonomy, 'hide_empty' => false, 'exclude' => $existingIds]);
-		foreach ($terms as $term) {
-			wp_delete_term($term->term_id, $taxonomy);
+		if (!is_wp_error($terms)) {
+			foreach ($terms as $term) {
+				wp_delete_term($term->term_id, $taxonomy);
+			}
 		}
 	}
 
@@ -158,8 +160,10 @@ public static function insertTermsForLookupBasedTaxonomy(array $list, string $ta
 
 		// Delete any terms that are no longer current.
 		$terms = get_terms(['taxonomy' => $taxonomy, 'hide_empty' => false, 'exclude' => $existingIds]);
-		foreach ($terms as $term) {
-			wp_delete_term($term->term_id, $taxonomy);
+		if (!is_wp_error($terms)) {
+			foreach ($terms as $term) {
+				wp_delete_term($term->term_id, $taxonomy);
+			}
 		}
 	}
 
@@ -379,8 +383,10 @@ public static function insertTerms(TouchPointWP $instance)
 
 			// Delete any terms that are no longer current.
 			$terms = get_terms(['taxonomy' => self::TAX_DIV, 'hide_empty' => false, 'exclude' => $existingIds]);
-			foreach ($terms as $term) {
-				wp_delete_term($term->term_id, self::TAX_DIV);
+			if (!is_wp_error($terms)) {
+				foreach ($terms as $term) {
+					wp_delete_term($term->term_id, self::TAX_DIV);
+				}
 			}
 		}
 

From 848e5436acdf58cf78aa33aea09e206087adfba3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 17 Oct 2023 19:34:23 -0400
Subject: [PATCH 039/423] Rm Templates to overwrite, which has moved.

---
 src/TouchPoint-WP/TouchPointWP.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index f0e7aa5e..7dde6f65 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -55,14 +55,6 @@ class TouchPointWP
 	public const API_ENDPOINT_CLEANUP = "cleanup";
 	public const API_ENDPOINT_GEOLOCATE = "geolocate";
 
-	public const TEMPLATES_TO_OVERWRITE = [
-		'archive.php',
-		'singular.php',
-		'single.php',
-		'index.php',
-		'template-canvas.php'
-	];
-
 	/**
 	 * Prefix to use for all shortcodes.
 	 */

From 55edb206f36bdc9ff3a25ae135eef9570e34abb7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 18 Oct 2023 18:37:40 -0400
Subject: [PATCH 040/423] Fix an issue with sorting Involvements

---
 src/TouchPoint-WP/Involvement.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index c42d3299..a164957f 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1108,7 +1108,10 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 
 				usort($posts, [Involvement::class, 'sortPosts']);
 
-				foreach ($posts as $post) {
+				foreach ($posts as $postI) {
+					global $post;
+					$post = $postI;
+
 					$loadedPart = get_template_part('list-item', 'involvement-list-item');
 					if ($loadedPart === false) {
 						require TouchPointWP::$dir . "/src/templates/parts/involvement-list-item.php";

From 046c48834d97e7284f61ea9fad5d5377289b9558 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 18 Oct 2023 22:38:54 -0400
Subject: [PATCH 041/423] Rm unneeded loop

---
 src/TouchPoint-WP/Involvement.php | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index a164957f..253afe9e 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -571,22 +571,11 @@ public function nextMeeting(): ?DateTimeImmutable
 			// schedules
 			foreach ($this->schedules() as $s) {
 				$mdt = $s->next;
-				if ($mdt > $now) {
-					if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) {
-						$this->_nextMeeting = $mdt;
-					}
+				if ($mdt <= $now) { // If "next meeting" is past, add a week and re-check.
+					$mdt = $mdt->modify("+1 week");
 				}
-			}
-		}
-
-		// schedules + 1 week (assumes schedules are recurring weekly)
-		if ($this->_nextMeeting === null) { // really only needed if we don't have a date yet.
-			foreach ($this->schedules() as $s) {
-				$mdt = $s->next->modify("+1 week");
-				if ($mdt > $now) {
-					if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) {
-						$this->_nextMeeting = $mdt;
-					}
+				if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) {
+					$this->_nextMeeting = $mdt;
 				}
 			}
 		}

From fa3ae469ce24d848bf089e8ad053d4c4c63dadd0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 22 Oct 2023 22:46:51 -0400
Subject: [PATCH 042/423] Version bump to 1.0.0

---
 composer.json                               | 2 +-
 i18n/TouchPoint-WP.pot                      | 4 ++--
 package.json                                | 2 +-
 src/TouchPoint-WP/EventsCalendar.php        | 2 +-
 src/TouchPoint-WP/TouchPointWP.php          | 4 ++--
 src/TouchPoint-WP/TouchPointWP_Settings.php | 2 +-
 src/python/WebApi.py                        | 2 +-
 touchpoint-wp.php                           | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 595caf68..ebee13e1 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.36",
+  "version": "1.0.0",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index ca5e1494..a6df4947 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.35\n"
+"Project-Id-Version: TouchPoint WP 1.0.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-10-07T21:31:31+00:00\n"
+"POT-Creation-Date: 2023-10-19T02:39:34+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: TouchPoint-WP\n"
diff --git a/package.json b/package.json
index dfe4f2a0..0e882e0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.36",
+  "version": "1.0.0",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 5fc66a84..5ee9728d 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -19,7 +19,7 @@
  * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
  * mobile app.
  *
- * @deprecated since 0.0.36
+ * @deprecated since 1.0.0
  */
 abstract class EventsCalendar implements api, module
 {
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 7dde6f65..e894b384 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -32,7 +32,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.36";
+	public const VERSION = "1.0.0";
 
 	/**
 	 * The Token
@@ -1320,7 +1320,7 @@ public static function useTribeCalendarPro(): bool
 	 *
 	 * @return bool
 	 *
-	 * @deprecated since 0.0.36 -- Will not be necessary once mobile 3.0 exists.
+	 * @deprecated since 1.0.0 -- Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendar(): bool
 	{
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index d7d2c8bb..16ccd7be 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1483,7 +1483,7 @@ public function migrate(): void
 		}
 
 		// 0.0.31 - Add lookup IDs to ResCodes
-		// 0.0.36 - Cleanup possible duplicate terms
+		// 1.0.0 - Cleanup possible duplicate terms
 		Taxonomies::$forceTermLookupIdUpdate = true;
 
 		// Update version string
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 27956377..19c88254 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "0.0.36"
+VERSION = "1.0.0"
 
 sgContactEvName = "Contact"
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 0a26ed1b..fa2456b9 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.36
+Version:            1.0.0
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From 0c0f8ec1963ef8c9d73a1213e9c499c859861663 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 24 Oct 2023 14:49:13 -0400
Subject: [PATCH 043/423] i18n for Google Maps

---
 src/TouchPoint-WP/TouchPointWP.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index e894b384..d9631480 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -815,10 +815,11 @@ public function registerScriptsAndStyles(): void
 			true
 		);
 
+		$lang = strtolower(get_locale());
 		wp_register_script(
 			TouchPointWP::SHORTCODE_PREFIX . "googleMaps",
 			sprintf(
-				"https://maps.googleapis.com/maps/api/js?key=%s&v=3&libraries=geometry",
+				"https://maps.googleapis.com/maps/api/js?key=%s&v=3&libraries=geometry&language=$lang",
 				TouchPointWP::instance()->settings->google_maps_api_key
 			),
 			[TouchPointWP::SHORTCODE_PREFIX . "base-defer"],

From 034cb1618b1cddbf0ea3294298127c290f33ed98 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 26 Oct 2023 18:20:37 -0400
Subject: [PATCH 044/423] Resolve issue with parameter not always being
 defined.

---
 src/TouchPoint-WP/Taxonomies.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index e33befc5..f9ff8372 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -258,12 +258,16 @@ public static function getTermsClauses($clauses, $taxonomy, $args): array
 	 * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
 	 * loaded.)
 	 *
-	 * @param TouchPointWP $instance
+	 * @param ?TouchPointWP $instance
 	 *
 	 * @return void
 	 */
-	public static function insertTerms(TouchPointWP $instance)
+	public static function insertTerms(TouchPointWP $instance = null)
 	{
+		if ($instance === null) {
+			$instance = TouchPointWP::instance();
+		}
+
 		// Resident Codes
 		$types = self::getPostTypesForTaxonomy($instance, self::TAX_RESCODE);
 		if (count($types) > 0) {

From 7d5244d780fb0738fefc4b23c2bb434639509c16 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Nov 2023 16:06:32 -0400
Subject: [PATCH 045/423] JS file watchers.

---
 .idea/watcherTasks.xml | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index f9519dfe..cc2fc94a 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -22,22 +22,22 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="$/FilePathRelativeToProjectRoot$ -o build/$/FileDirRelativeToProjectRoot$/$FileNameWithoutAllExtensions$.min.js --source-map" />
+      <option name="arguments" value="cmd /c &quot;type $FilePath$&quot;" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
       <option name="fileExtension" value="js" />
       <option name="immediateSync" value="true" />
-      <option name="name" value="UglifyJS to Build" />
-      <option name="output" value="build/$/FileDirRelativeToProjectRoot$/" />
+      <option name="name" value="JS to Build (win)" />
+      <option name="output" value="$ProjectFileDir$\build\$FileDirRelativeToProjectRoot$\$FileName$" />
       <option name="outputFilters">
         <array />
       </option>
-      <option name="outputFromStdout" value="false" />
-      <option name="program" value="uglifyjs" />
+      <option name="outputFromStdout" value="true" />
+      <option name="program" value="cmd.exe" />
       <option name="runOnExternalChanges" value="true" />
       <option name="scopeName" value="Project Files" />
-      <option name="trackOnlyRoot" value="true" />
+      <option name="trackOnlyRoot" value="false" />
       <option name="workingDir" value="$ProjectFileDir$" />
       <envs />
     </TaskOptions>
@@ -46,9 +46,9 @@
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
-      <option name="fileExtension" value="js" />
+      <option name="fileExtension" value="py" />
       <option name="immediateSync" value="true" />
-      <option name="name" value="JS to Build (win)" />
+      <option name="name" value="Python to Build (win) Copy" />
       <option name="output" value="$ProjectFileDir$\build\$FileDirRelativeToProjectRoot$\$FileName$" />
       <option name="outputFilters">
         <array />
@@ -61,6 +61,26 @@
       <option name="workingDir" value="$ProjectFileDir$" />
       <envs />
     </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="$/FilePathRelativeToProjectRoot$ -o build/$/FileDirRelativeToProjectRoot$/$FileNameWithoutAllExtensions$.min.js --source-map" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="js" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="UglifyJS to Build" />
+      <option name="output" value="build/$/FileDirRelativeToProjectRoot$/" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="uglifyjs" />
+      <option name="runOnExternalChanges" value="true" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="true" />
+      <option name="workingDir" value="$ProjectFileDir$" />
+      <envs />
+    </TaskOptions>
     <TaskOptions isEnabled="false">
       <option name="arguments" value="$FileName$ -o $FileNameWithoutExtension$.min.js" />
       <option name="checkSyntaxErrors" value="true" />

From 67acd5b5be2b0eddfcdb6d1683c0a88fda44c94a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 3 Jan 2024 11:29:43 -0500
Subject: [PATCH 046/423] Converting schedule portion of schedule query to JSON
 to prepare for future changes to schedules.

---
 src/TouchPoint-WP/Involvement.php |  6 +++---
 src/python/WebApi.py              | 29 +++++++++--------------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 253afe9e..6b125d41 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -570,7 +570,7 @@ public function nextMeeting(): ?DateTimeImmutable
 
 			// schedules
 			foreach ($this->schedules() as $s) {
-				$mdt = $s->next;
+				$mdt = $s->nextStartDt;
 				if ($mdt <= $now) { // If "next meeting" is past, add a week and re-check.
 					$mdt = $mdt->modify("+1 week");
 				}
@@ -606,7 +606,7 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc
 				continue;
 			}
 
-			$dt = $s->next;
+			$dt = $s->nextStartDt;
 
 			$coInx                     = $dt->format('w-Hi');
 			$commonOccurrences[$coInx] = [
@@ -2144,7 +2144,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			// Meeting and Schedule date/time strings as DateTimeImmutables
 			foreach ($inv->schedules as $i => $s) {
 				try {
-					$s->next = new DateTimeImmutable($s->next, $siteTz);
+					$s->nextStartDt = new DateTimeImmutable($s->nextStartDt, $siteTz);
 				} catch (Exception $e) {
 					unset($inv->schedules[$i]);
 				}
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 19c88254..22aa0219 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -281,25 +281,16 @@ def get_person_info_for_sync(person_obj):
         ),
         -- pull aggregate schedules for all target organizations
         cteSchedule AS
-        (SELECT OrganizationId, STRING_AGG(sdt, ' | ') WITHIN GROUP (ORDER BY sdt ASC) AS OrgSchedule
-        FROM (
-            SELECT o.OrganizationId, CONCAT(FORMAT(os.NextMeetingDate, 'yyyy-MM-ddTHH:mm:ss'), '|S') as sdt 
+        (SELECT cto.OrganizationId, 
+            (
+            SELECT FORMAT(os.NextMeetingDate, 'yyyy-MM-ddTHH:mm:ss') as nextStartDt
             FROM dbo.OrgSchedule os WITH(NOLOCK)
                 INNER JOIN cteTargetOrgs o
                     ON os.OrganizationId = o.OrganizationId
-        ) s_agg
-        GROUP BY s_agg.OrganizationId),
-        -- pull aggregate meetings for all target organizations
-        cteMeetings AS
-        (SELECT OrganizationId, STRING_AGG(sdt, ' | ') WITHIN GROUP (ORDER BY sdt ASC) AS OrgMeetings
-        FROM (
-            SELECT o.OrganizationId, CONCAT(FORMAT(m.meetingDate, 'yyyy-MM-ddTHH:mm:ss'), '|M') as sdt 
-            FROM dbo.Meetings as m WITH(NOLOCK)
-                INNER JOIN cteTargetOrgs o
-                    ON m.OrganizationId = o.OrganizationId
-            WHERE m.meetingDate > getdate() 
-        ) m_agg
-        GROUP BY m_agg.OrganizationId),
+            WHERE cto.OrganizationId = os.OrganizationId
+            FOR JSON PATH
+            ) as OrgSchedule
+            FROM cteTargetOrgs cto),
         -- pull aggregate divisions for all target organizations
         cteDivision AS 
         (SELECT OrganizationId, STRING_AGG(divId, ',') WITHIN GROUP (ORDER BY divId ASC) AS OrgDivision
@@ -410,10 +401,8 @@ def get_person_info_for_sync(person_obj):
             g.meetings = []
 
         if g.schedules is not None:
-            # noinspection PyUnresolvedReferences
-            g.schedules = g.schedules.split(' | ')
-            for i, s in enumerate(g.schedules):
-                g.schedules[i] = {'next': s[0:19], 'type': s[20:]}
+            # noinspection PyTypeChecker
+            g.schedules = json.loads(g.schedules)
         else:
             g.schedules = []
 

From d269170d8be9ae01d9f374bed66371e95e13869a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 3 Jan 2024 23:12:01 -0500
Subject: [PATCH 047/423] API updates for Events

---
 src/python/WebApi.py | 124 +++++++++++++++++++++++++++++++------------
 1 file changed, 89 insertions(+), 35 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 22aa0219..5652be52 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -187,11 +187,17 @@ def get_person_info_for_sync(person_obj):
 
     Data.Title = "Saved Searches"
 
-if "InvsForDivs" in Data.a:
+if "Invs" in Data.a:
     apiCalled = True
 
     regex = re.compile('[^0-9,]')
     divs = regex.sub('', Data.divs)
+    if (len(divs)) < 1:
+        divs = '0'
+
+    mtgHist = -int(Data.mtgHist) if Data.mtgHist != "" else 0
+    mtgFuture = int(Data.mtgFuture) if Data.mtgFuture != "" else 365
+    featMtgs = 1 if Data.featMtgs != "" else 2  # value is directly used in SQL comparison.
 
     leadMemTypes = Data.leadMemTypes or ""
     leadMemTypes = regex.sub('', leadMemTypes)
@@ -203,7 +209,7 @@ def get_person_info_for_sync(person_obj):
         hostMemTypes = "NULL"
 
     # noinspection SqlResolve,SqlUnusedCte,SqlRedundantOrderingDirection
-    invSql = '''
+    invSql = ('''
         WITH cteTargetOrgs as
         (
         SELECT 
@@ -223,6 +229,9 @@ def get_person_info_for_sync(person_obj):
                 o.OrgPickList,
                 o.MainLeaderId,
                 o.ImageUrl,
+                o.BadgeUrl,
+                o.RegistrationMobileId,
+                o.ShowRegistrantsInMobile,
                 o.CampusId,
                 o.RegSettingXml.exist('/Settings/AskItems') AS hasRegQuestions,
                 FORMAT(o.RegStart, 'yyyy-MM-ddTHH:mm:ss') AS regStart,
@@ -230,13 +239,24 @@ def get_person_info_for_sync(person_obj):
                 FORMAT(o.FirstMeetingDate, 'yyyy-MM-ddTHH:mm:ss') AS firstMeeting,
                 FORMAT(o.LastMeetingDate, 'yyyy-MM-ddTHH:mm:ss') AS lastMeeting
         FROM dbo.Organizations o
-            WHERE o.OrganizationId = (
-                    SELECT MIN(OrgId) min
-                    FROM dbo.DivOrg do
-                    WHERE do.OrgId = o.OrganizationId
-                    AND do.DivId IN ({})
+            WHERE ( o.OrganizationId = (
+                        SELECT MIN(OrgId) min
+                        FROM dbo.DivOrg do
+                        WHERE do.OrgId = o.OrganizationId
+                        AND do.DivId IN ({0})
+                    )
+                    AND o.organizationStatusId = 30 
+                )
+            OR ( o.ShowInSites = {2} 
+                AND o.OrganizationId = (
+                        SELECT MIN(m.OrganizationId) org
+                        FROM Meetings m
+                        WHERE m.OrganizationId = o.OrganizationId
+                            AND m.MeetingDate > DATEADD(day, {3}, GETDATE())
+                            AND m.MeetingDate < DATEADD(day, {4}, GETDATE())
+                        GROUP BY m.OrganizationId
+                    )
                 )
-            AND o.organizationStatusId = 30
         ),
         -- select all members for these organizations to avoid multiple scans of Organization members table
         cteOrganizationMembers AS 
@@ -263,21 +283,39 @@ def get_person_info_for_sync(person_obj):
         (SELECT OrganizationId, STRING_AGG(ag, ',') WITHIN GROUP (ORDER BY ag ASC)  AS PeopleAge
         FROM (
         SELECT omi.OrganizationId, 
-                (CASE
-                    WHEN pi.Age > 69 THEN '70+'
-                    ELSE CONVERT(VARCHAR(2), (FLOOR(pi.Age / 10.0) * 10), 70) + 's'
-                    END) as ag 
+                (IIF(pi.Age > 69, '70+', CONVERT(VARCHAR(2), (FLOOR(pi.Age / 10.0) * 10), 70) + 's')) as ag 
             FROM cteOrganizationMembers omi
                 INNER JOIN dbo.People pi WITH(NOLOCK)
                 ON omi.PeopleId = pi.PeopleId
                         WHERE pi.Age > 19
             GROUP BY omi.OrganizationId, 
-                    (CASE
-                    WHEN pi.Age > 69 THEN '70+'
-                    ELSE CONVERT(VARCHAR(2), (FLOOR(pi.Age / 10.0) * 10), 70) + 's'
-                    END)
+                    (IIF(pi.Age > 69, '70+', CONVERT(VARCHAR(2), (FLOOR(pi.Age / 10.0) * 10), 70) + 's'))
         ) AS ag_agg
         GROUP BY ag_agg.OrganizationId       
+        ), ''' + '''
+        -- pull aggregate meetings for all target organizations
+        cteMeeting AS
+        (
+            SELECT cto.OrganizationId,
+                (
+                    SELECT om.MeetingId as mtgId,
+                        FORMAT(om.meetingDate, 'yyyy-MM-ddTHH:mm:ss') as mtgStartDt,
+                        null as mtgEndDt, -- TODO end time
+                        om.Location as location,
+                        om.Description as name,
+                        1 - om.DidNotMeet as status,
+                        om.Capacity as capacity,
+                        CAST(me.Data as INT) as parentMtgId
+                    FROM dbo.Meetings om
+                        INNER JOIN cteTargetOrgs o
+                            ON om.OrganizationId = o.OrganizationId
+                        LEFT JOIN dbo.MeetingExtra me
+                            ON om.MeetingId = me.MeetingId AND 'ParentMeeting' = me.Field
+                    WHERE om.MeetingDate > DATEADD(day, {3}, GETDATE())
+                        AND om.OrganizationId = cto.OrganizationId
+                    FOR JSON PATH, INCLUDE_NULL_VALUES 
+                ) as OrgMeetings
+            FROM cteTargetOrgs cto
         ),
         -- pull aggregate schedules for all target organizations
         cteSchedule AS
@@ -288,7 +326,7 @@ def get_person_info_for_sync(person_obj):
                 INNER JOIN cteTargetOrgs o
                     ON os.OrganizationId = o.OrganizationId
             WHERE cto.OrganizationId = os.OrganizationId
-            FOR JSON PATH
+            FOR JSON PATH, INCLUDE_NULL_VALUES 
             ) as OrgSchedule
             FROM cteTargetOrgs cto),
         -- pull aggregate divisions for all target organizations
@@ -320,7 +358,7 @@ def get_person_info_for_sync(person_obj):
                         (SELECT TOP 1 omh.PeopleId 
                         FROM dbo.OrganizationMembers omh 
                         WHERE o.OrganizationId = omh.OrganizationId 
-                        AND omh.MemberTypeId IN ({})) = ph.PeopleId
+                        AND omh.MemberTypeId IN ({1})) = ph.PeopleId
                     LEFT JOIN dbo.Families fh ON
                         ph.FamilyId = fh.FamilyId
                     LEFT JOIN dbo.AddressInfo paih ON
@@ -350,6 +388,9 @@ def get_person_info_for_sync(person_obj):
             , o.[OrgPickList]                AS [orgPickList]
             , o.[MainLeaderId]               AS [mainLeaderId]
             , o.[ImageUrl]                   AS [imageUrl]
+            , o.[BadgeUrl]                   AS [badgeUrl]
+            , o.[RegistrationMobileId]       AS [registrationMobileId]
+            , o.[ShowRegistrantsInMobile]    AS [showRegistrantsInMobile]
             , o.[hasRegQuestions]            AS [hasRegQuestions]
             , o.[regStart]                   AS [regStart]
             , o.[regEnd]                     AS [regEnd]
@@ -373,7 +414,7 @@ def get_person_info_for_sync(person_obj):
                 ON o.OrganizationId = aa.OrganizationId
             LEFT JOIN cteSchedule s
                 ON o.OrganizationId = s.OrganizationId
-            LEFT JOIN cteMeetings m
+            LEFT JOIN cteMeeting m
                 ON o.OrganizationId = m.OrganizationId
             LEFT JOIN cteDivision d
                 ON o.OrganizationId = d.OrganizationId
@@ -381,7 +422,7 @@ def get_person_info_for_sync(person_obj):
                 ON o.OrganizationId = ol.OrganizationId
             LEFT JOIN lookup.Campus c
                 ON o.CampusId = c.Id
-        ORDER BY o.parentInvId ASC, o.OrganizationId ASC'''.format(divs, hostMemTypes)
+        ORDER BY o.parentInvId ASC, o.OrganizationId ASC''').format(divs, hostMemTypes, featMtgs, mtgHist, mtgFuture)
 
     groups = model.SqlListDynamicData(invSql)
 
@@ -393,10 +434,8 @@ def get_person_info_for_sync(person_obj):
             g.divs = g.divs.split(',')
 
         if g.meetings is not None:
-            # noinspection PyUnresolvedReferences
-            g.meetings = g.meetings.split(' | ')
-            for i, s in enumerate(g.meetings):
-                g.meetings[i] = {'dt': s[0:19], 'type': s[20:]}
+            # noinspection PyTypeChecker
+            g.meetings = json.loads(g.meetings)
         else:
             g.meetings = []
 
@@ -913,11 +952,13 @@ def get_person_info_for_sync(person_obj):
 
     # Prep SQL for People Extra Values
     pevSql = ''
-    if inData.has_key('meta') and isinstance(inData['meta'], dict) and inData['meta'].has_key('pev') and len(inData['meta']['pev']) > 0:
+    if inData.has_key('meta') and isinstance(inData['meta'], dict) and inData['meta'].has_key('pev') and len(
+            inData['meta']['pev']) > 0:
         pevSql = []
         for pev in inData['meta']['pev']:
             pevSql.append("([Field] = '{}' AND [Type] = '{}')".format(pev['field'], pev['type']))
-        # noinspection SqlResolve
+
+        # noinspection SqlResolve,Annotator
         pevSql = """SELECT Field, StrValue, DateValue, Data, IntValue, BitValue, [Type],
             CONCAT('pev', SUBSTRING(CONVERT(NVARCHAR(18), HASHBYTES('MD2', CONCAT([Field], [Type])), 1), 3, 8)) Hash
             FROM PeopleExtra
@@ -931,8 +972,9 @@ def get_person_info_for_sync(person_obj):
         fevSql = []
         for fev in inData['meta']['fev']:
             fevSql.append("([Field] = '{}' AND [Type] = '{}')".format(fev['field'], fev['type']))
+
         if len(fevSql) > 0:
-            # noinspection SqlResolve
+            # noinspection SqlResolve,Annotator
             fevSql = """SELECT Field, StrValue, DateValue, Data, IntValue, BitValue, [Type],
                 CONCAT('fev', SUBSTRING(CONVERT(NVARCHAR(18), HASHBYTES('MD2', CONCAT([Field], [Type])), 1), 3, 8)) Hash
                 FROM FamilyExtra
@@ -940,10 +982,22 @@ def get_person_info_for_sync(person_obj):
         else:
             fevSql = ''
 
-    # noinspection SqlResolve
-    invSql = "SELECT om.OrganizationId iid, CONCAT('mt', mt.Id) memType, CONCAT('at', at.Id) attType, om.UserData descr FROM OrganizationMembers om LEFT JOIN lookup.MemberType mt on om.MemberTypeId = mt.Id LEFT JOIN lookup.AttendType at ON mt.AttendanceTypeId = at.Id WHERE om.Pending = 0 AND mt.Inactive = 0 AND at.Guest = 0 AND om.PeopleId = {0} AND om.OrganizationId IN ({1})"
-
-    # noinspection SqlResolve
+    # noinspection SqlResolve,Annotator
+    invSql = """SELECT om.OrganizationId iid, 
+                    CONCAT('mt', mt.Id) memType, 
+                    CONCAT('at', at.Id) attType, 
+                    om.UserData descr 
+                FROM OrganizationMembers om 
+                LEFT JOIN lookup.MemberType mt 
+                    ON om.MemberTypeId = mt.Id 
+                LEFT JOIN lookup.AttendType at 
+                    ON mt.AttendanceTypeId = at.Id 
+                WHERE om.Pending = 0 
+                    AND mt.Inactive = 0 
+                    AND at.Guest = 0 
+                    AND om.PeopleId = {0} AND om.OrganizationId IN ({1})"""
+
+    # noinspection SqlResolve,Annotator
     famGeoSql = """SELECT geo.Longitude, geo.Latitude 
     FROM AddressInfo ai LEFT JOIN Geocodes geo ON ai.FullAddress = geo.Address WHERE ai.FamilyId = {}"""
 
@@ -1032,7 +1086,6 @@ def get_person_info_for_sync(person_obj):
     Data.rules = rules  # handy for debugging
     Data.success = True
 
-
 if "report_run" in Data.a and model.HttpMethod == "post":
     apiCalled = True
 
@@ -1096,7 +1149,8 @@ def get_person_info_for_sync(person_obj):
     model.Title = "Logging out..."
     model.Header = "Logging out..."
     model.Script = "<script>document.getElementById('logoutIFrame').onload = function() { window.location = \"" + redir + "\"; }</script>"
-    print("<iframe id=\"logoutIFrame\" src=\"/Account/LogOff/\" style=\"position:absolute; top:-1000px; left:-10000px; width:2px; height:2px;\" ></iframe>")
+    print(
+        "<iframe id=\"logoutIFrame\" src=\"/Account/LogOff/\" style=\"position:absolute; top:-1000px; left:-10000px; width:2px; height:2px;\" ></iframe>")
     apiCalled = True
 
 if ("login" in Data.a or Data.r != '') and model.HttpMethod == "get":  # r parameter implies desired redir after login.
@@ -1214,8 +1268,8 @@ def get_person_info_for_sync(person_obj):
             model.Title = "Error"
             model.Header = "Something went wrong."
 
-            print("<p>Please email the following error message to <b>" + model.Setting("AdminMail",
-                                                                                       "the church staff") + "</b>.</p><pre>")
+            print("<p>Please email the following error message to <b>" +
+                  model.Setting("AdminMail", "the church staff") + "</b>.</p><pre>")
             print(response)
             print_exception()
             print("</pre>")

From 40ec8177517c5f6584b17d414845f98654ec38de Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 3 Jan 2024 23:17:54 -0500
Subject: [PATCH 048/423] typo

---
 src/TouchPoint-WP/Partner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index e3239b59..e0c72262 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -390,7 +390,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
 			// Excerpt / Summary
 			$post->post_excerpt = self::getFamEvAsContent($summaryEv, $f, null);
 
-			// Partner Category  This can't be moved to Taxonomy class because values aren't know.n.
+			// Partner Category  This can't be moved to Taxonomy class because values aren't known.
 			if ($categoryEv !== '') {
 				$category = $f->familyEV->$categoryEv->value ?? null;
 				// Insert Term if new

From e8c0e0c6347a08a93a8897d9b6bae438159c9dcb Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 4 Jan 2024 08:39:02 -0500
Subject: [PATCH 049/423] API updates.  Settings for Events.

---
 src/TouchPoint-WP/Involvement.php             | 27 ++++++----
 .../Involvement_PostTypeSettings.php          |  2 +
 src/TouchPoint-WP/TouchPointWP_Settings.php   |  6 +--
 src/templates/admin/invKoForm.php             | 10 ++++
 src/templates/meeting-archive.php             | 51 +++++++++++++++++++
 5 files changed, 84 insertions(+), 12 deletions(-)
 create mode 100644 src/templates/meeting-archive.php

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 6b125d41..d58dc941 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -560,7 +560,7 @@ public function nextMeeting(): ?DateTimeImmutable
 		if ($this->_nextMeeting === null) {
 			// meetings
 			foreach ($this->meetings() as $m) {
-				$mdt = $m->dt;
+				$mdt = $m->mtgStartDt;
 				if ($mdt > $now) {
 					if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) {
 						$this->_nextMeeting = $mdt;
@@ -622,7 +622,7 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc
 				continue;
 			}
 
-			$dt = $m->dt;
+			$dt = $m->mtgStartDt;
 
 			if ($dt < $now) {
 				continue;
@@ -2085,11 +2085,12 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		}
 
 		try {
-			$response = TouchPointWP::instance()->apiGet(
-				"InvsForDivs",
-				array_merge($qOpts, ['divs' => $divs]),
-				180
-			);
+			$qOpts['divs'] = $divs;
+			if ($typeSets->importMeetings) {
+				$qOpts['mtgHist']   = TouchPointWP::instance()->settings->mc_archive_days;
+				$qOpts['mtgFuture'] = TouchPointWP::instance()->settings->mc_future_days;
+			}
+			$response = TouchPointWP::instance()->apiGet("Invs", $qOpts, 180);
 		} catch (TouchPointWP_Exception $e) {
 			return false;
 		}
@@ -2108,6 +2109,9 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			$now       = new DateTimeImmutable(null, $siteTz);
 			$aYear     = new DateInterval('P1Y');
 			$nowPlus1Y = $now->add($aYear);
+			$histDays  = TouchPointWP::instance()->settings->mc_hist_days;
+			$histVal   = new DateInterval("P{$histDays}D");
+			$nowMinusH = $now->sub($histVal);
 			unset($aYear);
 		} catch (Exception $e) {
 			return false;
@@ -2151,7 +2155,9 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			}
 			foreach ($inv->meetings as $i => $m) {
 				try {
-					$m->dt = new DateTimeImmutable($m->dt, $siteTz);
+					$m->mtgStartDt = new DateTimeImmutable($m->mtgStartDt, $siteTz);
+					$m->mtgEndDt = ($m->mtgEndDt == null ? null :
+						new DateTimeImmutable($m->mtgEndDt, $siteTz));
 				} catch (Exception $e) {
 					unset($inv->meetings[$i]);
 				}
@@ -2183,7 +2189,10 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			// 'continue' causes involvement to be deleted (or not created).
 
 			// Filter by end dates to stay relevant
-			if ($inv->lastMeeting !== null && $inv->lastMeeting < $now) { // last meeting already happened.
+			if ($inv->lastMeeting !== null && (
+				(!$typeSets->importMeetings && $inv->lastMeeting < $now) ||
+				($typeSets->importMeetings && $inv->lastMeeting < $nowMinusH))
+			) { // last meeting was long enough ago to no longer be relevant.
 				if ($verbose) {
 					echo "<p>Stopping processing because all meetings are in the past.  Involvement will be deleted from WordPress.</p>";
 				}
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index 57dd8cfc..aa7c63d5 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -22,6 +22,7 @@
  * @property-read bool     $useImages
  * @property-read bool     $useGeo
  * @property-read bool     $hierarchical
+ * @property-read bool     $importMeetings
  * @property-read string   $groupBy
  * @property-read string[] $excludeIf
  * @property-read string[] $leaderTypes
@@ -45,6 +46,7 @@ class Involvement_PostTypeSettings
 	protected bool $useImages = false;
 	protected bool $useGeo = false;
 	protected bool $hierarchical = false;
+	protected bool $importMeetings = false;
 	protected string $groupBy = "";
 	protected array $excludeIf = [];
 	protected array $leaderTypes = [];
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 16ccd7be..cffa8560 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -69,9 +69,9 @@
  * @property-read string       ec_use_standardizing_style Whether to insert the standardizing stylesheet into mobile app requests.
  *
  * @property-read string       mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
- * @property-read string       mc_future_days     Number of days into the future to import.
- * @property-read string       mc_archive_days    Number of days to wait to move something to history.
- * @property-read string       mc_hist_days       Number of days of history to keep.
+ * @property-read int          mc_future_days     Number of days into the future to import.
+ * @property-read int          mc_archive_days    Number of days to wait to move something to history.
+ * @property-read int          mc_hist_days       Number of days of history to keep.
  * @property-read string       mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
  *
  * @property-read string       rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index a4fc25c1..759c1979 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -72,6 +72,15 @@
             </td>
         </tr>
 
+        <?php if ($this->enable_meeting_cal === "on") { ?>
+        <tr>
+            <th>
+                <label for="it-importMeetings" data-bind="attr: { for: 'it-' + slug() + '-importMeetings'}"><?php _e("Import All Meetings to Calendar", "TouchPoint-WP"); ?></label>
+            </th>
+            <td colspan="2"><input id="it-importMeetings" type="checkbox" data-bind="checked: importMeetings, attr: { id: 'it-' + slug() + '-importMeetings'}" /></td>
+        </tr>
+        <?php } ?>
+
         <tr>
             <th>
                 <label for="it-useGeo" data-bind="attr: { for: 'it-' + slug() + '-useGeo'}"><?php _e("Use Geographic Location", "TouchPoint-WP"); ?></label>
@@ -242,6 +251,7 @@ function InvType(data) {
         this.useImages = ko.observable(data.useImages ?? true);
         this.excludeIf = ko.observable(data.excludeIf ?? []);
         this.hierarchical = ko.observable(data.hierarchical ?? false);
+        this.importMeetings = ko.observable(data.importMeetings ?? false);
         this.groupBy = ko.observable(data.groupBy ?? "");
         this.leaderTypes = ko.observableArray(data.leaderTypes ?? []);
         this.hostTypes = ko.observableArray(data.hostTypes ?? []);
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
new file mode 100644
index 00000000..71721111
--- /dev/null
+++ b/src/templates/meeting-archive.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * The default template for listing meetings. This template will only be used if no more specific template is found
+ * in the Theme.
+ *
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
+ *
+ * Template Name: TouchPoint Meeting List
+ */
+
+use tp\TouchPointWP\Meeting;
+use tp\TouchPointWP\TouchPointWP;
+
+$postType = is_archive() ? get_queried_object()->name : false;
+
+get_header($postType);
+
+$description = get_the_archive_description();
+
+if (have_posts()) {
+    global $wp_query;
+
+    TouchPointWP::enqueuePartialsStyle();
+    ?>
+    <header class="archive-header has-text-align-center header-footer-group">
+        <div class="archive-header-inner section-inner medium">
+            <h1 class="archive-title page-title"><?php _ex("Events", "What Meetings should be called, plural.", 'TouchPoint-WP') ?></h1>
+            <?php echo Meeting::filterShortcode(['type' => $postType]); ?>
+            <?php if ($description) { ?>
+                <div class="archive-description"><?php echo wp_kses_post(wpautop($description)); ?></div>
+            <?php } ?>
+        </div>
+    </header>
+
+    <?php
+
+    Meeting::doMeetingList($wp_query);
+
+    wp_reset_query();
+    $taxQuery = [[]];
+    $wp_query->tax_query->queries = $taxQuery;
+    $wp_query->query_vars['tax_query'] = $taxQuery;
+    $wp_query->is_tax = false;  // prevents templates from thinking this is a taxonomy archive
+} else {
+    $loadedPart = get_template_part('list-none', 'meeting-list-none');
+    if ($loadedPart === false) {
+        require TouchPointWP::$dir . "/src/templates/parts/meeting-list-none.php";
+    }
+}
+
+get_footer();
\ No newline at end of file

From c11f0bdc2949c161b6342a7010eb089416e1b803 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 4 Jan 2024 08:39:24 -0500
Subject: [PATCH 050/423] Resolve an issue when user isn't logged in.

---
 src/TouchPoint-WP/TouchPointWP.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index d9631480..c72eb492 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -500,6 +500,10 @@ public static function currentUserIsAdmin(): bool
 			return false;
 		}
 
+		if ( ! function_exists('wp_get_current_user')) {
+			return false;
+		}
+
 		return current_user_can('manage_options');
 	}
 

From 964d9873d1da4b360c1bd5dc39408ecf7b0413ad Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 4 Jan 2024 23:10:00 -0500
Subject: [PATCH 051/423] Fix #162, I think?

---
 src/TouchPoint-WP/Involvement.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index d58dc941..eee47660 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -664,11 +664,14 @@ protected function scheduleString_calc(): ?string
 					$timeStr = substr($k, 2);
 					if ( ! in_array($timeStr, $uniqueTimeStrings, true)) {
 						$uniqueTimeStrings[] = $timeStr;
+					}
 
-						$weekday = "d" . $k[0];
-						if ( ! isset($days[$weekday])) {
-							$days[$weekday] = [];
-						}
+					$weekday = "d" . $k[0];
+					if ( ! isset($days[$weekday])) {
+						$days[$weekday] = [];
+					}
+
+					if ( ! in_array($co['example'], $days[$weekday], true)) {
 						$days[$weekday][] = $co['example'];
 					}
 				}

From 8a2e809d42d38caa01a42f8fb19f35297cfb8292 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 4 Jan 2024 23:30:48 -0500
Subject: [PATCH 052/423] Resolve an issue where filters don't work if the map
 failed to load.

---
 assets/js/base-defer.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index f33625f2..72b7b7ba 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -354,7 +354,11 @@ class TP_MapMarker
     }
 
     get inBounds() {
-        return this.gMkr.getMap().getBounds().contains(this.gMkr.getPosition());
+        let map = this.gMkr.getMap();
+        if (!map) { // if map failed to render for some reason, this prevents entries from being hidden.
+            return true;
+        }
+        return map.getBounds().contains(this.gMkr.getPosition());
     }
 
     get useIcon() {

From 5ad2f0180bd60872288275a6158eecdc0cadbd76 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 5 Jan 2024 09:45:23 -0500
Subject: [PATCH 053/423] Moving meta key; php 8 syntax

---
 src/TouchPoint-WP/Involvement.php  | 14 ++++++--------
 src/TouchPoint-WP/Partner.php      |  3 ++-
 src/TouchPoint-WP/Person.php       |  2 +-
 src/TouchPoint-WP/TouchPointWP.php |  7 ++++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index eee47660..7c5e3c50 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -86,8 +86,6 @@ class Involvement implements api, updatesViaCron, hasGeo, module
 	public string $post_excerpt;
 	protected WP_Post $post;
 
-	public const INVOLVEMENT_META_KEY = TouchPointWP::SETTINGS_PREFIX . "invId";
-
 	public object $attributes;
 	protected array $divisions;
 
@@ -107,7 +105,7 @@ protected function __construct(object $object)
 			// WP_Post Object
 			$this->post    = $object;
 			$this->name    = $object->post_title;
-			$this->invId   = intval($object->{self::INVOLVEMENT_META_KEY});
+			$this->invId   = intval($object->{TouchPointWP::INVOLVEMENT_META_KEY});
 			$this->post_id = $object->ID;
 			$this->invType = get_post_type($this->post_id);
 
@@ -1136,7 +1134,7 @@ private static function getWpPostByInvolvementId($postType, $involvementId)
 
 		$q      = new WP_Query([
 								   'post_type'   => $postType,
-								   'meta_key'    => self::INVOLVEMENT_META_KEY,
+								   'meta_key'    => TouchPointWP::INVOLVEMENT_META_KEY,
 								   'meta_value'  => $involvementId,
 								   'numberposts' => 2
 								   // only need one, but if there's two, there should be an error condition.
@@ -1551,7 +1549,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 	 */
 	public static function fromPost(WP_Post $post): Involvement
 	{
-		$iid = intval($post->{self::INVOLVEMENT_META_KEY});
+		$iid = intval($post->{TouchPointWP::INVOLVEMENT_META_KEY});
 
 		if ( ! isset(self::$_instances[$iid])) {
 			self::$_instances[$iid] = new Involvement($post);
@@ -2270,7 +2268,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 						'post_type'  => $typeSets->postType,
 						'post_name'  => $titleToUse,
 						'meta_input' => [
-							self::INVOLVEMENT_META_KEY => $inv->involvementId
+							TouchPointWP::INVOLVEMENT_META_KEY => $inv->involvementId
 						]
 					]
 				);
@@ -2288,7 +2286,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			}
 
 			/** @var $post WP_Post */
-			if ($inv->description == null || trim($inv->description) == "") {
+			if ($inv->description == null || trim($inv->description) === "") {
 				$post->post_content = null;
 			} else {
 				$post->post_content = Utilities::standardizeHtml($inv->description, "involvement-import");
@@ -2585,7 +2583,7 @@ public static function filterPublishDate($theDate, $format, $post = null): strin
 				$post = get_post($post);
 			}
 
-			$theDate = self::scheduleString(intval($post->{self::INVOLVEMENT_META_KEY})) ?? "";
+			$theDate = self::scheduleString(intval($post->{TouchPointWP::INVOLVEMENT_META_KEY})) ?? "";
 		}
 
 		return $theDate;
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index e0c72262..bf933d01 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -18,6 +18,7 @@
 
 use Exception;
 use JsonSerializable;
+use stdClass;
 use WP_Error;
 use WP_Post;
 use WP_Query;
@@ -81,7 +82,7 @@ class Partner implements api, JsonSerializable, updatesViaCron, hasGeo, module
 	 */
 	protected function __construct(object $object)
 	{
-		$this->attributes = (object)[];
+		$this->attributes = new stdClass();
 
 		if (gettype($object) === "object" && get_class($object) == WP_Post::class) {
 			// WP_Post Object
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index c6f9aa57..eecd2e44 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -707,7 +707,7 @@ protected static function updateFromTouchPoint(bool $verbose = false)
 
 				// Get the InvIds for the Involvement Type's Posts
 				$postType = $type->postTypeWithPrefix();
-				$key      = Involvement::INVOLVEMENT_META_KEY;
+				$key      = TouchPointWP::INVOLVEMENT_META_KEY;
 				global $wpdb;
 				/** @noinspection SqlResolve */
 				$sql = "SELECT pm.meta_value AS iid
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index c72eb492..b551dfee 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -91,6 +91,10 @@ class TouchPointWP
 	public const CACHE_NONE = 20;
 	private static int $cacheLevel = self::CACHE_PUBLIC;
 
+
+	public const INVOLVEMENT_META_KEY = TouchPointWP::SETTINGS_PREFIX . "invId";
+
+
 	/**
 	 * @var string Used for imploding arrays together in human-friendly formats.
 	 */
@@ -673,9 +677,6 @@ public static function load($file): TouchPointWP
 
 		// Load Involvements tool if enabled.
 		if ($instance->settings->enable_involvements === "on") {
-			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-				require_once 'Involvement.php';
-			}
 			$instance->involvements = Involvement::load();
 		}
 

From 95cb7859ddd1ee7cb4f7a3d21d53bec582b439e5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 6 Jan 2024 19:24:35 -0500
Subject: [PATCH 054/423] Month calendar grid function

---
 src/TouchPoint-WP/Meeting.php | 79 +++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 5810a997..f8e77db2 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -66,6 +66,85 @@ public static function api(array $uri): bool
 		return false;
 	}
 
+	/**
+	 * Print a calendar grid for a given month and year.
+	 *
+	 * @param WP_Query $q
+	 * @param int|null $month
+	 * @param int|null $year
+	 *
+	 * @return void
+	 */
+	public static function printCalendarGrid(WP_Query $q, int $month = null, int $year = null)
+	{
+		try {
+			// Validate month & year; create $d as a day within the month
+			$tz = wp_timezone();
+			if ($month < 1 || $month > 12 || $year < 2020 || $year > 2100) {
+				$d = new DateTime('now', $tz);
+				$d = new DateTime($d->format('Y-m-01'), $tz);
+			} else {
+				$d = new DateTime("$year-$month-01", $tz);
+			}
+		} catch (Exception $e) {
+			echo "<!-- Could not create calendar grid because an exception occurred. -->";
+			return;
+		}
+
+		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
+		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
+		$d->modify("-$offsetDays days");
+
+		// Create a table to display the calendar
+		echo '<table>'; // TODO 1i18n
+		echo '<tr><th>Sun</th><th>Mon</th><th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>';
+
+		$isMonthBefore = ($offsetDays !== 0);
+		$isMonthAfter = false;
+		$aDay = new DateInterval("P1D");
+
+		// Loop through the days of the month
+		do {
+			$cellClass = "";
+			if ($isMonthBefore) {
+				$cellClass = "before";
+			} elseif ($isMonthAfter) {
+				$cellClass = "after";
+			}
+
+			$day = $d->format("j");
+			$wd =  $d->format("w");
+
+			if ($wd === '0') {
+				echo "<tr>";
+			}
+
+			// Print the cell
+			echo "<td class=\"$cellClass\">";
+			echo "<span class=\"calDay\">$day</span>";
+			// TODO print items
+			echo "</td>";
+
+			if ($wd === '6') {
+				echo "</tr>";
+			}
+
+			// Increment days
+			$mo1 = $d->format('n');
+			$d->add($aDay);
+			$mo2 = $d->format('n');
+
+			if ($mo1 !== $mo2) {
+				if ($isMonthBefore) {
+					$isMonthBefore = false;
+				} else {
+					$isMonthAfter = true;
+				}
+			}
+		} while (!$isMonthAfter || $d->format('w') !== '0');
+		echo '</table>';
+	}
+
 	/**
 	 * @param $opts
 	 *

From cd0920536033a9cc0673029c2cec9522cc9ed119 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 17 Jan 2024 14:50:38 -0500
Subject: [PATCH 055/423] Moving function related to translation to a separate
 class.

---
 src/TouchPoint-WP/Utilities/Translation.php | 52 +++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/TouchPoint-WP/Utilities/Translation.php

diff --git a/src/TouchPoint-WP/Utilities/Translation.php b/src/TouchPoint-WP/Utilities/Translation.php
new file mode 100644
index 00000000..6447b5ae
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/Translation.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+use tp\TouchPointWP\TouchPointWP;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+/**
+ * Used for Translation management.
+ */
+abstract class Translation {
+
+	/**
+	 * Determine whether campuses should be used as a "language" field.
+	 *
+	 * @return bool
+	 */
+	public static function useCampusAsLanguage(): bool{
+		$cName = TouchPointWP::instance()->settings->camp_name_singular;
+		return strtolower($cName) == "language";
+	}
+
+	/**
+	 * Take a string and return the language code that it matches.  Null if no match or WPML isn't enabled.
+	 *
+	 * @param string $string
+	 *
+	 * @return string|null
+	 */
+	public static function getWpmlLangCodeForString(string $string): ?string
+	{
+		if (!defined("ICL_LANGUAGE_CODE")) {
+			return null;
+		}
+
+		global $wpdb;
+
+		$lang_code_query = "
+			SELECT language_code
+			FROM {$wpdb->prefix}icl_languages_translations
+			WHERE name = %s OR language_code = %s
+		";
+
+		return $wpdb->get_var($wpdb->prepare($lang_code_query, $string, $string));
+	}
+}
\ No newline at end of file

From 1e25defcac623d62992eba774fdbf5fc9af8b849 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 17 Jan 2024 14:51:46 -0500
Subject: [PATCH 056/423] Adding a function for now+1y because that's common
 enough.

---
 src/TouchPoint-WP/Utilities.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 8853c6cf..fa965942 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -5,6 +5,7 @@
 
 namespace tp\TouchPointWP;
 
+use DateInterval;
 use DateTimeImmutable;
 use DateTimeInterface;
 use Exception;
@@ -54,7 +55,21 @@ public static function dateTimeNow(): DateTimeImmutable
 		return self::$_dateTimeNow;
 	}
 
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public static function dateTimeNowPlus1Y(): DateTimeImmutable
+	{
+		if (self::$_dateTimeNowPlus1Y === null) {
+			$aYear                    = new DateInterval('P1Y');
+			self::$_dateTimeNowPlus1Y = self::dateTimeNow()->add($aYear);
+		}
+
+		return self::$_dateTimeNowPlus1Y;
+	}
+
 	private static ?DateTimeImmutable $_dateTimeNow = null;
+	private static ?DateTimeImmutable $_dateTimeNowPlus1Y = null;
 
 	/**
 	 * Gets the plural form of a weekday name.
@@ -391,10 +406,10 @@ public static function getAllHeaders(): array
 	 * @param string|null $newUrl
 	 * @param string      $title
 	 *
-	 * @return void
+	 * @return int|string The attachmentId for the image.  Can be reused for other posts.
 	 * @since 0.0.24
 	 */
-	public static function updatePostImageFromUrl(int $postId, ?string $newUrl, string $title): void
+	public static function updatePostImageFromUrl(int $postId, ?string $newUrl, string $title)
 	{
 		// Required for image handling
 		require_once(ABSPATH . 'wp-admin/includes/media.php');
@@ -434,7 +449,13 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 		} catch (Exception $e) {
 			echo "Exception occurred: " . $e->getMessage();
 			wp_delete_attachment($attId, true);
+			return 0;
+		}
+		if (is_wp_error($attId)) {
+			echo "Exception occurred: " . $attId->get_error_message();
+			return 0;
 		}
+		return $attId;
 	}
 
 	/**

From e6bd5e30761c8ce1a12e07bd2898c5ed8021ebe4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 22 Jan 2024 15:00:41 -0500
Subject: [PATCH 057/423] Allowing standardizeHtml to take a null input
 (converting it to a blank)

---
 src/TouchPoint-WP/Utilities.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index fa965942..3f42ed54 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -508,13 +508,17 @@ public static function standardizeHTags(int $maxAllowed, string $input): string
 	}
 
 	/**
-	 * @param string  $html The HTML to be standardized.
+	 * @param ?string  $html The HTML to be standardized.
 	 * @param ?string $context A context string to pass to hooks.
 	 *
 	 * @return string
 	 */
-	public static function standardizeHtml(string $html, ?string $context = null): string
+	public static function standardizeHtml(?string $html, ?string $context = null): string
 	{
+		if ($html === null) {
+			$html = "";
+		}
+
 		// The tp_standardize_html filter would completely replace the pre-defined process.
 		$o = apply_filters(TouchPointWP::HOOK_PREFIX . 'standardize_html', $html, $context);
 		if ($o !== $html) {

From c633e5c4927549be57baa2806f2dd84d0b98c85e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 22 Jan 2024 21:43:04 -0500
Subject: [PATCH 058/423] standards compliance for php 8

---
 src/TouchPoint-WP/Report.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 29f98c80..7312ecfb 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -352,7 +352,7 @@ public function getPost(bool $create = false): ?WP_Post
 				new TouchPointWP_Exception("Multiple Posts Exist", 170006);
 			}
 			if ($counts > 0) { // post exists already.
-				$this->post = $reportPosts[0];
+				$this->post = reset($reportPosts);
 			} elseif ($create) {
 				$postId = wp_insert_post([
 					'post_type'   => self::POST_TYPE,
@@ -602,9 +602,9 @@ public static function updateCron(): void
 	/**
 	 * Handle which data should be converted to JSON.  Used for posting to the API.
 	 *
-	 * @return mixed data which can be serialized by json_encode
+	 * @return array data which can be serialized by json_encode
 	 */
-	public function jsonSerialize()
+	public function jsonSerialize(): array
 	{
 		return [
 			'name' => $this->name,

From d39d06edd84a0806a3a2937759393aaf2b53a91c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 7 Feb 2024 11:12:31 -0500
Subject: [PATCH 059/423] Rename phpdoc.xml.  Closes #167.

---
 phpdoc.xml => phpdoc.dist.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename phpdoc.xml => phpdoc.dist.xml (100%)

diff --git a/phpdoc.xml b/phpdoc.dist.xml
similarity index 100%
rename from phpdoc.xml
rename to phpdoc.dist.xml

From 217da3d05f59db02f91a80cc299eb8258e0478a5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Feb 2024 21:22:18 -0500
Subject: [PATCH 060/423] Improving links to docs and such in the plugin
 listing.

---
 i18n/TouchPoint-WP-es_ES.po        | 110 +++++++++++++++++-----------
 i18n/TouchPoint-WP.pot             | 114 ++++++++++++++++++-----------
 src/TouchPoint-WP/TouchPointWP.php |  70 ++++++++++++++++++
 src/TouchPoint-WP/Utilities.php    |   2 +-
 touchpoint-wp.php                  |   1 +
 5 files changed, 212 insertions(+), 85 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 05653e47..b2143829 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -118,13 +118,13 @@ msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:179
 #: src/TouchPoint-WP/Involvement.php:1445
-#: src/TouchPoint-WP/TouchPointWP.php:1445
+#: src/TouchPoint-WP/TouchPointWP.php:1515
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:183
 #: src/TouchPoint-WP/Involvement.php:1471
-#: src/TouchPoint-WP/TouchPointWP.php:1527
+#: src/TouchPoint-WP/TouchPointWP.php:1597
 msgid "Time of Day"
 msgstr "Hora del día"
 
@@ -133,7 +133,7 @@ msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
 #: src/templates/admin/invKoForm.php:191
-#: src/TouchPoint-WP/TouchPointWP.php:1581
+#: src/TouchPoint-WP/TouchPointWP.php:1651
 msgid "Age Group"
 msgstr "Grupo de edad"
 
@@ -303,38 +303,38 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2431
+#: src/TouchPoint-WP/TouchPointWP.php:2501
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2488
+#: src/TouchPoint-WP/TouchPointWP.php:2558
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2491
+#: src/TouchPoint-WP/TouchPointWP.php:2561
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2494
+#: src/TouchPoint-WP/TouchPointWP.php:2564
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2499
-#: src/TouchPoint-WP/TouchPointWP.php:2500
+#: src/TouchPoint-WP/TouchPointWP.php:2569
+#: src/TouchPoint-WP/TouchPointWP.php:2570
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2628
-#: src/TouchPoint-WP/TouchPointWP.php:2668
+#: src/TouchPoint-WP/TouchPointWP.php:2698
+#: src/TouchPoint-WP/TouchPointWP.php:2738
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2636
-#: src/TouchPoint-WP/TouchPointWP.php:2675
+#: src/TouchPoint-WP/TouchPointWP.php:2706
+#: src/TouchPoint-WP/TouchPointWP.php:2745
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2795
+#: src/TouchPoint-WP/TouchPointWP.php:2865
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -973,7 +973,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2736
+#: src/TouchPoint-WP/TouchPointWP.php:2806
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1029,7 +1029,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: src/TouchPoint-WP/Involvement.php:1493
-#: src/TouchPoint-WP/TouchPointWP.php:1620
+#: src/TouchPoint-WP/TouchPointWP.php:1690
 msgid "Marital Status"
 msgstr "Estado civil"
 
@@ -1289,17 +1289,17 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:91
-#: src/TouchPoint-WP/TouchPointWP.php:940
+#: src/TouchPoint-WP/TouchPointWP.php:1010
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
 #: src/TouchPoint-WP/Meeting.php:119
-#: src/TouchPoint-WP/TouchPointWP.php:369
+#: src/TouchPoint-WP/TouchPointWP.php:439
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
 #: src/TouchPoint-WP/Meeting.php:129
-#: src/TouchPoint-WP/TouchPointWP.php:378
+#: src/TouchPoint-WP/TouchPointWP.php:448
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
@@ -1312,64 +1312,64 @@ msgstr "Tipo de publicación no válida."
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1252
+#: src/TouchPoint-WP/TouchPointWP.php:1322
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1305
+#: src/TouchPoint-WP/TouchPointWP.php:1375
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1357
+#: src/TouchPoint-WP/TouchPointWP.php:1427
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1444
+#: src/TouchPoint-WP/TouchPointWP.php:1514
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1445
+#: src/TouchPoint-WP/TouchPointWP.php:1515
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1482
+#: src/TouchPoint-WP/TouchPointWP.php:1552
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1483
+#: src/TouchPoint-WP/TouchPointWP.php:1553
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1483
+#: src/TouchPoint-WP/TouchPointWP.php:1553
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1526
+#: src/TouchPoint-WP/TouchPointWP.php:1596
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1527
+#: src/TouchPoint-WP/TouchPointWP.php:1597
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1580
+#: src/TouchPoint-WP/TouchPointWP.php:1650
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1581
+#: src/TouchPoint-WP/TouchPointWP.php:1651
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1619
+#: src/TouchPoint-WP/TouchPointWP.php:1689
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1620
+#: src/TouchPoint-WP/TouchPointWP.php:1690
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1664
+#: src/TouchPoint-WP/TouchPointWP.php:1734
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1378,32 +1378,32 @@ msgid "Import campuses as a taxonomy. (You probably want to do this if you're mu
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1225
+#: src/TouchPoint-WP/TouchPointWP.php:1295
 msgid "Search %s"
 msgstr "Buscar %s"
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1227
+#: src/TouchPoint-WP/TouchPointWP.php:1297
 msgid "All %s"
 msgstr "Todos los %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1229
+#: src/TouchPoint-WP/TouchPointWP.php:1299
 msgid "Edit %s"
 msgstr "Editar %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1231
+#: src/TouchPoint-WP/TouchPointWP.php:1301
 msgid "Update %s"
 msgstr "Actualizar %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1233
+#: src/TouchPoint-WP/TouchPointWP.php:1303
 msgid "Add New %s"
 msgstr "Agregar Nuevo %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1235
+#: src/TouchPoint-WP/TouchPointWP.php:1305
 msgid "New %s"
 msgstr "Nuevo %s"
 
@@ -1420,7 +1420,7 @@ msgstr "Informe de TouchPoint"
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:274
+#: src/TouchPoint-WP/TouchPointWP.php:279
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
@@ -1474,3 +1474,31 @@ msgstr "Contacto bloqueado por spam."
 #: src/TouchPoint-WP/Person.php:1541
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
+
+#: src/TouchPoint-WP/TouchPointWP.php:309
+msgctxt "Explanation for the sandwich emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "Sandwiches (probably cheesesteaks)"
+msgstr "Sándwiches (probablemente cheesesteaks)"
+
+#: src/TouchPoint-WP/TouchPointWP.php:310
+msgctxt "Explanation for the heart emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "love. obviously."
+msgstr "amar. obviamente."
+
+#: src/TouchPoint-WP/TouchPointWP.php:311
+msgctxt "Explanation for the pretzel emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "Soft Pretzels"
+msgstr "pretzels suaves"
+
+#: src/TouchPoint-WP/TouchPointWP.php:312
+msgctxt "Explanation for the Donut emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "Donuts (preferably Federal)"
+msgstr "Donuts (preferiblemente de Federal)"
+
+#: src/TouchPoint-WP/TouchPointWP.php:320
+msgid "Made with %s in Philly by Tenth"
+msgstr "Hecho con %s en Filadelfia por Tenth"
+
+#: src/TouchPoint-WP/TouchPointWP.php:344
+msgid "Documentation"
+msgstr "Documentación"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index a748c21d..1384f1bb 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,9 +9,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-02-07T14:00:10+00:00\n"
+"POT-Creation-Date: 2024-02-09T02:18:05+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.8.1\n"
+"X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: TouchPoint-WP\n"
 
 #. Plugin Name of the plugin
@@ -149,13 +149,13 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:179
 #: src/TouchPoint-WP/Involvement.php:1445
-#: src/TouchPoint-WP/TouchPointWP.php:1445
+#: src/TouchPoint-WP/TouchPointWP.php:1515
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:183
 #: src/TouchPoint-WP/Involvement.php:1471
-#: src/TouchPoint-WP/TouchPointWP.php:1527
+#: src/TouchPoint-WP/TouchPointWP.php:1597
 msgid "Time of Day"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgid "Prevailing Marital Status"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:191
-#: src/TouchPoint-WP/TouchPointWP.php:1581
+#: src/TouchPoint-WP/TouchPointWP.php:1651
 msgid "Age Group"
 msgstr ""
 
@@ -337,7 +337,7 @@ msgid "Language"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1493
-#: src/TouchPoint-WP/TouchPointWP.php:1620
+#: src/TouchPoint-WP/TouchPointWP.php:1690
 msgid "Marital Status"
 msgstr ""
 
@@ -451,17 +451,17 @@ msgid "Contact Prohibited."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:91
-#: src/TouchPoint-WP/TouchPointWP.php:940
+#: src/TouchPoint-WP/TouchPointWP.php:1010
 msgid "Only GET requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:119
-#: src/TouchPoint-WP/TouchPointWP.php:369
+#: src/TouchPoint-WP/TouchPointWP.php:439
 msgid "Only POST requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:129
-#: src/TouchPoint-WP/TouchPointWP.php:378
+#: src/TouchPoint-WP/TouchPointWP.php:448
 msgid "Invalid data provided."
 msgstr ""
 
@@ -522,137 +522,165 @@ msgstr ""
 msgid "RSVP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:274
+#: src/TouchPoint-WP/TouchPointWP.php:279
 msgid "Every 15 minutes"
 msgstr ""
 
+#: src/TouchPoint-WP/TouchPointWP.php:309
+msgctxt "Explanation for the sandwich emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "Sandwiches (probably cheesesteaks)"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:310
+msgctxt "Explanation for the heart emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "love. obviously."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:311
+msgctxt "Explanation for the pretzel emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "Soft Pretzels"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:312
+msgctxt "Explanation for the Donut emoji in \"Made with (emoji) in Philly by Tenth\""
+msgid "Donuts (preferably Federal)"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:320
+msgid "Made with %s in Philly by Tenth"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:344
+msgid "Documentation"
+msgstr ""
+
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1225
+#: src/TouchPoint-WP/TouchPointWP.php:1295
 msgid "Search %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1227
+#: src/TouchPoint-WP/TouchPointWP.php:1297
 msgid "All %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1229
+#: src/TouchPoint-WP/TouchPointWP.php:1299
 msgid "Edit %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1231
+#: src/TouchPoint-WP/TouchPointWP.php:1301
 msgid "Update %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1233
+#: src/TouchPoint-WP/TouchPointWP.php:1303
 msgid "Add New %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1235
+#: src/TouchPoint-WP/TouchPointWP.php:1305
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1252
+#: src/TouchPoint-WP/TouchPointWP.php:1322
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1305
+#: src/TouchPoint-WP/TouchPointWP.php:1375
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1357
+#: src/TouchPoint-WP/TouchPointWP.php:1427
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1444
+#: src/TouchPoint-WP/TouchPointWP.php:1514
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1445
+#: src/TouchPoint-WP/TouchPointWP.php:1515
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1482
+#: src/TouchPoint-WP/TouchPointWP.php:1552
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1483
+#: src/TouchPoint-WP/TouchPointWP.php:1553
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1483
+#: src/TouchPoint-WP/TouchPointWP.php:1553
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1526
+#: src/TouchPoint-WP/TouchPointWP.php:1596
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1527
+#: src/TouchPoint-WP/TouchPointWP.php:1597
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1580
+#: src/TouchPoint-WP/TouchPointWP.php:1650
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1581
+#: src/TouchPoint-WP/TouchPointWP.php:1651
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1619
+#: src/TouchPoint-WP/TouchPointWP.php:1689
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1620
+#: src/TouchPoint-WP/TouchPointWP.php:1690
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1664
+#: src/TouchPoint-WP/TouchPointWP.php:1734
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2431
+#: src/TouchPoint-WP/TouchPointWP.php:2501
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2488
+#: src/TouchPoint-WP/TouchPointWP.php:2558
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2491
+#: src/TouchPoint-WP/TouchPointWP.php:2561
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2494
+#: src/TouchPoint-WP/TouchPointWP.php:2564
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2499
-#: src/TouchPoint-WP/TouchPointWP.php:2500
+#: src/TouchPoint-WP/TouchPointWP.php:2569
+#: src/TouchPoint-WP/TouchPointWP.php:2570
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2628
-#: src/TouchPoint-WP/TouchPointWP.php:2668
+#: src/TouchPoint-WP/TouchPointWP.php:2698
+#: src/TouchPoint-WP/TouchPointWP.php:2738
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2636
-#: src/TouchPoint-WP/TouchPointWP.php:2675
+#: src/TouchPoint-WP/TouchPointWP.php:2706
+#: src/TouchPoint-WP/TouchPointWP.php:2745
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2736
+#: src/TouchPoint-WP/TouchPointWP.php:2806
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2795
+#: src/TouchPoint-WP/TouchPointWP.php:2865
 msgid "People Query Failed"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index e2ccd442..c16de330 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -39,6 +39,9 @@ class TouchPointWP
 	 * The Token
 	 */
 	public const TOKEN = "TouchPointWP";
+	public const SLUG = "touchpoint-wp";
+
+	public const DOCS_URL = "https://github.com/TenthPres/TouchPoint-WP/wiki";
 
 	/**
 	 * API Endpoint prefix, and specific endpoints.  All must be lower-case.
@@ -258,6 +261,8 @@ protected function __construct(string $file = '')
 
 		add_filter('cron_schedules', [self::class, 'cronAdd15Minutes']);
 
+		add_filter('plugin_row_meta', [self::class, 'pluginRowMeta'], 10, 3);
+
 		self::scheduleCleanup();
 	}
 
@@ -277,6 +282,71 @@ public static function cronAdd15Minutes($schedules)
 		return $schedules;
 	}
 
+	/**
+	 * Adjust the meta info in the Plugin list with better information.
+	 *
+	 * @param $pluginMeta array The links and stuff that gets joined by pipes.
+	 * @param $pluginFile string Not used here, but points to the root plugin file.
+	 * @param $pluginData array metadata from the plugin header.
+	 *
+	 * @return array
+	 * @noinspection PhpUnusedParameterInspection
+	 */
+	public static function pluginRowMeta(array $pluginMeta, string $pluginFile, array $pluginData): array
+	{
+		if ($pluginData['slug'] === self::SLUG) {
+
+			// Remove default View Details link.
+			foreach ($pluginMeta as $k => $m) {
+				if (str_contains($m, 'plugin-install.php?tab=plugin-information') ||
+				    str_contains($m, 'github.com/jkrrv')) {
+					unset($pluginMeta[$k]);
+				}
+			}
+
+			// Made with X in Philly by Tenth
+			$madeWidths = [
+				"🥪" => _x("Sandwiches (probably cheesesteaks)", "Explanation for the sandwich emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
+				"❤️" => _x("love. obviously.", "Explanation for the heart emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
+				"🥨" => _x("Soft Pretzels", "Explanation for the pretzel emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
+				"🍩" => _x("Donuts (preferably Federal)", "Explanation for the Donut emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
+			];
+			$madeWidthK = array_rand($madeWidths);
+			/** @noinspection HtmlUnknownTarget */
+			$pluginMeta[] = sprintf(
+				'<a href="%s" target="_blank">%s</a>',
+				"https://www.tenth.org/tech/wp",
+				sprintf(
+					__("Made with %s in Philly by Tenth", "TouchPoint-WP"),
+					sprintf(
+						'<span title="%s">%s</span>',
+						$madeWidths[$madeWidthK],
+						$madeWidthK
+					)
+			    )
+			);
+
+			// View details link
+			// note for i18n: these deliberately don't have the domain in order to use the WordPress defaults.
+			/** @noinspection HtmlUnknownTarget */
+			$pluginMeta[] = sprintf(
+				'<a href="%s" target="_blank" aria-label="%s">%s</a>',
+				$pluginData['PluginURI'],
+				esc_attr(sprintf(__('More information about %s'), $pluginData['Name'])),
+				__('View details')
+			);
+
+			// Documentation link
+			/** @noinspection HtmlUnknownTarget */
+			$pluginMeta[] = sprintf(
+				'<a href="%s" target="_blank">%s</a>',
+				self::DOCS_URL,
+				__('Documentation', "TouchPoint-WP")
+			);
+		}
+		return $pluginMeta;
+	}
+
 	/**
 	 * Find and replace links to /pyscript with their more functional brother, /PyScript.  That small typo makes bad
 	 * things happen.
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index c40a2192..ad937842 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -626,7 +626,7 @@ public static function checkForUpdate(): ?object
 
 		return (object)[
 			'id'            => 'touchpoint-wp/touchpoint-wp.php',
-			'slug'          => 'touchpoint-wp',
+			'slug'          => TouchPointWP::SLUG,
 			'plugin'        => 'touchpoint-wp/touchpoint-wp.php',
 			'new_version'   => $newV,
 			'url'           => 'https://github.com/TenthPres/TouchPoint-WP/',
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index c23ced2c..2a834854 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -23,6 +23,7 @@
 Tested up to:       6.2
 Requires PHP:       7.4
 Release Asset:      true
+Domain Path:        /i18n
 */
 
 namespace tp\TouchPointWP;

From 9c1be9267b1abc41179b2da99e6622ffd5dac368 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Feb 2024 22:35:39 -0500
Subject: [PATCH 061/423] Correct an issue with unset values

---
 src/TouchPoint-WP/TouchPointWP.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index c16de330..6a41218d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -294,7 +294,7 @@ public static function cronAdd15Minutes($schedules)
 	 */
 	public static function pluginRowMeta(array $pluginMeta, string $pluginFile, array $pluginData): array
 	{
-		if ($pluginData['slug'] === self::SLUG) {
+		if (isset($pluginData['slug']) && $pluginData['slug'] === self::SLUG) {
 
 			// Remove default View Details link.
 			foreach ($pluginMeta as $k => $m) {
@@ -2786,12 +2786,12 @@ private static function parseApiResponse($response)
 		// Most likely the issue where a module import failed for no apparent reason.
 		if (property_exists($respDecoded, 'output') &&
 		    strpos($respDecoded->output, "Traceback (most recent call last):") === 0) {
-			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001);
+			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001, null, $response);
 		}
 
 		// Some other script error
 		if (property_exists($respDecoded, 'output') && $respDecoded->output !== '') {
-			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179002);
+			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179002, null, $response);
 		}
 
 		// Error caught by error handling within Python script

From f64a1296b6c12166e2d772acd6a2f5a16aa34d58 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Feb 2024 22:37:51 -0500
Subject: [PATCH 062/423] Better error reporting for API issues Correcting some
 @since tags

---
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php  | 12 ++++++++++--
 src/TouchPoint-WP/TouchPointWP_Exception.php |  7 ++++---
 src/TouchPoint-WP/TouchPointWP_Settings.php  |  6 +++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 4f1b7706..63f152dd 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -484,13 +484,21 @@ private static function getTpFilenameForRepoFilename(string $fn): string
 
 	/**
 	 * Display an error when there's something wrong with the TouchPoint connection.
+	 *
+	 * @param string $message
+	 * @param ?mixed $devDetail
 	 */
-	public static function showError($message)
+	public static function showError(string $message, $devDetail = null)
 	{
 		add_action('admin_notices',
-			function () use ($message) {
+			function () use ($message, $devDetail) {
 				$class = 'notice notice-error';
 				printf('<div class="%1$s"><p><b>TouchPoint-WP:</b> %2$s</p></div>', esc_attr($class), $message);
+
+				if ($devDetail !== null) {
+					/** @noinspection JSCheckFunctionSignatures */
+					printf('<script>console.error(JSON.parse( %s ))</script>', json_encode(json_encode($devDetail)));
+				}
 			}, 10, 2
 		);
 	}
diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index b3fbe51b..aca16672 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -29,8 +29,9 @@ class TouchPointWP_Exception extends Exception
 	 * @param string     $message
 	 * @param int        $code
 	 * @param ?Throwable $previous
+	 * @param mixed      $devDetail
 	 */
-	public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)
+	public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null, $devDetail = null)
 	{
 		parent::__construct($message, $code, $previous);
 		if (is_admin() && TouchPointWP::currentUserIsAdmin()) {
@@ -39,10 +40,10 @@ public function __construct(string $message = "", int $code = 0, ?Throwable $pre
 				$message .= "<br />" . $this->getFile() . " @ " . $this->getLine() . "<br />";
 				$message .= str_replace("\n", "<br />", $this->getTraceAsString());
 			}
-			TouchPointWP_AdminAPI::showError($message);
+			TouchPointWP_AdminAPI::showError($message, $devDetail);
 		}
 		error_log($message);
-		self::debugLog($this->getCode(), $this->getFile(), $this->getLine(), $this->getMessage());
+		self::debugLog($this->getCode(), $this->getFile(), $this->getLine(), $this->getMessage() . $devDetail);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 03b22d80..0f7b60d5 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -139,7 +139,7 @@ public function __construct(TouchPointWP $parent)
 	 * @param ?TouchPointWP $parent Object instance.
 	 *
 	 * @return TouchPointWP_Settings instance
-	 * @since 1.0.0
+	 * @since 0.0.37
 	 * @static
 	 * @see TouchPointWP()
 	 */
@@ -1597,7 +1597,7 @@ protected function validation_updateScriptsIfChanged($new, string $field)
 	/**
 	 * Cloning is forbidden.
 	 *
-	 * @since 1.0.0
+	 * @since 0.0.37
 	 */
 	public function __clone()
 	{
@@ -1611,7 +1611,7 @@ public function __clone()
 	/**
 	 * Unserializing instances of this class is forbidden.
 	 *
-	 * @since 1.0.0
+	 * @since 0.0.37
 	 */
 	public function __wakeup()
 	{

From cd042348487afe0ba978d8839c275d4c8e348171 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Feb 2024 22:40:47 -0500
Subject: [PATCH 063/423] Typo

---
 src/TouchPoint-WP/TouchPointWP.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 6a41218d..35daa121 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -305,13 +305,13 @@ public static function pluginRowMeta(array $pluginMeta, string $pluginFile, arra
 			}
 
 			// Made with X in Philly by Tenth
-			$madeWidths = [
+			$madeWiths = [
 				"🥪" => _x("Sandwiches (probably cheesesteaks)", "Explanation for the sandwich emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
 				"❤️" => _x("love. obviously.", "Explanation for the heart emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
 				"🥨" => _x("Soft Pretzels", "Explanation for the pretzel emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
 				"🍩" => _x("Donuts (preferably Federal)", "Explanation for the Donut emoji in \"Made with (emoji) in Philly by Tenth\"", "TouchPoint-WP"),
 			];
-			$madeWidthK = array_rand($madeWidths);
+			$madeWithK = array_rand($madeWiths);
 			/** @noinspection HtmlUnknownTarget */
 			$pluginMeta[] = sprintf(
 				'<a href="%s" target="_blank">%s</a>',
@@ -320,8 +320,8 @@ public static function pluginRowMeta(array $pluginMeta, string $pluginFile, arra
 					__("Made with %s in Philly by Tenth", "TouchPoint-WP"),
 					sprintf(
 						'<span title="%s">%s</span>',
-						$madeWidths[$madeWidthK],
-						$madeWidthK
+						$madeWiths[$madeWithK],
+						$madeWithK
 					)
 			    )
 			);

From 7c22bd3ce9d504212618e843caddadc854255494 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 10 Feb 2024 18:14:17 -0500
Subject: [PATCH 064/423] php min to 8.0. V back to 0.0.90.  Related changes.

---
 .idea/php.xml                                 |   2 +-
 composer.json                                 |   4 +-
 package.json                                  |   2 +-
 src/TouchPoint-WP/EventsCalendar.php          |   2 +-
 src/TouchPoint-WP/Involvement.php             |  45 ++--
 .../Involvement_PostTypeSettings.php          |  32 ++-
 src/TouchPoint-WP/TouchPointWP.php            |  54 ++--
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php   |   7 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php   | 230 ++++++++++--------
 src/TouchPoint-WP/Utilities.php               |  65 +++--
 src/python/WebApi.py                          |   2 +-
 touchpoint-wp.php                             |   2 +-
 12 files changed, 268 insertions(+), 179 deletions(-)

diff --git a/.idea/php.xml b/.idea/php.xml
index 299cb8ee..a20c6b90 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -16,7 +16,7 @@
       <path value="$PROJECT_DIR$/../TenthDev/app/public" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
   <component name="PhpStanOptionsConfiguration">
diff --git a/composer.json b/composer.json
index ebee13e1..8a9d67f0 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "1.0.0",
+  "version": "0.0.90",
   "keywords": [
     "wordpress",
     "wp",
@@ -27,7 +27,7 @@
     }
   },
   "require": {
-    "php": ">=7.4.0",
+    "php": ">=8.0",
     "composer/installers": "~1.0",
     "ext-json": "*",
     "ext-zip": "*"
diff --git a/package.json b/package.json
index 0e882e0a..4e5933cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "1.0.0",
+  "version": "0.0.90",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 5ee9728d..a6bf27d5 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -19,7 +19,7 @@
  * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
  * mobile app.
  *
- * @deprecated since 1.0.0
+ * @deprecated since 0.0.90
  */
 abstract class EventsCalendar implements api, module
 {
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 7c5e3c50..77cf67b1 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -25,7 +25,7 @@
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
-use WP_Error;
+use tp\TouchPointWP\Utilities\Translation;
 use WP_Post;
 use WP_Query;
 use WP_Term;
@@ -140,7 +140,7 @@ protected function __construct(object $object)
 		}
 
 		// clean up involvement type to not have hook prefix, if it does.
-		if (strpos($this->invType, TouchPointWP::HOOK_PREFIX) === 0) {
+		if (str_starts_with($this->invType, TouchPointWP::HOOK_PREFIX)) {
 			$this->invType = substr($this->invType, strlen(TouchPointWP::HOOK_PREFIX));
 		}
 
@@ -171,7 +171,7 @@ protected function __construct(object $object)
 					'slug' => $t->slug
 				];
 				$ta = $t->taxonomy;
-				if (strpos($ta, TouchPointWP::HOOK_PREFIX) === 0) {
+				if (str_starts_with($ta, TouchPointWP::HOOK_PREFIX)) {
 					$ta = substr_replace($ta, "", 0, $hookLength);
 				}
 				if ( ! isset($this->attributes->$ta)) {
@@ -252,8 +252,6 @@ final protected static function &allTypeSettings(): array
 	public static function init(): void
 	{
 		foreach (self::allTypeSettings() as $type) {
-			/** @var $type Involvement_PostTypeSettings */
-
 			register_post_type(
 				$type->postType,
 				[
@@ -330,9 +328,9 @@ public static function checkUpdates(): void
 	 *
 	 * @param bool $verbose Whether to print debugging info.
 	 *
-	 * @return false|int False on failure, or the number of groups that were updated or deleted.
+	 * @return int False on failure, or the number of groups that were updated or deleted.
 	 */
-	public static function updateFromTouchPoint(bool $verbose = false)
+	public final static function updateFromTouchPoint(bool $verbose = false): int
 	{
 		$count   = 0;
 		$success = true;
@@ -432,7 +430,7 @@ public static function templateFilter(string $template): string
 	 * @return bool|string  True if involvement can be joined. False if no registration exists. Or, a string with why
 	 *     it can't be joined otherwise.
 	 */
-	public function acceptingNewMembers()
+	public function acceptingNewMembers(): bool|string
 	{
 		if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupFull", true) === '1') {
 			return __("Currently Full", 'TouchPoint-WP');
@@ -442,7 +440,7 @@ public function acceptingNewMembers()
 			return __("Currently Closed", 'TouchPoint-WP');
 		}
 
-		$now      = current_datetime();
+		$now      = Utilities::dateTimeNow();
 		$regStart = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regStart", true);
 		if ($regStart !== false && $regStart !== '' && $regStart > $now) {
 			return __("Registration Not Open Yet", 'TouchPoint-WP');
@@ -517,7 +515,7 @@ protected function schedules(): array
 	 * @param int           $invId
 	 * @param ?Involvement  $inv
 	 *
-	 * @return string
+	 * @return ?string
 	 */
 	public static function scheduleString(int $invId, $inv = null): ?string
 	{
@@ -529,7 +527,7 @@ public static function scheduleString(int $invId, $inv = null): ?string
 		if (! $inv) {
 			try {
 				$inv = self::fromInvId($invId);
-			} catch (TouchPointWP_Exception $e) {
+			} catch (TouchPointWP_Exception) {
 				return null;
 			}
 		}
@@ -542,7 +540,7 @@ public static function scheduleString(int $invId, $inv = null): ?string
 				self::SCHEDULE_STRING_CACHE_EXPIRATION
 			);
 		}
-		return $inv->_scheduleString;
+		return $inv->_scheduleString === "" ? null : $inv->_scheduleString;
 	}
 
 	/**
@@ -646,11 +644,11 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc
 	 *
 	 * @return string
 	 */
-	protected function scheduleString_calc(): ?string
+	protected function scheduleString_calc(): string
 	{
 		$commonOccurrences = self::computeCommonOccurrences($this->meetings(), $this->schedules());
 
-		$dayStr     = null;
+		$dayStr     = "";
 		$timeFormat = get_option('time_format');
 		$dateFormat = get_option('date_format');
 
@@ -884,7 +882,7 @@ public static function actionsShortcode($params = [], string $content = ""): str
 				try {
 					$inv = self::fromPost($post);
 					$iid = $inv->invId;
-				} catch (TouchPointWP_Exception $e) {
+				} catch (TouchPointWP_Exception) {
 					$iid = null;
 				}
 			}
@@ -1543,14 +1541,18 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 	 *
 	 * @param WP_Post $post
 	 *
-	 * @return Involvement
+	 * @return ?Involvement
 	 *
 	 * @throws TouchPointWP_Exception If the involvement can't be created from the post, an exception is thrown.
 	 */
-	public static function fromPost(WP_Post $post): Involvement
+	public static function fromPost(WP_Post $post): ?Involvement
 	{
 		$iid = intval($post->{TouchPointWP::INVOLVEMENT_META_KEY});
 
+		if ($iid === 0) {
+			return null;
+		}
+
 		if ( ! isset(self::$_instances[$iid])) {
 			self::$_instances[$iid] = new Involvement($post);
 		}
@@ -1584,6 +1586,7 @@ public static function api(array $uri): bool
 			case "nearby":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE);
 				self::ajaxNearby();
+				/** @noinspection PhpUnreachableStatementInspection */
 				exit;
 
 			case "force-sync":
@@ -1872,7 +1875,7 @@ public static function updateCron(): void
 	{
 		try {
 			self::updateFromTouchPoint();
-		} catch (Exception $ex) {
+		} catch (Exception) {
 		}
 	}
 
@@ -1955,7 +1958,7 @@ public static function sortPosts(WP_Post $a, WP_Post $b): int
 			$b = self::fromPost($b);
 
 			return self::sort($a, $b);
-		} catch (TouchPointWP_Exception $ex) {
+		} catch (TouchPointWP_Exception) {
 			return $a <=> $b;
 		}
 	}
@@ -2114,7 +2117,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			$histVal   = new DateInterval("P{$histDays}D");
 			$nowMinusH = $now->sub($histVal);
 			unset($aYear);
-		} catch (Exception $e) {
+		} catch (Exception) {
 			return false;
 		}
 
@@ -2610,7 +2613,7 @@ public static function filterAuthor($author): string
 				$i = Involvement::fromPost($post);
 
 				$author = $i->leaders()->__toString();
-			} catch (TouchPointWP_Exception $e) {
+			} catch (TouchPointWP_Exception) {
 			}
 		}
 
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index aa7c63d5..ae8bcb17 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -94,6 +94,25 @@ public function __construct(object $o)
 		}
 	}
 
+	/**
+	 * Get a list of all division IDs that are being imported by all types.
+	 *
+	 * @return int[]
+	 */
+	public static function getAllDivs(): array
+	{
+		$r = [];
+		foreach (self::instance() as $s) {
+			$r = [...$r, ...$s->importDivs];
+		}
+		return array_unique($r);
+	}
+
+	/**
+	 * Get the Post Type for use with WordPress functions
+	 *
+	 * @return string
+	 */
 	public function postTypeWithPrefix(): string
 	{
 		self::instance();
@@ -101,6 +120,11 @@ public function postTypeWithPrefix(): string
 		return TouchPointWP::HOOK_PREFIX . $this->postType;
 	}
 
+	/**
+	 * Get the Post Type without the hook prefix.
+	 *
+	 * @return string
+	 */
 	public function postTypeWithoutPrefix(): string
 	{
 		self::instance();
@@ -216,7 +240,7 @@ public static function validateNewSettings(string $new): string
 				$name = preg_replace('/\W+/', '-', strtolower($type->namePlural));
 				try {
 					$type->slug = $name . ($first ? "" : "-" . bin2hex(random_bytes(1)));
-				} catch (Exception $e) {
+				} catch (Exception) {
 					$type->slug = $name . ($first ? "" : "-" . bin2hex($count++));
 				}
 				$first = false;
@@ -251,7 +275,7 @@ public static function validateNewSettings(string $new): string
 				$slug = preg_replace('/\W+/', '', strtolower($type->slug));
 				try {
 					$type->postType = self::POST_TYPE_PREFIX . $slug . ($first ? "" : "_" . bin2hex(random_bytes(1)));
-				} catch (Exception $e) {
+				} catch (Exception) {
 					$type->postType = self::POST_TYPE_PREFIX . $slug . ($first ? "" : "_" . bin2hex($count++));
 				}
 				$first          = false;
@@ -305,7 +329,7 @@ protected static function memberTypesToInts($memberTypes): array
 	 */
 	public function leaderTypeInts(): array
 	{
-		return self::memberTypesToInts($this->leaderTypes);
+		return Utilities::idArrayToIntArray($this->leaderTypes);
 	}
 
 	/**
@@ -319,6 +343,6 @@ public function hostTypeInts(): ?array
 			return null;
 		}
 
-		return self::memberTypesToInts($this->hostTypes);
+		return Utilities::idArrayToIntArray($this->hostTypes);
 	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index b551dfee..2f0f2a2b 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -32,7 +32,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "1.0.0";
+	public const VERSION = "0.0.90";
 
 	/**
 	 * The Token
@@ -254,10 +254,10 @@ protected function __construct(string $file = '')
 	public static function cronAdd15Minutes($schedules)
 	{
 		// Adds once weekly to the existing schedules.
-		$schedules['tp_every_15_minutes'] = array(
+		$schedules['tp_every_15_minutes'] = [
 			'interval' => 15 * 60,
 			'display'  => __('Every 15 minutes', 'TouchPoint-WP')
-		);
+		];
 
 		return $schedules;
 	}
@@ -272,7 +272,7 @@ public static function cronAdd15Minutes($schedules)
 	 * @since 0.0.23
 	 *
 	 */
-	public static function capitalPyScript($text): string
+	public static function capitalPyScript(mixed $text): string
 	{
 		if ( ! self::instance()->settings->hasValidApiSettings()) {
 			return $text;
@@ -384,7 +384,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 			$reqUri['path'] = $reqUri['path'] ?? "";
 
 			// Remove trailing slash if it exists (and, it probably does)
-			if (substr($reqUri['path'], -1) === '/') {
+			if (str_ends_with($reqUri['path'], '/')) {
 				$reqUri['path'] = substr($reqUri['path'], 0, -1);
 			}
 			
@@ -587,7 +587,7 @@ public function getJsLocalizationDir(): string
 	/**
 	 * Load plugin textdomain
 	 */
-	public function loadLocalizations()
+	public function loadLocalizations(): void
 	{
 		$locale = apply_filters('plugin_locale', get_locale(), 'TouchPoint-WP');
 
@@ -920,11 +920,11 @@ public static function requireStyle(string $name = null): void
 	 */
 	public function filterByTag(?string $tag, ?string $handle): string
 	{
-		if (strpos($tag, 'async') !== false &&
+		if (str_contains($tag, 'async') &&
 			strpos($handle, '-async') > 0) {
 			$tag = str_replace(' src=', ' async="async" src=', $tag);
 		}
-		if (strpos($tag, 'defer') !== false &&
+		if (str_contains($tag, 'defer') &&
 			strpos($handle, '-defer') > 0
 		) {
 			$tag = str_replace('<script ', '<script defer ', $tag);
@@ -960,7 +960,7 @@ public function ajaxGeolocate(): void
 	 * @return Geo|false An object with 'lat', 'lng', and 'human' attributes, if a location could be identified.
 	 *	 Or, false if not available.
 	 */
-	public function geolocate(bool $useApi = true, bool $includeRaw = false)
+	public function geolocate(bool $useApi = true, bool $includeRaw = false): false|Geo
 	{
 		$ip = Utilities::getClientIp();
 
@@ -977,7 +977,7 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false)
 
 		try {
 			$return = $this->getIpData($ip, $useApi);
-		} catch (TouchPointWP_WPError|TouchPointWP_Exception $ex) {
+		} catch (TouchPointWP_WPError|TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -1058,7 +1058,7 @@ public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true
 
 			try {
 				$apiData = $this->extGet("https://maps.googleapis.com/maps/api/geocode/json", $reqData);
-			} catch (TouchPointWP_WPError $e) {
+			} catch (TouchPointWP_WPError) {
 				return false;
 			}
 
@@ -1326,7 +1326,7 @@ public static function useTribeCalendarPro(): bool
 	 *
 	 * @return bool
 	 *
-	 * @deprecated since 1.0.0 -- Will not be necessary once mobile 3.0 exists.
+	 * @deprecated since 0.0.90 -- Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendar(): bool
 	{
@@ -1480,7 +1480,7 @@ private function updateDivisions()
 	{
 		try {
 			$data = $this->apiGet('Divisions');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -1502,7 +1502,7 @@ private function getMemberTypesForDivisions_fromApi($divisions)
 	{
 		try {
 			$return = $this->apiGet('MemTypes', ['divs' => $divisions]);
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -1594,7 +1594,7 @@ private function updateCampuses()
 	{
 		try {
 			$data = $this->apiGet('Campuses');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -1620,7 +1620,7 @@ private function updateResCodes()
 	{
 		try {
 			$data = $this->apiGet('ResCodes');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -1681,7 +1681,7 @@ private function updateGenders()
 	{
 		try {
 			$data = $this->apiGet('Genders');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -1935,7 +1935,7 @@ public function getSavedSearches(?int $peopleId = null, $includeValue = null): a
 
 		try {
 			$data = $this->apiGet('SavedSearches', ['PeopleId' => $peopleId]);
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return [];
 		}
 
@@ -1992,7 +1992,7 @@ private function updateKeywords()
 	{
 		try {
 			$data = $this->apiGet('Keywords');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -2021,7 +2021,7 @@ public function updatePersonEvFields()
 	{
 		try {
 			$data = $this->apiGet('PersonEvFields');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -2050,7 +2050,7 @@ public function updateFamilyEvFields()
 	{
 		try {
 			$data = $this->apiGet('FamilyEvFields');
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -2080,7 +2080,7 @@ public function updateFamilyEvFields()
 	 *
 	 * @throws TouchPointWP_Exception Thrown if the API credentials are incomplete.
 	 */
-	public function apiGet(string $command, ?array $parameters = null, int $timeout = 5)
+	public function apiGet(string $command, ?array $parameters = null, int $timeout = 5): array|stdClass
 	{
 		if ( ! is_array($parameters)) {
 			$parameters = (array)$parameters;
@@ -2118,13 +2118,13 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 
 	/**
 	 * @param string $command The thing to post
-	 * @param mixed  $data Data to post
+	 * @param ?mixed $data Data to post
 	 * @param int    $timeout Amount of time in sec to wait before timing out.
 	 *
 	 * @return stdClass|array An object that corresponds to the Data python object in TouchPoint.
 	 * @throws TouchPointWP_Exception  If anything went wrong.
 	 */
-	public function apiPost(string $command, $data = null, int $timeout = 5)
+	public function apiPost(string $command, mixed $data = null, int $timeout = 5): array|stdClass
 	{
 		if ( ! $this->settings->hasValidApiSettings()) {
 			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
@@ -2163,7 +2163,7 @@ public function apiPost(string $command, $data = null, int $timeout = 5)
 	 * @throws TouchPointWP_Exception
 	 * @throws TouchPointWP_WPError
 	 */
-	private static function parseApiResponse($response)
+	private static function parseApiResponse($response): array|stdClass
 	{
 		if ($response instanceof WP_Error) {
 			throw new TouchPointWP_WPError($response);
@@ -2177,7 +2177,7 @@ private static function parseApiResponse($response)
 
 		// Most likely the issue where a module import failed for no apparent reason.
 		if (property_exists($respDecoded, 'output') &&
-			strpos($respDecoded->output, "Traceback (most recent call last):") === 0) {
+			str_starts_with($respDecoded->output, "Traceback (most recent call last):")) {
 			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001);
 		}
 
@@ -2337,7 +2337,7 @@ public function flushRewriteRules(bool $force = true): void
 	 * This function enqueues the stylesheet for the default templates, to avoid registering the style on sites where
 	 * custom templates exist.
 	 */
-	public static function enqueuePartialsStyle()
+	public static function enqueuePartialsStyle(): void
 	{
 		wp_enqueue_style(
 			TouchPointWP::SHORTCODE_PREFIX . 'partials-template-style',
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 1691c545..b41f04dd 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -132,7 +132,7 @@ private function generateAndEchoPython(): bool
 	{
 		try {
 			$fileName = $this->generatePython(true);
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 
@@ -384,7 +384,7 @@ public function displayField(array $data = [], ?WP_Post $post = null, bool $echo
 	 *     array of filename => content.
 	 * @throws TouchPointWP_Exception
 	 */
-	public function generatePython(bool $toZip, array $filenames = ['*'])
+	public function generatePython(bool $toZip, array $filenames = ['*']): array|string
 	{
 		if ($toZip && ! class_exists('\ZipArchive')) {
 			throw new TouchPointWP_Exception("ZipArchive extension is not enabled.");
@@ -473,6 +473,7 @@ public function generatePython(bool $toZip, array $filenames = ['*'])
 	private static function getTpFilenameForRepoFilename(string $fn): string
 	{
 		$newFn = '';
+		/** @noinspection PhpSwitchStatementWitSingleBranchInspection */
 		switch ($fn) {
 			case 'WebApi':
 				$newFn = TouchPointWP::instance()->settings->api_script_name;
@@ -492,7 +493,7 @@ private static function getTpFilenameForRepoFilename(string $fn): string
 	/**
 	 * Display an error when there's something wrong with the TouchPoint connection.
 	 */
-	public static function showError($message)
+	public static function showError($message): void
 	{
 		add_action('admin_notices',
 			function () use ($message) {
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index cffa8560..5c388d50 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -118,14 +118,13 @@ public function __construct(TouchPointWP $parent)
 	{
 		$this->parent = $parent;
 
-		// Initialise settings.
-		add_action('init', [$this, 'initSettings'], 11);
+		$this->initSettings();
 
 		// Register plugin settings.
 		add_action('admin_init', [$this, 'registerSettings']);
 
 		// Add settings page to menu.
-		add_action('admin_menu', [$this, 'add_menu_item']);
+		add_action('admin_menu', [$this, 'addMenuItems']);
 
 		// Add settings link to plugins page.
 		add_filter(
@@ -148,7 +147,7 @@ public function __construct(TouchPointWP $parent)
 	 * @param ?TouchPointWP $parent Object instance.
 	 *
 	 * @return TouchPointWP_Settings instance
-	 * @since 1.0.0
+	 * @since 0.0.90
 	 * @static
 	 * @see TouchPointWP()
 	 */
@@ -218,15 +217,32 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 		return false;
 	}
 
+	/**
+	 * @param $fieldId
+	 *
+	 * @return ?array
+	 */
+	private function getFieldMeta($fieldId): ?array
+	{
+		foreach ($this->settingsFields() as $category) {
+			foreach ($category['fields'] as $field) {
+				if ($field['id'] === $fieldId) {
+					return $field;
+				}
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Build settings fields
 	 *
 	 * @param bool|string $includeDetail Set to true to get options from TouchPoint, likely including the API calls. Set
 	 *	                  to the key of a specific page to only load options for that page.
 	 *
-	 * @return array Fields to be displayed on settings page
+	 * @return array[] Fields to be displayed on settings page
 	 */
-	private function settingsFields($includeDetail = false): array
+	private function settingsFields(bool|string $includeDetail = false): array
 	{
 		// Don't call API if we don't have API credentials
 		if ( ! $this->hasValidApiSettings()) {
@@ -357,7 +373,7 @@ private function settingsFields($includeDetail = false): array
 					'id'          => 'api_user',
 					'label'       => __('TouchPoint API Username', 'TouchPoint-WP'),
 					'description' => __(
-						'The username of a user account in TouchPoint with API permissions.',
+						'The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member\'s account.',
 						'TouchPoint-WP'
 					),
 					'type'        => 'text',
@@ -784,69 +800,82 @@ private function settingsFields($includeDetail = false): array
 			];
 		}
 
-		// TODO add some kind of conditional here
-		$includeThis = $includeDetail === true || $includeDetail === 'events';
-		$tribe = TouchPointWP::useTribeCalendar();
-		$this->settings['meetCal'] = [
-			'title'       => __('Meeting Calendars', 'TouchPoint-WP'),
-			'description' => __('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
-			'fields'      => [
-				[
-					'id'          => 'mc_slug',
-					'label'       => __('Meetings Slug', 'TouchPoint-WP'),
-					'description' => __(
-						'The root path for Meetings',
-						'TouchPoint-WP'
-					),
-					'type'        => 'text',
-					'default'     => $tribe ? 'meetings' : 'events',
-					'autoload'    => true,
-					'placeholder' => $tribe ? 'meetings' : 'events',
-					'callback'    => fn($new) => $this->validation_slug($new, 'mc_slug')
-				],
-				[
-					'id'          => 'mc_future_days',
-					'label'       => __('Days of Future', 'TouchPoint-WP'),
-					'description' => __('Meetings more than this many days in the future will not be imported.', 'TouchPoint-WP'),
-					'type'        => 'number',
-					'default'     => 365,
-					'placeholder' => 365,
-					'max'         => 1825,
-					'min'         => 0
-				],
-				[
-					'id'          => 'mc_archive_days',
-					'label'       => __('Archive After Days', 'TouchPoint-WP'),
-					'description' => __('Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update.', 'TouchPoint-WP'),
-					'type'        => 'number',
-					'default'     => 7,
-					'placeholder' => 7,
-					'max'         => 365,
-					'min'         => 0
-				],
-				[
-					'id'          => 'mc_hist_days',
-					'label'       => __('Days of History', 'TouchPoint-WP'),
-					'description' => __('Meetings will be kept for the public calendar until the event is this many days in the past.', 'TouchPoint-WP'),
-					'type'        => 'number',
-					'default'     => 365,
-					'placeholder' => 365,
-					'max'         => 1825,
-					'min'         => 0
-				],
-				[
-					'id'          => 'mc_deletion_method',
-					'label'       => __('Meeting Deletion Handling', 'TouchPoint-WP'),
-					'description' => __('When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?', 'TouchPoint-WP'),
-					'type'        => 'select',
-					'options'     => [
-						'delete'    => __('Always delete from WordPress', 'TouchPoint-WP'),
-						'cancel'    => __('Mark the occurrence as cancelled', 'TouchPoint-WP'),
+		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_meeting_cal') === "on") { // TODO MULTI
+//			$includeThis = $includeDetail === true || $includeDetail === 'events';
+			$tribe = TouchPointWP::useTribeCalendar();
+			$this->settings['meetCal'] = [
+				'title'       => __('Meeting Calendars', 'TouchPoint-WP'),
+				'description' => __('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
+				'fields'      => [
+					[
+						'id'          => 'mc_slug',
+						'label'       => __('Meetings Slug', 'TouchPoint-WP'),
+						'description' => __(
+							'The root path for Meetings',
+							'TouchPoint-WP'
+						),
+						'type'        => 'text',
+						'default'     => $tribe ? 'meetings' : 'events',
+						'autoload'    => true,
+						'placeholder' => $tribe ? 'meetings' : 'events',
+						'callback'    => fn($new) => $this->validation_slug($new, 'mc_slug')
+					],
+					[
+						'id'          => 'mc_future_days',
+						'label'       => __('Days of Future', 'TouchPoint-WP'),
+						'description' => __(
+							'Meetings more than this many days in the future will not be imported.',
+							'TouchPoint-WP'
+						),
+						'type'        => 'number',
+						'default'     => 365,
+						'placeholder' => 365,
+						'max'         => 1825,
+						'min'         => 0
+					],
+					[
+						'id'          => 'mc_archive_days',
+						'label'       => __('Archive After Days', 'TouchPoint-WP'),
+						'description' => __(
+							'Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update.',
+							'TouchPoint-WP'
+						),
+						'type'        => 'number',
+						'default'     => 7,
+						'placeholder' => 7,
+						'max'         => 365,
+						'min'         => 0
+					],
+					[
+						'id'          => 'mc_hist_days',
+						'label'       => __('Days of History', 'TouchPoint-WP'),
+						'description' => __(
+							'Meetings will be kept for the public calendar until the event is this many days in the past.',
+							'TouchPoint-WP'
+						),
+						'type'        => 'number',
+						'default'     => 365,
+						'placeholder' => 365,
+						'max'         => 1825,
+						'min'         => 0
+					],
+					[
+						'id'          => 'mc_deletion_method',
+						'label'       => __('Meeting Deletion Handling', 'TouchPoint-WP'),
+						'description' => __(
+							'When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?',
+							'TouchPoint-WP'
+						),
+						'type'        => 'select',
+						'options'     => [
+							'delete' => __('Always delete from WordPress', 'TouchPoint-WP'),
+							'cancel' => __('Mark the occurrence as cancelled', 'TouchPoint-WP'),
+						],
+						'default'     => 'delete',
 					],
-					'default'     => 'delete',
 				],
-			],
-		];
+			];
+		}
 
 		$includeThis = $includeDetail === true || $includeDetail === 'divisions';
 		$this->settings['divisions'] = [
@@ -1202,7 +1231,7 @@ private function passwordPlaceholder(string $settingName): string
 	 *
 	 * @return void
 	 */
-	public function add_menu_item()
+	public function addMenuItems(): void
 	{
 		$args = $this->menu_settings();
 
@@ -1308,15 +1337,24 @@ public function __get(string $what)
 	 *
 	 * @return false|string|array
 	 */
-	public function get(string $what)
+	public function get(string $what): mixed
 	{
 		$v = $this->getWithoutDefault($what);
 
+		$meta = $this->getFieldMeta($what);
+
 		if ($v === self::UNDEFINED_PLACEHOLDER) {
-			$v = $this->getDefaultValueForSetting($what);
+			$v = $this->getDefaultValueForSetting($what, $meta);
 		}
 		if ($v === self::UNDEFINED_PLACEHOLDER) {
 			$v = false;
+		} else {
+			if (isset($meta['type'])) {
+				switch ($meta['type']) {
+					case "number":
+						$v = intval($v);
+				}
+			}
 		}
 
 		return $v;
@@ -1328,7 +1366,7 @@ public function get(string $what)
 	 *
 	 * @return mixed  The value, if set.  UNDEFINED_PLACEHOLDER if not set.
 	 */
-	protected function getWithoutDefault(string $what, $default = self::UNDEFINED_PLACEHOLDER)
+	protected function getWithoutDefault(string $what, mixed $default = self::UNDEFINED_PLACEHOLDER): mixed
 	{
 		$opt = get_option(TouchPointWP::SETTINGS_PREFIX . $what, $default); // TODO MULTI
 
@@ -1344,9 +1382,9 @@ protected function getWithoutDefault(string $what, $default = self::UNDEFINED_PL
 	 * @param mixed  $value
 	 * @param ?bool  $autoload
 	 *
-	 * @return false|mixed
+	 * @return bool
 	 */
-	public function set(string $what, $value, ?bool $autoload = null): bool
+	public function set(string $what, mixed $value, ?bool $autoload = null): bool
 	{
 		if ($autoload === null) {
 			$autoload = $this->settingShouldBeAutoLoaded($what);
@@ -1414,8 +1452,8 @@ public function migrate(): void
 
 			// Remove the old settings
 			foreach (wp_load_alloptions() as $option => $value) {
-				if (strpos($option, TouchPointWP::SETTINGS_PREFIX . 'sg_') === 0 ||
-					strpos($option, TouchPointWP::SETTINGS_PREFIX . 'cs_') === 0) {
+				if (str_starts_with($option, TouchPointWP::SETTINGS_PREFIX . 'sg_') ||
+				    str_starts_with($option, TouchPointWP::SETTINGS_PREFIX . 'cs_')) {
 					delete_option($option); // TODO MULTI
 				}
 			}
@@ -1442,13 +1480,11 @@ public function migrate(): void
 			WHERE post_content LIKE '%$oldShortcode%'
 		");
 
-
 		// 0.0.19 - Rebuilding Authentication
 		// Remove settings no longer relevant
 		delete_option(TouchPointWP::SETTINGS_PREFIX . 'api_secret_key');
 		delete_option(TouchPointWP::SETTINGS_PREFIX . 'auth_background');
 
-
 		// 0.0.23 - Changing Involvement Schedule meta structure
 		$metaKeys = [
 			TouchPointWP::HOOK_PREFIX . "meetingSchedule",
@@ -1459,12 +1495,10 @@ public function migrate(): void
 			$wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_key = '$k'");
 		}
 
-
 		// 0.0.24 - Removing old options (#110)
 		delete_option('tp_copy-app-endpoint-address');
 		delete_option('tp_sg_cron_last_run');
 
-
 		// 0.0.25 - Involvement Leaders are now Users and Involvement Images
 		delete_post_meta_by_key('tp_leaders');
 		delete_post_meta_by_key('tp_imageUrl');
@@ -1472,6 +1506,7 @@ public function migrate(): void
 		// 0.0.25 - Adjust to lower case of plugin main file
 		$activePlugins = get_option('active_plugins');
 		$new           = "touchpoint-wp/touchpoint-wp.php";
+		/** @noinspection SpellCheckingInspection */
 		if (($k = array_search($new, array_map('strtolower', $activePlugins))) !== false) {
 			if ($activePlugins[$k] !== $new) {
 				$activePlugins[$k] = $new;
@@ -1483,9 +1518,12 @@ public function migrate(): void
 		}
 
 		// 0.0.31 - Add lookup IDs to ResCodes
-		// 1.0.0 - Cleanup possible duplicate terms
+		// 0.0.90 - Cleanup possible duplicate terms
 		Taxonomies::$forceTermLookupIdUpdate = true;
 
+		// 0.0.90 - Remove an option that was only briefly used.
+		delete_option(TouchPointWP::SETTINGS_PREFIX . 'mc_cron_last_run');
+
 		// Update version string
 		$this->set('version', TouchPointWP::VERSION);
 	}
@@ -1580,10 +1618,6 @@ public function registerSettings(): void
 					]
 				);
 			}
-
-			if ( ! $currentSection) {
-				break;
-			}
 		}
 	}
 
@@ -1591,25 +1625,19 @@ public function registerSettings(): void
 	 * Gets the default value for a setting field, if one exists.  Otherwise, the UNDEFINED_PLACEHOLDER is returned.
 	 *
 	 * @param string $id
+	 * @param array  $meta
 	 *
 	 * @return mixed
 	 */
-	protected function getDefaultValueForSetting(string $id)
+	protected function getDefaultValueForSetting(string $id, array $meta): mixed
 	{
 		if (substr($id, 0, 7) === "enable") {
 			// Prevents settings content from needing to be generated for these settings.
 			return '';
 		}
-		foreach ($this->settingsFields() as $category) {
-			foreach ($category['fields'] as $field) {
-				if ($field['id'] === $id) {
-					if (array_key_exists('default', $field)) {
-						return $field['default'];
-					}
 
-					return self::UNDEFINED_PLACEHOLDER;
-				}
-			}
+		if (array_key_exists('default', $meta)) {
+			return $meta['default'];
 		}
 
 		return self::UNDEFINED_PLACEHOLDER;
@@ -1687,7 +1715,7 @@ public function settingsPage(): void
 
 		$html .= '<p class="submit">' . "\n";
 		$html .= '<input type="hidden" name="tab" value="' . esc_attr($tab) . '" />' . "\n";
-		$html .= '<input name="Submit" type="submit" class="button-primary" value="' . esc_attr(
+		$html .= '<input type="submit" name="Submit" class="button-primary" value="' . esc_attr(
 				__('Save Settings', 'TouchPoint-WP')
 			) . '" />' . "\n";
 		$html .= '</p>' . "\n";
@@ -1722,7 +1750,7 @@ protected function validation_secret(string $new, string $field): string
 	 *
 	 * @return string
 	 */
-	protected function validation_slug($new, string $field): string
+	protected function validation_slug(mixed $new, string $field): string
 	{
 		if ($new != $this->$field) { // only validate the field if it's changing.
 			$new = $this->validation_lowercase($new);
@@ -1748,7 +1776,7 @@ protected function validation_postTypes(array $new): array
 		$types = array_keys(Utilities::getRegisteredPostTypesAsKVArray());
 		$r = [];
 		sort($new);
-		foreach ($new as $k => $t) {
+		foreach ($new as $t) {
 			if (in_array($t, $types)) {
 				$r[] = $t;
 			}
@@ -1776,7 +1804,7 @@ public function validation_lowercase(string $data): string
 	 *
 	 * @return mixed lower-case string
 	 */
-	protected function validation_updateScriptsIfChanged($new, string $field)
+	protected function validation_updateScriptsIfChanged(mixed $new, string $field): mixed
 	{
 		if ($new !== $this->$field) {
 			TouchPointWP::queueUpdateDeployedScripts();
@@ -1788,7 +1816,7 @@ protected function validation_updateScriptsIfChanged($new, string $field)
 	/**
 	 * Cloning is forbidden.
 	 *
-	 * @since 1.0.0
+	 * @since 0.0.90
 	 */
 	public function __clone()
 	{
@@ -1802,7 +1830,7 @@ public function __clone()
 	/**
 	 * Unserializing instances of this class is forbidden.
 	 *
-	 * @since 1.0.0
+	 * @since 0.0.90
 	 */
 	public function __wakeup()
 	{
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 3f42ed54..34bcb931 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -46,15 +46,23 @@ public static function toFloatOrNull($numeric, $round = false): ?float
 	public static function dateTimeNow(): DateTimeImmutable
 	{
 		if (self::$_dateTimeNow === null) {
-			try {
-				self::$_dateTimeNow = new DateTimeImmutable('now', wp_timezone());
-			} catch (Exception $e) {
-			}
+			self::$_dateTimeNow = current_datetime();
 		}
 
 		return self::$_dateTimeNow;
 	}
 
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public static function dateTimeTodayAtMidnight(): DateTimeImmutable
+	{
+		if (self::$_dateTimeTodayAtMidnight === null) {
+			self::$_dateTimeTodayAtMidnight = self::dateTimeNow()->setTime(0, 0);
+		}
+		return self::$_dateTimeTodayAtMidnight;
+	}
+
 	/**
 	 * @return DateTimeImmutable
 	 */
@@ -68,8 +76,23 @@ public static function dateTimeNowPlus1Y(): DateTimeImmutable
 		return self::$_dateTimeNowPlus1Y;
 	}
 
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public static function dateTimeNowPlus1D(): DateTimeImmutable
+	{
+		if (self::$_dateTimeNowPlus1D === null) {
+			$aDay                     = new DateInterval('P1D');
+			self::$_dateTimeNowPlus1D = self::dateTimeNow()->add($aDay);
+		}
+
+		return self::$_dateTimeNowPlus1D;
+	}
+
 	private static ?DateTimeImmutable $_dateTimeNow = null;
+	private static ?DateTimeImmutable $_dateTimeTodayAtMidnight = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1Y = null;
+	private static ?DateTimeImmutable $_dateTimeNowPlus1D = null;
 
 	/**
 	 * Gets the plural form of a weekday name.
@@ -122,17 +145,25 @@ public static function getPluralDayOfWeekNameForNumber_noI18n(int $dayNum): stri
 	 */
 	public static function getDayOfWeekShortForNumber(int $dayNum): string
 	{
-		$names = [
-			_x('Sun', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-			_x('Mon', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-			_x('Tue', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-			_x('Wed', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-			_x('Thu', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-			_x('Fri', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-			_x('Sat', 'e.g. event happens weekly on...', 'TouchPoint-WP'),
-		];
+		return self::getDaysOfWeekShort()[$dayNum % 7];
+	}
 
-		return $names[$dayNum % 7];
+	/**
+	 * Get the short form of the day of week, translated.  Assumed to be usable as both singular and plural.
+	 *
+	 * @return string[]
+	 */
+	public static function getDaysOfWeekShort(): array
+	{
+		return [
+			_x('Sun', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+			_x('Mon', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+			_x('Tue', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+			_x('Wed', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+			_x('Thu', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+			_x('Fri', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+			_x('Sat', 'e.g. "Event happens weekly on..." or "This ..."', 'TouchPoint-WP'),
+		];
 	}
 
 	/**
@@ -237,11 +268,12 @@ public static function stringArrayToListString(array $strings): string
 	/**
 	 * Convert a list (string or array) to an int array.  Strips out non-numerics and explodes.
 	 *
-	 * @param string|array $r
+	 * @param array|string $r
+	 * @param bool         $explode
 	 *
 	 * @return int[]|string
 	 */
-	public static function idArrayToIntArray($r, $explode = true)
+	public static function idArrayToIntArray(array|string $r, bool $explode = true): array|string
 	{
 		if (is_array($r)) {
 			$r = implode(",", $r);
@@ -423,6 +455,7 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 		$oldFName = substr($oldFName, strrpos($oldFName, '/') + 1);
 
 		$newUrl = trim((string)$newUrl); // nulls are now ""
+		$title = sprintf('%1$s Image', $title);
 
 		$newFName = "";
 		if ($newUrl !== "") {
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 5652be52..7b5d27bb 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "1.0.0"
+VERSION = "0.0.90"
 
 sgContactEvName = "Contact"
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index fa2456b9..5c8885db 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            1.0.0
+Version:            0.0.90
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From 620b0f5623786f3d6405b393f3d5a1c8e341ef36 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 10 Feb 2024 18:17:18 -0500
Subject: [PATCH 065/423] Adjusting file watchers

---
 .idea/watcherTasks.xml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index cc2fc94a..dc821a35 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -48,7 +48,7 @@
       <option name="exitCodeBehavior" value="ERROR" />
       <option name="fileExtension" value="py" />
       <option name="immediateSync" value="true" />
-      <option name="name" value="Python to Build (win) Copy" />
+      <option name="name" value="Python to Build (win)" />
       <option name="output" value="$ProjectFileDir$\build\$FileDirRelativeToProjectRoot$\$FileName$" />
       <option name="outputFilters">
         <array />
@@ -101,5 +101,25 @@
       <option name="workingDir" value="$FileDir$" />
       <envs />
     </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="cmd /c &quot;type $FilePath$&quot;" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="css" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="CSS to Build (win)" />
+      <option name="output" value="$ProjectFileDir$\build\$FileDirRelativeToProjectRoot$\$FileName$" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="true" />
+      <option name="program" value="cmd.exe" />
+      <option name="runOnExternalChanges" value="true" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="$ProjectFileDir$" />
+      <envs />
+    </TaskOptions>
   </component>
 </project>
\ No newline at end of file

From db34c422ae2bdb206e0f6360cdffaab5ccb11875 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 10 Feb 2024 18:26:33 -0500
Subject: [PATCH 066/423] translations

---
 i18n/TouchPoint-WP-es_ES.po | 778 +++++++++++++++++++-----------------
 i18n/TouchPoint-WP.pot      | 776 ++++++++++++++++++-----------------
 2 files changed, 835 insertions(+), 719 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 84559d6b..a301d48a 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -50,7 +50,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:870
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:924
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -58,121 +58,123 @@ msgstr "Divisiones a Importar"
 msgid "Import Hierarchically (Parent-Child Relationships)"
 msgstr "Importar jerárquicamente (relaciones padre-hijo)"
 
-#: src/templates/admin/invKoForm.php:77
+#: src/templates/admin/invKoForm.php:86
 msgid "Use Geographic Location"
 msgstr "Usar ubicación geográfica"
 
-#: src/templates/admin/invKoForm.php:83
+#: src/templates/admin/invKoForm.php:92
 msgid "Exclude Involvements if"
 msgstr "Excluir participaciones si"
 
-#: src/templates/admin/invKoForm.php:87
+#: src/templates/admin/invKoForm.php:96
 msgid "Involvement is Closed"
 msgstr "La participación está cerrada"
 
-#: src/templates/admin/invKoForm.php:91
+#: src/templates/admin/invKoForm.php:100
 msgid "Involvement is a Child Involvement"
 msgstr "La participación es una participación infantil"
 
-#: src/templates/admin/invKoForm.php:113
+#: src/templates/admin/invKoForm.php:122
 msgid "Leader Member Types"
 msgstr "Tipos de miembros de líder"
 
-#: src/templates/admin/invKoForm.php:116
-#: src/templates/admin/invKoForm.php:132
-#: src/templates/admin/invKoForm.php:258
+#: src/templates/admin/invKoForm.php:125
+#: src/templates/admin/invKoForm.php:141
+#: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:188
-#: assets/js/base-defer.js:1119
+#: assets/js/base-defer.js:1123
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/templates/admin/invKoForm.php:128
+#: src/templates/admin/invKoForm.php:137
 msgid "Host Member Types"
 msgstr "Tipos de miembros anfitriones"
 
-#: src/templates/admin/invKoForm.php:144
+#: src/templates/admin/invKoForm.php:153
 msgid "Default Grouping"
 msgstr "Agrupación Predeterminada"
 
-#: src/templates/admin/invKoForm.php:148
+#: src/templates/admin/invKoForm.php:157
 msgid "No Grouping"
 msgstr "Sin agrupar"
 
-#: src/templates/admin/invKoForm.php:149
+#: src/templates/admin/invKoForm.php:158
 msgid "Upcoming / Current"
 msgstr "Próximo / Actual"
 
-#: src/templates/admin/invKoForm.php:150
+#: src/templates/admin/invKoForm.php:159
 msgid "Current / Upcoming"
 msgstr "Actual / Próximo"
 
-#: src/templates/admin/invKoForm.php:156
+#: src/templates/admin/invKoForm.php:165
 msgid "Default Filters"
 msgstr "Filtros predeterminados"
 
-#: src/templates/admin/invKoForm.php:165
+#: src/templates/admin/invKoForm.php:174
 msgid "Gender"
 msgstr "Género"
 
-#: src/templates/admin/invKoForm.php:179
-#: src/TouchPoint-WP/Involvement.php:1445
-#: src/TouchPoint-WP/TouchPointWP.php:1392
+#: src/templates/admin/invKoForm.php:188
+#: src/TouchPoint-WP/Involvement.php:1347
+#: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
-#: src/templates/admin/invKoForm.php:183
-#: src/TouchPoint-WP/Involvement.php:1471
-#: src/TouchPoint-WP/TouchPointWP.php:1439
+#: src/templates/admin/invKoForm.php:192
+#: src/TouchPoint-WP/Involvement.php:1373
+#: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
 
-#: src/templates/admin/invKoForm.php:187
+#: src/templates/admin/invKoForm.php:196
 msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
-#: src/templates/admin/invKoForm.php:191
-#: src/TouchPoint-WP/TouchPointWP.php:1468
+#: src/templates/admin/invKoForm.php:200
+#: src/TouchPoint-WP/Taxonomies.php:831
 msgid "Age Group"
 msgstr "Grupo de edad"
 
-#: src/templates/admin/invKoForm.php:196
+#: src/templates/admin/invKoForm.php:205
 msgid "Task Owner"
 msgstr "Propietario de la tarea"
 
-#: src/templates/admin/invKoForm.php:203
+#: src/templates/admin/invKoForm.php:212
 msgid "Contact Leader Task Keywords"
 msgstr "Palabras clave de la tarea del líder de contacto"
 
-#: src/templates/admin/invKoForm.php:214
+#: src/templates/admin/invKoForm.php:223
 msgid "Join Task Keywords"
 msgstr "Unirse a las palabras clave de la tarea"
 
-#: src/templates/admin/invKoForm.php:230
+#: src/templates/admin/invKoForm.php:239
 msgid "Add Involvement Post Type"
 msgstr "Agregar tipo de publicación de participación"
 
-#: src/templates/admin/invKoForm.php:237
+#: src/templates/admin/invKoForm.php:246
 msgid "Small Group"
 msgstr "Grupo Pequeño"
 
-#: src/templates/admin/invKoForm.php:238
+#: src/templates/admin/invKoForm.php:247
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:368
+#: src/templates/admin/invKoForm.php:378
 msgid "Select..."
 msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:1682
+#: src/templates/parts/meeting-list-none.php:15
+#: src/TouchPoint-WP/Involvement.php:1594
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:20
+#: src/templates/parts/meeting-list-none.php:19
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
@@ -193,11 +195,11 @@ msgstr "Su token de inicio de sesión no es válido."
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
-#: src/TouchPoint-WP/EventsCalendar.php:59
+#: src/TouchPoint-WP/EventsCalendar.php:61
 msgid "Recurring"
 msgstr "Periódico"
 
-#: src/TouchPoint-WP/EventsCalendar.php:62
+#: src/TouchPoint-WP/EventsCalendar.php:64
 msgid "Multi-Day"
 msgstr "varios días"
 
@@ -217,73 +219,73 @@ msgstr "Registro aún no abierto"
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1318
-#: src/TouchPoint-WP/Partner.php:749
+#: src/TouchPoint-WP/Involvement.php:1222
+#: src/TouchPoint-WP/Partner.php:769
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1528
-#: src/TouchPoint-WP/Partner.php:771
+#: src/TouchPoint-WP/Involvement.php:1430
+#: src/TouchPoint-WP/Partner.php:791
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:2776
+#: src/TouchPoint-WP/Involvement.php:2395
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:2779
+#: src/TouchPoint-WP/Involvement.php:2398
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:2842
+#: src/TouchPoint-WP/Involvement.php:2461
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:2850
+#: src/TouchPoint-WP/Involvement.php:2469
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:2855
+#: src/TouchPoint-WP/Involvement.php:2474
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:2859
+#: src/TouchPoint-WP/Involvement.php:2478
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:2864
+#: src/TouchPoint-WP/Involvement.php:2483
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:2867
+#: src/TouchPoint-WP/Involvement.php:2486
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:2870
+#: src/TouchPoint-WP/Involvement.php:2489
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:2873
+#: src/TouchPoint-WP/Involvement.php:2492
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:2880
-#: assets/js/base-defer.js:987
+#: src/TouchPoint-WP/Involvement.php:2499
+#: assets/js/base-defer.js:991
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:2889
-#: src/TouchPoint-WP/Partner.php:1227
+#: src/TouchPoint-WP/Involvement.php:2508
+#: src/TouchPoint-WP/Partner.php:1247
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:778
+#: src/TouchPoint-WP/Partner.php:798
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1184
+#: src/TouchPoint-WP/Partner.php:1204
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -303,520 +305,520 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2508
+#: src/TouchPoint-WP/TouchPointWP.php:1893
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2565
+#: src/TouchPoint-WP/TouchPointWP.php:1950
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2568
+#: src/TouchPoint-WP/TouchPointWP.php:1953
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2571
+#: src/TouchPoint-WP/TouchPointWP.php:1956
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2576
-#: src/TouchPoint-WP/TouchPointWP.php:2577
+#: src/TouchPoint-WP/TouchPointWP.php:1961
+#: src/TouchPoint-WP/TouchPointWP.php:1962
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2705
-#: src/TouchPoint-WP/TouchPointWP.php:2745
+#: src/TouchPoint-WP/TouchPointWP.php:2090
+#: src/TouchPoint-WP/TouchPointWP.php:2130
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2713
-#: src/TouchPoint-WP/TouchPointWP.php:2752
+#: src/TouchPoint-WP/TouchPointWP.php:2098
+#: src/TouchPoint-WP/TouchPointWP.php:2137
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2872
+#: src/TouchPoint-WP/TouchPointWP.php:2257
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:238
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:239
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:243
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:244
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:256
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:274
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:285
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:286
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:307
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:308
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:318
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:319
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:331
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:343
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:355
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:356
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:368
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:380
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:381
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:392
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:393
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:416
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:415
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:432
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:433
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:437
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:438
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:449
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:480
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:450
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:481
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:461
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:492
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:471
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:709
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:472
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:493
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:534
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:504
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:535
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:544
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:523
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:554
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:530
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:561
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:562
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:581
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:586
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:617
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:587
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:618
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:597
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:628
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:629
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:608
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:619
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:620
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:630
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:631
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:643
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:674
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:644
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:675
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:654
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:685
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:655
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:686
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:665
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:666
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:676
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:677
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:687
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:688
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:698
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:699
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:710
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:721
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:722
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:753
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:738
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:769
 msgid "Events Calendar"
 msgstr "Calendario de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr "Integre con el calendario de eventos de ModernTribe."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:743
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:746
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr "Para usar los eventos de su calendario de eventos en la aplicación móvil personalizada, configure el proveedor en <code>Wordpress Plugin - Modern Tribe</code> y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:748
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:779
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:794
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:829
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:883
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:887
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:834
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:888
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:899
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:900
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:911
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:912
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:909
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:976
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:910
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:917
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:984
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:985
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:929
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1008
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1009
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:958
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1026
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:962
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:963
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:974
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1042
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:975
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1043
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:986
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1054
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:987
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1055
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1145
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1226
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1201
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1202
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1282
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1283
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1233
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1314
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1457
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1546
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1589
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1668
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1640
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1719
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
 #: src/TouchPoint-WP/Person.php:1398
-#: src/TouchPoint-WP/Utilities.php:205
+#: src/TouchPoint-WP/Utilities.php:251
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
 
 #: assets/js/base-defer.js:208
-#: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:1158
 msgid "Your Location"
 msgstr "Tu ubicación"
 
@@ -841,95 +843,95 @@ msgstr "Un error desconocido ocurrió."
 msgid "No geolocation option available."
 msgstr "No hay opción de geolocalización disponible."
 
-#: assets/js/base-defer.js:917
-#: assets/js/base-defer.js:954
-#: assets/js/base-defer.js:1411
+#: assets/js/base-defer.js:921
+#: assets/js/base-defer.js:958
+#: assets/js/base-defer.js:1415
 #: assets/js/meeting-defer.js:183
 msgid "Something strange happened."
 msgstr "Algo extraño sucedió."
 
-#: assets/js/base-defer.js:943
-#: assets/js/base-defer.js:1400
+#: assets/js/base-defer.js:947
+#: assets/js/base-defer.js:1404
 msgid "Your message has been sent."
 msgstr "Tu mensaje ha sido enviado."
 
-#: assets/js/base-defer.js:983
+#: assets/js/base-defer.js:987
 msgid "Who is joining the group?"
 msgstr "¿Quién se une al grupo?"
 
-#: assets/js/base-defer.js:988
-#: assets/js/base-defer.js:1046
-#: assets/js/base-defer.js:1362
-#: assets/js/base-defer.js:1455
+#: assets/js/base-defer.js:992
+#: assets/js/base-defer.js:1050
+#: assets/js/base-defer.js:1366
+#: assets/js/base-defer.js:1459
 #: assets/js/meeting-defer.js:225
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: assets/js/base-defer.js:1001
+#: assets/js/base-defer.js:1005
 msgid "Select who should be added to the group."
 msgstr "Seleccione quién debe agregarse al grupo."
 
-#: assets/js/base-defer.js:1039
-#: assets/js/base-defer.js:1355
+#: assets/js/base-defer.js:1043
+#: assets/js/base-defer.js:1359
 msgid "From"
 msgstr "De"
 
-#: assets/js/base-defer.js:1040
-#: assets/js/base-defer.js:1356
+#: assets/js/base-defer.js:1044
+#: assets/js/base-defer.js:1360
 msgid "Message"
 msgstr "Mensaje"
 
-#: assets/js/base-defer.js:1055
-#: assets/js/base-defer.js:1371
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1375
 msgid "Please provide a message."
 msgstr "Proporcione un mensaje."
 
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1142
+#: assets/js/base-defer.js:1144
+#: assets/js/base-defer.js:1146
 msgid "We don't know where you are."
 msgstr "No sabemos dónde estás."
 
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1150
+#: assets/js/base-defer.js:1144
+#: assets/js/base-defer.js:1154
 msgid "Click here to use your actual location."
 msgstr "Haga clic aquí para usar su ubicación real."
 
-#: assets/js/base-defer.js:1301
-#: assets/js/base-defer.js:1318
+#: assets/js/base-defer.js:1305
+#: assets/js/base-defer.js:1322
 msgid "clear"
 msgstr "borrar"
 
-#: assets/js/base-defer.js:1307
+#: assets/js/base-defer.js:1311
 msgid "Other Relatives..."
 msgstr "Otros familiares..."
 
-#: assets/js/base-defer.js:1445
+#: assets/js/base-defer.js:1449
 msgid "Tell us about yourself."
 msgstr "Dinos sobre ti."
 
-#: assets/js/base-defer.js:1447
-#: assets/js/base-defer.js:1502
+#: assets/js/base-defer.js:1451
+#: assets/js/base-defer.js:1506
 msgid "Email Address"
 msgstr "Correo electrónico"
 
-#: assets/js/base-defer.js:1448
-#: assets/js/base-defer.js:1503
+#: assets/js/base-defer.js:1452
+#: assets/js/base-defer.js:1507
 msgid "Zip Code"
 msgstr "Condigo postal"
 
-#: assets/js/base-defer.js:1500
+#: assets/js/base-defer.js:1504
 msgid "Our system doesn't recognize you,<br />so we need a little more info."
 msgstr "Nuestro sistema no te reconoce.<br />Necesitamos un poco más de información."
 
-#: assets/js/base-defer.js:1504
+#: assets/js/base-defer.js:1508
 msgid "First Name"
 msgstr "Primer nombre"
 
-#: assets/js/base-defer.js:1505
+#: assets/js/base-defer.js:1509
 msgid "Last Name"
 msgstr "Apellido"
 
-#: assets/js/base-defer.js:1507
+#: assets/js/base-defer.js:1511
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -973,7 +975,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2813
+#: src/TouchPoint-WP/TouchPointWP.php:2198
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -989,137 +991,137 @@ msgstr[0] "Respuesta registrada"
 msgstr[1] "Respuestas registrada"
 
 #. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:906
+#: assets/js/base-defer.js:910
 msgid "Added to %s"
 msgstr "Añadido a %s"
 
 #. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:967
+#: assets/js/base-defer.js:971
 msgid "Join %s"
 msgstr "Únete %s"
 
 #. translators: %s is a person's name.  This is a heading for a contact modal.
-#: assets/js/base-defer.js:1338
+#: assets/js/base-defer.js:1342
 msgid "Contact %s"
 msgstr "Contactar a %s"
 
 #. translators: %s is the name of an involvement.  This is a heading for a modal.
-#: assets/js/base-defer.js:1022
+#: assets/js/base-defer.js:1026
 msgid "Contact the Leaders of %s"
 msgstr "Contacta a los líderes de %s"
 
-#: assets/js/base-defer.js:1045
-#: assets/js/base-defer.js:1361
+#: assets/js/base-defer.js:1049
+#: assets/js/base-defer.js:1365
 msgid "Send"
 msgstr "Envía"
 
-#: assets/js/base-defer.js:909
-#: assets/js/base-defer.js:920
-#: assets/js/base-defer.js:946
-#: assets/js/base-defer.js:957
-#: assets/js/base-defer.js:1403
-#: assets/js/base-defer.js:1414
+#: assets/js/base-defer.js:913
+#: assets/js/base-defer.js:924
+#: assets/js/base-defer.js:950
+#: assets/js/base-defer.js:961
+#: assets/js/base-defer.js:1407
+#: assets/js/base-defer.js:1418
 #: assets/js/meeting-defer.js:175
 #: assets/js/meeting-defer.js:186
 msgid "OK"
 msgstr "OK"
 
-#: assets/js/base-defer.js:1454
+#: assets/js/base-defer.js:1458
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1493
-#: src/TouchPoint-WP/TouchPointWP.php:1493
+#: src/TouchPoint-WP/Involvement.php:1395
+#: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1506
+#: src/TouchPoint-WP/Involvement.php:1408
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1377
+#: src/TouchPoint-WP/Involvement.php:1279
 msgid "Genders"
 msgstr "Géneros"
 
-#: src/TouchPoint-WP/Utilities.php:69
+#: src/TouchPoint-WP/Utilities.php:107
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr "los domingos"
 
-#: src/TouchPoint-WP/Utilities.php:70
+#: src/TouchPoint-WP/Utilities.php:108
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr "los lunes"
 
-#: src/TouchPoint-WP/Utilities.php:71
+#: src/TouchPoint-WP/Utilities.php:109
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr "los martes"
 
-#: src/TouchPoint-WP/Utilities.php:72
+#: src/TouchPoint-WP/Utilities.php:110
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr "los miércoles"
 
-#: src/TouchPoint-WP/Utilities.php:73
+#: src/TouchPoint-WP/Utilities.php:111
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr "los jueves"
 
-#: src/TouchPoint-WP/Utilities.php:74
+#: src/TouchPoint-WP/Utilities.php:112
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr "los viernes"
 
-#: src/TouchPoint-WP/Utilities.php:75
+#: src/TouchPoint-WP/Utilities.php:113
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr "los sábados"
 
-#: src/TouchPoint-WP/Utilities.php:111
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:159
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr "Dom"
 
-#: src/TouchPoint-WP/Utilities.php:112
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:160
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr "Lun"
 
-#: src/TouchPoint-WP/Utilities.php:113
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:161
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr "Mar"
 
-#: src/TouchPoint-WP/Utilities.php:114
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:162
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr "Mié"
 
-#: src/TouchPoint-WP/Utilities.php:115
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:163
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr "Jue"
 
-#: src/TouchPoint-WP/Utilities.php:116
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:164
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr "Vie"
 
-#: src/TouchPoint-WP/Utilities.php:117
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:165
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/templates/admin/invKoForm.php:95
+#: src/templates/admin/invKoForm.php:104
 msgid "Based on Involvement setting in TouchPoint"
 msgstr "Basado en la configuración de participación en TouchPoint"
 
-#: src/templates/admin/invKoForm.php:95
+#: src/templates/admin/invKoForm.php:104
 msgid "Involvement does not meet weekly"
 msgstr "La participación no se reúne semanalmente"
 
-#: src/templates/admin/invKoForm.php:99
+#: src/templates/admin/invKoForm.php:108
 msgid "Involvement does not have a Schedule"
 msgstr "La participación no tiene horario"
 
@@ -1155,255 +1157,254 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:884
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:890
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
-#: src/TouchPoint-WP/Utilities.php:161
+#: src/TouchPoint-WP/Utilities.php:207
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr "Tarde en la noche"
 
-#: src/TouchPoint-WP/Utilities.php:163
+#: src/TouchPoint-WP/Utilities.php:209
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr "Madrugada"
 
-#: src/TouchPoint-WP/Utilities.php:165
+#: src/TouchPoint-WP/Utilities.php:211
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr "Mañana"
 
-#: src/TouchPoint-WP/Utilities.php:167
+#: src/TouchPoint-WP/Utilities.php:213
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr "Mediodía"
 
-#: src/TouchPoint-WP/Utilities.php:169
+#: src/TouchPoint-WP/Utilities.php:215
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: src/TouchPoint-WP/Utilities.php:171
+#: src/TouchPoint-WP/Utilities.php:217
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr "Tardecita"
 
-#: src/TouchPoint-WP/Utilities.php:173
+#: src/TouchPoint-WP/Utilities.php:219
 msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1494
+#: src/TouchPoint-WP/Involvement.php:1396
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1495
+#: src/TouchPoint-WP/Involvement.php:1397
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1536
-#: src/TouchPoint-WP/Partner.php:787
+#: src/TouchPoint-WP/Involvement.php:1438
+#: src/TouchPoint-WP/Partner.php:807
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1539
-#: src/TouchPoint-WP/Partner.php:790
+#: src/TouchPoint-WP/Involvement.php:1441
+#: src/TouchPoint-WP/Partner.php:810
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:712
-#: src/TouchPoint-WP/Involvement.php:732
+#: src/TouchPoint-WP/Involvement.php:644
+#: src/TouchPoint-WP/Involvement.php:664
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:741
+#: src/TouchPoint-WP/Involvement.php:673
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:748
+#: src/TouchPoint-WP/Involvement.php:680
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:758
+#: src/TouchPoint-WP/Involvement.php:690
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:764
+#: src/TouchPoint-WP/Involvement.php:696
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:773
+#: src/TouchPoint-WP/Involvement.php:705
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:779
+#: src/TouchPoint-WP/Involvement.php:711
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:2803
+#: src/TouchPoint-WP/Involvement.php:2422
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:344
-msgid "The username of a user account in TouchPoint with API permissions."
-msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos de API."
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
+msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
 #: src/templates/admin/invKoForm.php:103
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr "La participación tiene un tipo de registro de \"No Online Registration\""
 
-#: src/templates/admin/invKoForm.php:107
+#: src/templates/admin/invKoForm.php:116
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1628
+#: src/TouchPoint-WP/Involvement.php:1535
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1638
+#: src/TouchPoint-WP/Involvement.php:1545
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1657
+#: src/TouchPoint-WP/Involvement.php:1564
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:91
-#: src/TouchPoint-WP/TouchPointWP.php:990
+#: src/TouchPoint-WP/Meeting.php:338
+#: src/TouchPoint-WP/TouchPointWP.php:945
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:119
-#: src/TouchPoint-WP/TouchPointWP.php:369
+#: src/TouchPoint-WP/Meeting.php:366
+#: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:129
-#: src/TouchPoint-WP/TouchPointWP.php:378
+#: src/TouchPoint-WP/Meeting.php:376
+#: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:2941
-#: src/TouchPoint-WP/Involvement.php:3018
+#: src/TouchPoint-WP/Involvement.php:2560
+#: src/TouchPoint-WP/Involvement.php:2637
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:296
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1302
+#: src/TouchPoint-WP/Taxonomies.php:652
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1334
+#: src/TouchPoint-WP/Taxonomies.php:681
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1365
+#: src/TouchPoint-WP/Taxonomies.php:712
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1391
+#: src/TouchPoint-WP/Taxonomies.php:743
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1392
+#: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1414
+#: src/TouchPoint-WP/Taxonomies.php:770
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1415
+#: src/TouchPoint-WP/Taxonomies.php:774
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1415
+#: src/TouchPoint-WP/Taxonomies.php:774
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1438
+#: src/TouchPoint-WP/Taxonomies.php:797
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1439
+#: src/TouchPoint-WP/Taxonomies.php:803
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1467
+#: src/TouchPoint-WP/Taxonomies.php:829
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1468
+#: src/TouchPoint-WP/Taxonomies.php:832
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1492
+#: src/TouchPoint-WP/Taxonomies.php:858
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/TouchPointWP.php:1493
+#: src/TouchPoint-WP/Taxonomies.php:864
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1523
+#: src/TouchPoint-WP/Taxonomies.php:896
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:297
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1275
+#: src/TouchPoint-WP/Taxonomies.php:51
 msgid "Search %s"
 msgstr "Buscar %s"
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1277
+#: src/TouchPoint-WP/Taxonomies.php:53
 msgid "All %s"
 msgstr "Todos los %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1279
+#: src/TouchPoint-WP/Taxonomies.php:55
 msgid "Edit %s"
 msgstr "Editar %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1281
+#: src/TouchPoint-WP/Taxonomies.php:57
 msgid "Update %s"
 msgstr "Actualizar %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1283
+#: src/TouchPoint-WP/Taxonomies.php:59
 msgid "Add New %s"
 msgstr "Agregar Nuevo %s"
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1285
+#: src/TouchPoint-WP/Taxonomies.php:61
 msgid "New %s"
 msgstr "Nuevo %s"
 
@@ -1420,11 +1421,11 @@ msgstr "Informe de TouchPoint"
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:274
+#: src/TouchPoint-WP/TouchPointWP.php:259
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1420
+#: src/TouchPoint-WP/Involvement.php:1322
 msgid "Language"
 msgstr "Idioma"
 
@@ -1441,72 +1442,60 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:776
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:781
+#: src/templates/admin/invKoForm.php:78
+msgid "Import All Meetings to Calendar"
+msgstr "Importe reuniones a los calendarios"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:812
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:782
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:794
-msgid "Months of History"
-msgstr "Meses de historia"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
-msgid "Meetings will be kept for the public calendar until the event is this many months in the past.  Note that due to limitations in TouchPoint's approach to events, Meetings cannot be fully updated once they occur."
-msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan pasado tantos meses del evento. Tenga en cuenta que debido a las limitaciones en el enfoque de TouchPoint hacia los eventos, las reuniones no se pueden actualizar por completo una vez que ocurren."
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
-msgid "Months of Future"
-msgstr "Meses de futuro"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:805
-msgid "Meetings more than this many months in the future will not be imported."
-msgstr "No se importarán reuniones que se realicen más de estos meses en el futuro."
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Meeting Deletion Handling"
 msgstr "Manejo de eliminación de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:815
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
 msgid "Always delete from WordPress"
 msgstr "Eliminar siempre de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:819
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3005
+#: src/TouchPoint-WP/Involvement.php:2624
 #: src/TouchPoint-WP/Person.php:1720
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:494
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:332
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:414
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
-#: assets/js/base-defer.js:1488
+#: assets/js/base-defer.js:1492
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
@@ -1514,7 +1503,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:2995
+#: src/TouchPoint-WP/Involvement.php:2614
 #: src/TouchPoint-WP/Person.php:1737
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1522,3 +1511,72 @@ msgstr "Contacto bloqueado por spam."
 #: src/TouchPoint-WP/Person.php:1541
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
+
+#: src/templates/meeting-archive.php:28
+#: src/templates/parts/meeting-list-none.php:13
+#: src/TouchPoint-WP/Meeting.php:189
+msgctxt "What Meetings should be called, plural."
+msgid "Events"
+msgstr "Eventos"
+
+#: src/TouchPoint-WP/Meeting.php:190
+msgctxt "What Meetings should be called, singular."
+msgid "Event"
+msgstr "Evento"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+msgid "Enable Meeting Calendar"
+msgstr "Habilitar calendario de reuniones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+msgid "Load Meetings from TouchPoint for a calendar, native in your website."
+msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:825
+msgid "Days of Future"
+msgstr "Días del futuro"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+msgid "Meetings more than this many days in the future will not be imported."
+msgstr "No se importarán reuniones que superen estos días en el futuro."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+msgid "Archive After Days"
+msgstr "Archivo después de días"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
+msgstr "Las reuniones que hayan transcurrido más de esta cantidad de días pasados se trasladarán al Archivo de eventos. Una vez que pase esta fecha, la información de la reunión ya no se actualizará."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+msgid "Days of History"
+msgstr "Días de la Historia"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
+msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan transcurrido tantos días desde el evento."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1067
+msgid "Post Types"
+msgstr "Tipos de publicaciones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
+msgid "Select post types which should have Divisions available as a native taxonomy."
+msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
+msgid "Select post types which should have Resident Codes available as a native taxonomy."
+msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
+
+#: src/TouchPoint-WP/meetingT.php:46
+msgid "Tonight"
+msgstr "este noche"
+
+#: src/TouchPoint-WP/meetingT.php:48
+msgid "Today"
+msgstr "hoy"
+
+#: src/TouchPoint-WP/meetingT.php:55
+msgid "Tomorrow"
+msgstr "mañana"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index a6df4947..cc2a2f6a 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -1,17 +1,17 @@
-# Copyright (C) 2023 James K
+# Copyright (C) 2024 James K
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 1.0.0\n"
+"Project-Id-Version: TouchPoint WP 0.0.90\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-10-19T02:39:34+00:00\n"
+"POT-Creation-Date: 2024-02-10T23:17:42+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.8.1\n"
+"X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: TouchPoint-WP\n"
 
 #. Plugin Name of the plugin
@@ -53,7 +53,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:870
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:924
 msgid "Divisions to Import"
 msgstr ""
 
@@ -69,130 +69,134 @@ msgstr ""
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:77
+#: src/templates/admin/invKoForm.php:78
+msgid "Import All Meetings to Calendar"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:86
 msgid "Use Geographic Location"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:83
+#: src/templates/admin/invKoForm.php:92
 msgid "Exclude Involvements if"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:87
+#: src/templates/admin/invKoForm.php:96
 msgid "Involvement is Closed"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:91
+#: src/templates/admin/invKoForm.php:100
 msgid "Involvement is a Child Involvement"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:95
+#: src/templates/admin/invKoForm.php:104
 msgid "Based on Involvement setting in TouchPoint"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:95
+#: src/templates/admin/invKoForm.php:104
 msgid "Involvement does not meet weekly"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:99
+#: src/templates/admin/invKoForm.php:108
 msgid "Involvement does not have a Schedule"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:103
+#: src/templates/admin/invKoForm.php:112
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:107
+#: src/templates/admin/invKoForm.php:116
 msgid "Involvement registration has ended (end date is past)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:113
+#: src/templates/admin/invKoForm.php:122
 msgid "Leader Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:116
-#: src/templates/admin/invKoForm.php:132
-#: src/templates/admin/invKoForm.php:258
+#: src/templates/admin/invKoForm.php:125
+#: src/templates/admin/invKoForm.php:141
+#: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:188
-#: assets/js/base-defer.js:1119
+#: assets/js/base-defer.js:1123
 msgid "Loading..."
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:128
+#: src/templates/admin/invKoForm.php:137
 msgid "Host Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:144
+#: src/templates/admin/invKoForm.php:153
 msgid "Default Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:148
+#: src/templates/admin/invKoForm.php:157
 msgid "No Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:149
+#: src/templates/admin/invKoForm.php:158
 msgid "Upcoming / Current"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:150
+#: src/templates/admin/invKoForm.php:159
 msgid "Current / Upcoming"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:156
+#: src/templates/admin/invKoForm.php:165
 msgid "Default Filters"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:165
+#: src/templates/admin/invKoForm.php:174
 msgid "Gender"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:179
-#: src/TouchPoint-WP/Involvement.php:1445
-#: src/TouchPoint-WP/TouchPointWP.php:1392
+#: src/templates/admin/invKoForm.php:188
+#: src/TouchPoint-WP/Involvement.php:1347
+#: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:183
-#: src/TouchPoint-WP/Involvement.php:1471
-#: src/TouchPoint-WP/TouchPointWP.php:1439
+#: src/templates/admin/invKoForm.php:192
+#: src/TouchPoint-WP/Involvement.php:1373
+#: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:187
+#: src/templates/admin/invKoForm.php:196
 msgid "Prevailing Marital Status"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:191
-#: src/TouchPoint-WP/TouchPointWP.php:1468
+#: src/templates/admin/invKoForm.php:200
+#: src/TouchPoint-WP/Taxonomies.php:831
 msgid "Age Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:196
+#: src/templates/admin/invKoForm.php:205
 msgid "Task Owner"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:203
+#: src/templates/admin/invKoForm.php:212
 msgid "Contact Leader Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:214
+#: src/templates/admin/invKoForm.php:223
 msgid "Join Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:230
+#: src/templates/admin/invKoForm.php:239
 msgid "Add Involvement Post Type"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:237
+#: src/templates/admin/invKoForm.php:246
 msgid "Small Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:238
+#: src/templates/admin/invKoForm.php:247
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:368
+#: src/templates/admin/invKoForm.php:378
 msgid "Select..."
 msgstr ""
 
@@ -228,20 +232,29 @@ msgstr ""
 msgid "The Campus"
 msgstr ""
 
+#: src/templates/meeting-archive.php:28
+#: src/templates/parts/meeting-list-none.php:13
+#: src/TouchPoint-WP/Meeting.php:189
+msgctxt "What Meetings should be called, plural."
+msgid "Events"
+msgstr ""
+
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:1682
+#: src/templates/parts/meeting-list-none.php:15
+#: src/TouchPoint-WP/Involvement.php:1594
 msgid "No %s Found."
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:20
+#: src/templates/parts/meeting-list-none.php:19
 msgid "%s will be imported overnight for the first time."
 msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:2803
+#: src/TouchPoint-WP/Involvement.php:2422
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -263,11 +276,11 @@ msgstr ""
 msgid "Session could not be validated."
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:59
+#: src/TouchPoint-WP/EventsCalendar.php:61
 msgid "Recurring"
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:62
+#: src/TouchPoint-WP/EventsCalendar.php:64
 msgid "Multi-Day"
 msgstr ""
 
@@ -288,189 +301,206 @@ msgid "Registration Closed"
 msgstr ""
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:712
-#: src/TouchPoint-WP/Involvement.php:732
+#: src/TouchPoint-WP/Involvement.php:644
+#: src/TouchPoint-WP/Involvement.php:664
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:741
+#: src/TouchPoint-WP/Involvement.php:673
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:748
+#: src/TouchPoint-WP/Involvement.php:680
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:758
+#: src/TouchPoint-WP/Involvement.php:690
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:764
+#: src/TouchPoint-WP/Involvement.php:696
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:773
+#: src/TouchPoint-WP/Involvement.php:705
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:779
+#: src/TouchPoint-WP/Involvement.php:711
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1318
-#: src/TouchPoint-WP/Partner.php:749
+#: src/TouchPoint-WP/Involvement.php:1222
+#: src/TouchPoint-WP/Partner.php:769
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1377
+#: src/TouchPoint-WP/Involvement.php:1279
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1420
+#: src/TouchPoint-WP/Involvement.php:1322
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1493
-#: src/TouchPoint-WP/TouchPointWP.php:1493
+#: src/TouchPoint-WP/Involvement.php:1395
+#: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1494
+#: src/TouchPoint-WP/Involvement.php:1396
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1495
+#: src/TouchPoint-WP/Involvement.php:1397
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1506
+#: src/TouchPoint-WP/Involvement.php:1408
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1528
-#: src/TouchPoint-WP/Partner.php:771
+#: src/TouchPoint-WP/Involvement.php:1430
+#: src/TouchPoint-WP/Partner.php:791
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1536
-#: src/TouchPoint-WP/Partner.php:787
+#: src/TouchPoint-WP/Involvement.php:1438
+#: src/TouchPoint-WP/Partner.php:807
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1539
-#: src/TouchPoint-WP/Partner.php:790
+#: src/TouchPoint-WP/Involvement.php:1441
+#: src/TouchPoint-WP/Partner.php:810
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1628
+#: src/TouchPoint-WP/Involvement.php:1535
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1638
+#: src/TouchPoint-WP/Involvement.php:1545
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1657
+#: src/TouchPoint-WP/Involvement.php:1564
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2776
+#: src/TouchPoint-WP/Involvement.php:2395
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2779
+#: src/TouchPoint-WP/Involvement.php:2398
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2842
+#: src/TouchPoint-WP/Involvement.php:2461
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2850
+#: src/TouchPoint-WP/Involvement.php:2469
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2855
+#: src/TouchPoint-WP/Involvement.php:2474
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2859
+#: src/TouchPoint-WP/Involvement.php:2478
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2864
+#: src/TouchPoint-WP/Involvement.php:2483
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2867
+#: src/TouchPoint-WP/Involvement.php:2486
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2870
+#: src/TouchPoint-WP/Involvement.php:2489
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2873
+#: src/TouchPoint-WP/Involvement.php:2492
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2880
-#: assets/js/base-defer.js:987
+#: src/TouchPoint-WP/Involvement.php:2499
+#: assets/js/base-defer.js:991
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2889
-#: src/TouchPoint-WP/Partner.php:1227
+#: src/TouchPoint-WP/Involvement.php:2508
+#: src/TouchPoint-WP/Partner.php:1247
 msgid "Show on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2941
-#: src/TouchPoint-WP/Involvement.php:3018
+#: src/TouchPoint-WP/Involvement.php:2560
+#: src/TouchPoint-WP/Involvement.php:2637
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2995
+#: src/TouchPoint-WP/Involvement.php:2614
 #: src/TouchPoint-WP/Person.php:1737
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3005
+#: src/TouchPoint-WP/Involvement.php:2624
 #: src/TouchPoint-WP/Person.php:1720
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:91
-#: src/TouchPoint-WP/TouchPointWP.php:990
+#: src/TouchPoint-WP/Meeting.php:190
+msgctxt "What Meetings should be called, singular."
+msgid "Event"
+msgstr ""
+
+#: src/TouchPoint-WP/Meeting.php:338
+#: src/TouchPoint-WP/TouchPointWP.php:945
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:119
-#: src/TouchPoint-WP/TouchPointWP.php:369
+#: src/TouchPoint-WP/Meeting.php:366
+#: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:129
-#: src/TouchPoint-WP/TouchPointWP.php:378
+#: src/TouchPoint-WP/Meeting.php:376
+#: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
+#: src/TouchPoint-WP/meetingT.php:46
+msgid "Tonight"
+msgstr ""
+
+#: src/TouchPoint-WP/meetingT.php:48
+msgid "Today"
+msgstr ""
+
+#: src/TouchPoint-WP/meetingT.php:55
+msgid "Tomorrow"
+msgstr ""
+
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:778
+#: src/TouchPoint-WP/Partner.php:798
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1184
+#: src/TouchPoint-WP/Partner.php:1204
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -487,7 +517,7 @@ msgid "Contact"
 msgstr ""
 
 #: src/TouchPoint-WP/Person.php:1398
-#: src/TouchPoint-WP/Utilities.php:205
+#: src/TouchPoint-WP/Utilities.php:251
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
@@ -522,799 +552,827 @@ msgstr ""
 msgid "RSVP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:274
-msgid "Every 15 minutes"
-msgstr ""
-
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1275
+#: src/TouchPoint-WP/Taxonomies.php:51
 msgid "Search %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/TouchPointWP.php:1277
+#: src/TouchPoint-WP/Taxonomies.php:53
 msgid "All %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1279
+#: src/TouchPoint-WP/Taxonomies.php:55
 msgid "Edit %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1281
+#: src/TouchPoint-WP/Taxonomies.php:57
 msgid "Update %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1283
+#: src/TouchPoint-WP/Taxonomies.php:59
 msgid "Add New %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1285
+#: src/TouchPoint-WP/Taxonomies.php:61
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1302
+#: src/TouchPoint-WP/Taxonomies.php:652
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1334
+#: src/TouchPoint-WP/Taxonomies.php:681
 msgid "Classify posts by their church campus."
 msgstr ""
 
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/TouchPointWP.php:1365
+#: src/TouchPoint-WP/Taxonomies.php:712
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1391
+#: src/TouchPoint-WP/Taxonomies.php:743
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1392
+#: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1414
+#: src/TouchPoint-WP/Taxonomies.php:770
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1415
+#: src/TouchPoint-WP/Taxonomies.php:774
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1415
+#: src/TouchPoint-WP/Taxonomies.php:774
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1438
+#: src/TouchPoint-WP/Taxonomies.php:797
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1439
+#: src/TouchPoint-WP/Taxonomies.php:803
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1467
+#: src/TouchPoint-WP/Taxonomies.php:829
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1468
+#: src/TouchPoint-WP/Taxonomies.php:832
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1492
+#: src/TouchPoint-WP/Taxonomies.php:858
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1493
+#: src/TouchPoint-WP/Taxonomies.php:864
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1523
+#: src/TouchPoint-WP/Taxonomies.php:896
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2508
+#: src/TouchPoint-WP/TouchPointWP.php:259
+msgid "Every 15 minutes"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:1893
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2565
+#: src/TouchPoint-WP/TouchPointWP.php:1950
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2568
+#: src/TouchPoint-WP/TouchPointWP.php:1953
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2571
+#: src/TouchPoint-WP/TouchPointWP.php:1956
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2576
-#: src/TouchPoint-WP/TouchPointWP.php:2577
+#: src/TouchPoint-WP/TouchPointWP.php:1961
+#: src/TouchPoint-WP/TouchPointWP.php:1962
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2705
-#: src/TouchPoint-WP/TouchPointWP.php:2745
+#: src/TouchPoint-WP/TouchPointWP.php:2090
+#: src/TouchPoint-WP/TouchPointWP.php:2130
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2713
-#: src/TouchPoint-WP/TouchPointWP.php:2752
+#: src/TouchPoint-WP/TouchPointWP.php:2098
+#: src/TouchPoint-WP/TouchPointWP.php:2137
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2813
+#: src/TouchPoint-WP/TouchPointWP.php:2198
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2872
+#: src/TouchPoint-WP/TouchPointWP.php:2257
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:238
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:239
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:243
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:244
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:256
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:274
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+msgid "Enable Meeting Calendar"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+msgid "Load Meetings from TouchPoint for a calendar, native in your website."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:285
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:286
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:296
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:297
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:307
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:308
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:318
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:319
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:331
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:332
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:343
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:344
-msgid "The username of a user account in TouchPoint with API permissions."
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:355
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:356
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:368
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:380
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:381
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:392
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:393
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:416
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:414
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:415
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:432
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:433
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:437
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:438
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:449
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:480
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:450
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:481
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:461
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:492
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:471
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:709
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:472
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:493
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:494
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:534
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:504
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:535
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:544
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:523
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:554
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:530
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:561
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:562
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:581
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:586
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:617
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:587
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:618
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:597
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:628
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:629
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:608
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:619
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:620
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:630
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:631
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:643
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:674
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:644
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:675
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:654
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:685
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:655
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:686
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:665
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:666
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:676
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:677
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:687
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:688
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:698
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:699
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:710
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:721
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:722
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:753
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:738
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:769
 msgid "Events Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:743
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:746
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:748
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:779
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:794
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:776
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:781
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:812
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:782
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:794
-msgid "Months of History"
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:825
+msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
-msgid "Meetings will be kept for the public calendar until the event is this many months in the past.  Note that due to limitations in TouchPoint's approach to events, Meetings cannot be fully updated once they occur."
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
-msgid "Months of Future"
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:805
-msgid "Meetings more than this many months in the future will not be imported."
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+msgid "Days of History"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Meeting Deletion Handling"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:815
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
 msgid "Always delete from WordPress"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:819
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
 msgid "Mark the occurrence as cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:829
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:883
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:887
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:834
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:888
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:899
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:900
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:911
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:912
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:884
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:890
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1067
+msgid "Post Types"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
+msgid "Select post types which should have Divisions available as a native taxonomy."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:909
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:976
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:910
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:917
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:984
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:985
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:929
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1008
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1009
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:958
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1026
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:962
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:963
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:974
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1042
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:975
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1043
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:986
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1054
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:987
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1055
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1145
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
+msgid "Select post types which should have Resident Codes available as a native taxonomy."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1226
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1201
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1202
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1282
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1283
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1233
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1314
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1457
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1546
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1589
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1668
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1640
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1719
 msgid "Save Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:69
+#: src/TouchPoint-WP/Utilities.php:107
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:70
+#: src/TouchPoint-WP/Utilities.php:108
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:71
+#: src/TouchPoint-WP/Utilities.php:109
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:72
+#: src/TouchPoint-WP/Utilities.php:110
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:73
+#: src/TouchPoint-WP/Utilities.php:111
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:74
+#: src/TouchPoint-WP/Utilities.php:112
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:75
+#: src/TouchPoint-WP/Utilities.php:113
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:111
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:159
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:112
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:160
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:113
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:161
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:114
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:162
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:115
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:163
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:116
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:164
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:117
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:165
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:161
+#: src/TouchPoint-WP/Utilities.php:207
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:163
+#: src/TouchPoint-WP/Utilities.php:209
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:165
+#: src/TouchPoint-WP/Utilities.php:211
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:167
+#: src/TouchPoint-WP/Utilities.php:213
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:169
+#: src/TouchPoint-WP/Utilities.php:215
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:171
+#: src/TouchPoint-WP/Utilities.php:217
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:173
+#: src/TouchPoint-WP/Utilities.php:219
 msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
 #: assets/js/base-defer.js:208
-#: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:1158
 msgid "Your Location"
 msgstr ""
 
@@ -1340,138 +1398,138 @@ msgid "No geolocation option available."
 msgstr ""
 
 #. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:906
+#: assets/js/base-defer.js:910
 msgid "Added to %s"
 msgstr ""
 
-#: assets/js/base-defer.js:909
-#: assets/js/base-defer.js:920
-#: assets/js/base-defer.js:946
-#: assets/js/base-defer.js:957
-#: assets/js/base-defer.js:1403
-#: assets/js/base-defer.js:1414
+#: assets/js/base-defer.js:913
+#: assets/js/base-defer.js:924
+#: assets/js/base-defer.js:950
+#: assets/js/base-defer.js:961
+#: assets/js/base-defer.js:1407
+#: assets/js/base-defer.js:1418
 #: assets/js/meeting-defer.js:175
 #: assets/js/meeting-defer.js:186
 msgid "OK"
 msgstr ""
 
-#: assets/js/base-defer.js:917
-#: assets/js/base-defer.js:954
-#: assets/js/base-defer.js:1411
+#: assets/js/base-defer.js:921
+#: assets/js/base-defer.js:958
+#: assets/js/base-defer.js:1415
 #: assets/js/meeting-defer.js:183
 msgid "Something strange happened."
 msgstr ""
 
-#: assets/js/base-defer.js:943
-#: assets/js/base-defer.js:1400
+#: assets/js/base-defer.js:947
+#: assets/js/base-defer.js:1404
 msgid "Your message has been sent."
 msgstr ""
 
 #. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:967
+#: assets/js/base-defer.js:971
 msgid "Join %s"
 msgstr ""
 
-#: assets/js/base-defer.js:983
+#: assets/js/base-defer.js:987
 msgid "Who is joining the group?"
 msgstr ""
 
-#: assets/js/base-defer.js:988
-#: assets/js/base-defer.js:1046
-#: assets/js/base-defer.js:1362
-#: assets/js/base-defer.js:1455
+#: assets/js/base-defer.js:992
+#: assets/js/base-defer.js:1050
+#: assets/js/base-defer.js:1366
+#: assets/js/base-defer.js:1459
 #: assets/js/meeting-defer.js:225
 msgid "Cancel"
 msgstr ""
 
-#: assets/js/base-defer.js:1001
+#: assets/js/base-defer.js:1005
 msgid "Select who should be added to the group."
 msgstr ""
 
 #. translators: %s is the name of an involvement.  This is a heading for a modal.
-#: assets/js/base-defer.js:1022
+#: assets/js/base-defer.js:1026
 msgid "Contact the Leaders of %s"
 msgstr ""
 
-#: assets/js/base-defer.js:1039
-#: assets/js/base-defer.js:1355
+#: assets/js/base-defer.js:1043
+#: assets/js/base-defer.js:1359
 msgid "From"
 msgstr ""
 
-#: assets/js/base-defer.js:1040
-#: assets/js/base-defer.js:1356
+#: assets/js/base-defer.js:1044
+#: assets/js/base-defer.js:1360
 msgid "Message"
 msgstr ""
 
-#: assets/js/base-defer.js:1045
-#: assets/js/base-defer.js:1361
+#: assets/js/base-defer.js:1049
+#: assets/js/base-defer.js:1365
 msgid "Send"
 msgstr ""
 
-#: assets/js/base-defer.js:1055
-#: assets/js/base-defer.js:1371
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1375
 msgid "Please provide a message."
 msgstr ""
 
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1142
+#: assets/js/base-defer.js:1144
+#: assets/js/base-defer.js:1146
 msgid "We don't know where you are."
 msgstr ""
 
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1150
+#: assets/js/base-defer.js:1144
+#: assets/js/base-defer.js:1154
 msgid "Click here to use your actual location."
 msgstr ""
 
-#: assets/js/base-defer.js:1301
-#: assets/js/base-defer.js:1318
+#: assets/js/base-defer.js:1305
+#: assets/js/base-defer.js:1322
 msgid "clear"
 msgstr ""
 
-#: assets/js/base-defer.js:1307
+#: assets/js/base-defer.js:1311
 msgid "Other Relatives..."
 msgstr ""
 
 #. translators: %s is a person's name.  This is a heading for a contact modal.
-#: assets/js/base-defer.js:1338
+#: assets/js/base-defer.js:1342
 msgid "Contact %s"
 msgstr ""
 
-#: assets/js/base-defer.js:1445
+#: assets/js/base-defer.js:1449
 msgid "Tell us about yourself."
 msgstr ""
 
-#: assets/js/base-defer.js:1447
-#: assets/js/base-defer.js:1502
+#: assets/js/base-defer.js:1451
+#: assets/js/base-defer.js:1506
 msgid "Email Address"
 msgstr ""
 
-#: assets/js/base-defer.js:1448
-#: assets/js/base-defer.js:1503
+#: assets/js/base-defer.js:1452
+#: assets/js/base-defer.js:1507
 msgid "Zip Code"
 msgstr ""
 
-#: assets/js/base-defer.js:1454
+#: assets/js/base-defer.js:1458
 msgid "Next"
 msgstr ""
 
-#: assets/js/base-defer.js:1488
+#: assets/js/base-defer.js:1492
 msgid "Something went wrong."
 msgstr ""
 
-#: assets/js/base-defer.js:1500
+#: assets/js/base-defer.js:1504
 msgid "Our system doesn't recognize you,<br />so we need a little more info."
 msgstr ""
 
-#: assets/js/base-defer.js:1504
+#: assets/js/base-defer.js:1508
 msgid "First Name"
 msgstr ""
 
-#: assets/js/base-defer.js:1505
+#: assets/js/base-defer.js:1509
 msgid "Last Name"
 msgstr ""
 
-#: assets/js/base-defer.js:1507
+#: assets/js/base-defer.js:1511
 msgid "Phone"
 msgstr ""
 

From 92256909c545f487ab3bd08ab3fb65b8806d676e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 11 Feb 2024 16:49:34 -0500
Subject: [PATCH 067/423] Down payment on #177

---
 src/TouchPoint-WP/Involvement.php | 47 +++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 77cf67b1..df181959 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -395,7 +395,18 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 	 */
 	public static function templateFilter(string $template): string
 	{
-		if (apply_filters(TouchPointWP::HOOK_PREFIX . 'use_default_templates', true, self::class)) {
+		/**
+		 * Determines whether the plugin's default templates should be used.  Theme developers can return false in this
+		 * filter to prevent the default templates from applying, especially if they conflict with the theme.
+		 * 
+		 * Default is true.
+		 *
+		 * @since 0.0.6
+		 *
+		 * @param bool $value The value to return.  True will allow the default templates to be applied.
+		 * @param string $className The name of the class calling for the template.
+		 */
+		if (!!apply_filters('tp_use_default_templates', true, self::class)) {
 			$postTypesToFilter        = Involvement_PostTypeSettings::getPostTypes();
 			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
@@ -2752,43 +2763,43 @@ public function toJsonLD(): ?array
 	 */
 	public function notableAttributes(array $exclude = []): array
 	{
-		$r = [];
+		$attrs = [];
 
 		$schStr = self::scheduleString($this->invId, $this);
 		if ($schStr) {
-			$r[] = $schStr;
+			$attrs[] = $schStr;
 		}
 		unset($schStr);
 
 		if ($this->locationName) {
-			$r[] = $this->locationName;
+			$attrs[] = $this->locationName;
 		}
 
 		foreach ($this->getDivisionsStrings() as $a) {
-			$r[] = $a;
+			$attrs[] = $a;
 		}
 
 		if ($this->leaders()->count() > 0) {
-			$r[] = $this->leaders()->__toString();
+			$attrs[] = $this->leaders()->__toString();
 		}
 
 		if ($this->genderId != 0) {
 			switch ($this->genderId) {
 				case 1:
-					$r[] = __('Men Only', 'TouchPoint-WP');
+					$attrs[] = __('Men Only', 'TouchPoint-WP');
 					break;
 				case 2:
-					$r[] = __('Women Only', 'TouchPoint-WP');
+					$attrs[] = __('Women Only', 'TouchPoint-WP');
 					break;
 			}
 		}
 
 		$canJoin = $this->acceptingNewMembers();
 		if (is_string($canJoin)) {
-			$r[] = $canJoin;
+			$attrs[] = $canJoin;
 		}
 
-		$r = array_filter($r, fn($i) => ! in_array($i, $exclude));
+		$attrs = array_filter($attrs, fn($i) => ! in_array($i, $exclude));
 
 		if ($this->hasGeo() &&
 			(
@@ -2801,7 +2812,7 @@ public function notableAttributes(array $exclude = []): array
 		) {
 			$dist = $this->getDistance();
 			if ($dist !== false) {
-				$r[] = wp_sprintf(
+				$attrs[] = wp_sprintf(
 					_x(
 						"%2.1fmi",
 						"miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'",
@@ -2812,7 +2823,19 @@ public function notableAttributes(array $exclude = []): array
 			}
 		}
 
-		return apply_filters(TouchPointWP::HOOK_PREFIX . "involvement_attributes", $r, $this);
+		/**
+		 * Allows for manipulation of the notable attributes strings for an Involvement.  An array of strings. 
+		 * Typically, these are the standardized strings that appear on the Involvement to give information about it,
+		 * such as the schedule, leaders, and location.
+		 *
+		 * @see Involvement::notableAttributes()
+		 *
+		 * @since 0.0.11
+		 *
+		 * @param string[] $attrs The list of notable attributes.
+		 * @param Involvement $this The Involvement object.
+		 */
+		return apply_filters("tp_involvement_attributes", $attrs, $this);
 	}
 
 	/**

From ffef10b418ac031c8034834198e673450089987b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 12 Feb 2024 20:11:26 -0500
Subject: [PATCH 068/423] Resolve an issue of a deprecated cast

---
 src/TouchPoint-WP/Utilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index ad937842..c8647342 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -418,7 +418,7 @@ public static function insertTerm(string $term, string $taxonomy, $args = [])
 	 */
 	public static function createGuid(): string
 	{
-		mt_srand(( double )microtime() * 10000);
+		mt_srand(intval(microtime(true) * 10000) % PHP_INT_MAX);
 		$char   = strtoupper(md5(uniqid(rand(), true)));
 		$hyphen = chr(45); // "-"
 

From 51a9e1c4c0d1ce5fcc04184fcdf467332114b7f3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 12 Feb 2024 21:16:06 -0500
Subject: [PATCH 069/423] Shorten cache of divisions and other meta from
 TouchPoint in certain situations (closes #179).  Also, improve error handling
 for script updates.

---
 src/TouchPoint-WP/TouchPointWP.php          | 61 +++++++++++++--------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php |  2 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php |  2 +-
 src/templates/admin/invKoForm.php           |  4 +-
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 35daa121..420d09c9 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -108,6 +108,7 @@ class TouchPointWP
 	 * Typical amount of time in hours for metadata to last (e.g. genders and resCodes).
 	 */
 	public const CACHE_TTL = 8;
+	public const CACHE_SHORT_TTL = 5/60;
 
 	/**
 	 * Caching
@@ -203,6 +204,8 @@ class TouchPointWP
 
 	public bool $debug;
 
+	protected static string $apiVersion = "";
+
 	/**
 	 * Indicates that the current request is being processed through the API.
 	 *
@@ -2003,10 +2006,11 @@ public function host(): ?string
 	 * Get the member types currently in use for the named divisions.
 	 *
 	 * @param string[] $divisions
+	 * @param bool $shortCache Set to true to make it much more likely that the division cache will refresh.
 	 *
 	 * @return array
 	 */
-	public function getMemberTypesForDivisions(array $divisions = []): array
+	public function getMemberTypesForDivisions(array $divisions = [], bool $shortCache = false): array
 	{
 		$divisions = implode(",", $divisions);
 		$divisions = str_replace('div', '', $divisions);
@@ -2020,9 +2024,10 @@ public function getMemberTypesForDivisions(array $divisions = []): array
 			$mtObj       = (object)[];
 		} else {
 			$mtObj = json_decode($mtObj);
+			$cacheTime = $shortCache ? self::CACHE_SHORT_TTL : self::CACHE_TTL;
 			if ( ! isset($mtObj->$divKey)) {
 				$needsUpdate = true;
-			} else if (strtotime($mtObj->$divKey->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($mtObj->$divKey->memTypes)) {
+			} else if (strtotime($mtObj->$divKey->_updated) < time() - 3600 * $cacheTime || ! is_array($mtObj->$divKey->memTypes)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2045,18 +2050,20 @@ public function getMemberTypesForDivisions(array $divisions = []): array
 	 *
 	 * @return string[]
 	 */
-	public function getDivisionsAsKVArray(): array
+	public function getDivisionsAsKVArray(bool $shortCache = false): array
 	{
-		return self::flattenArrayToKV($this->getDivisions(), 'id', 'name', 'div');
+		return self::flattenArrayToKV($this->getDivisions($shortCache), 'id', 'name', 'div');
 	}
 
 	/**
 	 * Returns an array of objects that correspond to divisions.  Each Division has a name and an id.  The name is both
 	 * the Program and Division.
 	 *
+	 * @param bool $shortCache Set to true to make it much more likely that the division cache will refresh.
+	 *
 	 * @returns object[]
 	 */
-	public function getDivisions(): array
+	public function getDivisions(bool $shortCache = false): array
 	{
 		$divsObj = $this->settings->get('meta_divisions');
 
@@ -2065,7 +2072,8 @@ public function getDivisions(): array
 			$needsUpdate = true;
 		} else {
 			$divsObj = json_decode($divsObj);
-			if (strtotime($divsObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($divsObj->divs)) {
+			$cacheTime = $shortCache ? self::CACHE_SHORT_TTL : self::CACHE_TTL;
+			if (strtotime($divsObj->_updated) < time() - 3600 * $cacheTime || ! is_array($divsObj->divs)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2310,9 +2318,11 @@ private function updateGenders()
 	/**
 	 * Returns an array of objects that correspond to keywords.  Each Keyword has a name and an id.
 	 *
+	 * @param bool $shortCache Set to true to make it much more likely that the division cache will refresh.
+	 *
 	 * @returns object[]
 	 */
-	public function getKeywords(): array
+	public function getKeywords(bool $shortCache = false): array
 	{
 		$kObj = $this->settings->get('meta_keywords');
 
@@ -2321,7 +2331,8 @@ public function getKeywords(): array
 			$needsUpdate = true;
 		} else {
 			$kObj = json_decode($kObj);
-			if (strtotime($kObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($kObj->keywords)) {
+			$cacheTime = $shortCache ? self::CACHE_SHORT_TTL : self::CACHE_TTL;
+			if (strtotime($kObj->_updated) < time() - 3600 * $cacheTime || ! is_array($kObj->keywords)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2779,10 +2790,29 @@ private static function parseApiResponse($response)
 
 		$respDecoded = json_decode($response['body']);
 
+		if (property_exists($respDecoded->data, "VERSION")) {
+			self::$apiVersion = $respDecoded->data->VERSION;
+		}
+
 		if ($respDecoded === null) {
 			throw new TouchPointWP_Exception("Connection Error", 179000);
 		}
 
+		if (self::$apiVersion !== self::VERSION && self::$apiVersion !== "") {
+			if (in_array("updateScripts", $respDecoded->data->a ?? [])) {
+				if (class_exists("TouchPointWP_AdminAPI")) {
+					TouchPointWP_AdminAPI::showError(
+						__(
+							"The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.",
+							"TouchPoint-WP"
+						)
+					);
+				}
+			} else {
+				self::instance()->settings->updateDeployedScripts();
+			}
+		}
+
 		// Most likely the issue where a module import failed for no apparent reason.
 		if (property_exists($respDecoded, 'output') &&
 		    strpos($respDecoded->output, "Traceback (most recent call last):") === 0) {
@@ -2799,21 +2829,6 @@ private static function parseApiResponse($response)
 			throw new TouchPointWP_Exception($respDecoded->message, 179003);
 		}
 
-		if ( ! property_exists($respDecoded->data, "VERSION") || $respDecoded->data->VERSION !== self::VERSION) {
-			if (in_array("updateScripts", $respDecoded->data->a ?? [])) {
-				if (class_exists("TouchPointWP_AdminAPI")) {
-					TouchPointWP_AdminAPI::showError(
-						__(
-							"The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.",
-							"TouchPoint-WP"
-						)
-					);
-				}
-			} else {
-				self::instance()->settings->updateDeployedScripts();
-			}
-		}
-
 		return $respDecoded->data;
 	}
 
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 63f152dd..d524d692 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -45,7 +45,7 @@ public static function api(array $uri): bool
 			case "memtypes":
 				header('Content-Type: application/json');
 				$divs = explode(",", $_GET['divs']);
-				$mt   = TouchPointWP::instance()->getMemberTypesForDivisions($divs);
+				$mt   = TouchPointWP::instance()->getMemberTypesForDivisions($divs, true);
 				echo json_encode($mt);
 				exit;
 
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 0f7b60d5..d8a4d0be 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -768,7 +768,7 @@ private function settingsFields($includeDetail = false): array
 						'TouchPoint-WP'
 					),
 					'type'        => 'checkbox_multi',
-					'options'     => $includeThis ? $this->parent->getDivisionsAsKVArray() : [],
+					'options'     => $includeThis ? $this->parent->getDivisionsAsKVArray(true) : [],
 					'default'     => [],
 					'callback'    => function($new) { sort($new); return $new; }
 				],
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 81a1d8e4..ab07f234 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -3,8 +3,8 @@
 
 /** @var TouchPointWP_Settings $this */
 
-$divs = json_encode($this->parent->getDivisions());
-$kws = json_encode($this->parent->getKeywords());
+$divs = json_encode($this->parent->getDivisions(true));
+$kws = json_encode($this->parent->getKeywords(true));
 /** @noinspection CommaExpressionJS */
 echo "<script type=\"text/javascript\">tpvm._vmContext = {divs: $divs, kws: $kws }</script>";
 ?>

From 03b472071dec067b3cf014363af75c103fe70097 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 13 Feb 2024 09:07:09 -0500
Subject: [PATCH 070/423] Adding php output to translations for future
 WordPress changes.

---
 .gitignore                   | 1 +
 generateI18n_2forPublish.ps1 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 236fe5d4..768f5b34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ node_modules
 
 /i18n/*.json
 /i18n/*.mo
+/i18n/*.l10n.php
 
 package-lock.json
 
diff --git a/generateI18n_2forPublish.ps1 b/generateI18n_2forPublish.ps1
index 8939a2e2..a466eb47 100644
--- a/generateI18n_2forPublish.ps1
+++ b/generateI18n_2forPublish.ps1
@@ -11,4 +11,5 @@ Remove-Item "i18n/*.json"
 Remove-Item "i18n/*.mo"
 
 php .\wp-cli.phar i18n make-json i18n --no-purge
-php .\wp-cli.phar i18n make-mo i18n
\ No newline at end of file
+php .\wp-cli.phar i18n make-mo i18n
+php .\wp-cli.phar i18n make-php i18n
\ No newline at end of file

From 72cd9ad95ebc88e1322cfc6f53add9bc73b55a42 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 25 Feb 2024 12:14:40 -0500
Subject: [PATCH 071/423] Resolving a casting issue in PHP 8.

---
 src/TouchPoint-WP/Utilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 34bcb931..6cd9df8f 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -401,7 +401,7 @@ public static function getRegisteredPostTypesAsKVArray(): array{
 	 */
 	public static function createGuid(): string
 	{
-		mt_srand(( double )microtime() * 10000);
+		mt_srand((int)(microtime(true) * 10000));
 		$char   = strtoupper(md5(uniqid(rand(), true)));
 		$hyphen = chr(45); // "-"
 

From dc3f5a2e24f98316d4647c48f11b9d8fbfb9a33d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 28 Feb 2024 09:16:12 -0500
Subject: [PATCH 072/423] Adding void return

---
 src/TouchPoint-WP/jsInstantiation.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/jsInstantiation.php b/src/TouchPoint-WP/jsInstantiation.php
index ad7ea6c9..5b6d6855 100644
--- a/src/TouchPoint-WP/jsInstantiation.php
+++ b/src/TouchPoint-WP/jsInstantiation.php
@@ -15,7 +15,6 @@
  */
 trait jsInstantiation
 {
-
 	private static array $queueForJsInstantiation = [];
 	private static array $constructedObjects = [];
 	private static bool $requireAllObjectsInJs = false;
@@ -62,7 +61,7 @@ protected function enqueueForJsInstantiation(): bool
 	 *
 	 * @return void
 	 */
-	protected function registerConstruction()
+	protected function registerConstruction(): void
 	{
 		if ( ! isset(self::$constructedObjects[$this->getTouchPointId()])) {
 			self::$constructedObjects[$this->getTouchPointId()] = $this;

From 6c9e670b3ca2a86325a291ce2bb2c501d5401f05 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 28 Feb 2024 09:20:24 -0500
Subject: [PATCH 073/423] i18n & comments

---
 i18n/TouchPoint-WP-es_ES.po          | 438 +++++++++++++-------------
 i18n/TouchPoint-WP.pot               | 440 ++++++++++++++-------------
 src/TouchPoint-WP/EventsCalendar.php |   2 +-
 src/TouchPoint-WP/Taxonomies.php     |   2 +-
 src/templates/admin/invKoForm.php    |   2 +-
 touchpoint-wp.php                    |   2 +-
 6 files changed, 453 insertions(+), 433 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index a301d48a..2ce0cb93 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -12,22 +12,27 @@ msgstr ""
 "Language: \n"
 
 #. Plugin Name of the plugin
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "TouchPoint WP"
 msgstr "TouchPoint WP"
 
 #. Plugin URI of the plugin
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "https://github.com/tenthpres/touchpoint-wp"
 msgstr "https://github.com/tenthpres/touchpoint-wp"
 
 #. Description of the plugin
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "A WordPress Plugin for integrating with TouchPoint Church Management Software."
 msgstr "Un complemento de WordPress para integrarse con TouchPoint, el software de administración de iglesias."
 
 #. Author of the plugin
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "James K"
 msgstr "James K"
 
 #. Author URI of the plugin
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "https://github.com/jkrrv"
 msgstr "https://github.com/jkrrv"
 
@@ -50,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:924
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -117,13 +122,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1347
+#: src/TouchPoint-WP/Involvement.php:1464
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1373
+#: src/TouchPoint-WP/Involvement.php:1490
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -168,7 +173,7 @@ msgstr "Seleccione..."
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
 #: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1594
+#: src/TouchPoint-WP/Involvement.php:1710
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -203,79 +208,79 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:441
+#: src/TouchPoint-WP/Involvement.php:466
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:445
+#: src/TouchPoint-WP/Involvement.php:470
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:451
+#: src/TouchPoint-WP/Involvement.php:476
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:456
+#: src/TouchPoint-WP/Involvement.php:481
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1222
+#: src/TouchPoint-WP/Involvement.php:1339
 #: src/TouchPoint-WP/Partner.php:769
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1430
+#: src/TouchPoint-WP/Involvement.php:1547
 #: src/TouchPoint-WP/Partner.php:791
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:2395
+#: src/TouchPoint-WP/Involvement.php:3069
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:2398
+#: src/TouchPoint-WP/Involvement.php:3072
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:2461
+#: src/TouchPoint-WP/Involvement.php:3147
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:2469
+#: src/TouchPoint-WP/Involvement.php:3155
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:2474
+#: src/TouchPoint-WP/Involvement.php:3160
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:2478
+#: src/TouchPoint-WP/Involvement.php:3164
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:2483
+#: src/TouchPoint-WP/Involvement.php:3169
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:2486
+#: src/TouchPoint-WP/Involvement.php:3172
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:2489
+#: src/TouchPoint-WP/Involvement.php:3175
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:2492
+#: src/TouchPoint-WP/Involvement.php:3178
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:2499
+#: src/TouchPoint-WP/Involvement.php:3185
 #: assets/js/base-defer.js:991
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:2508
+#: src/TouchPoint-WP/Involvement.php:3194
 #: src/TouchPoint-WP/Partner.php:1247
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -305,509 +310,509 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1893
+#: src/TouchPoint-WP/TouchPointWP.php:1900
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1950
+#: src/TouchPoint-WP/TouchPointWP.php:1957
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1953
+#: src/TouchPoint-WP/TouchPointWP.php:1960
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1956
+#: src/TouchPoint-WP/TouchPointWP.php:1963
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1961
-#: src/TouchPoint-WP/TouchPointWP.php:1962
+#: src/TouchPoint-WP/TouchPointWP.php:1968
+#: src/TouchPoint-WP/TouchPointWP.php:1969
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2090
-#: src/TouchPoint-WP/TouchPointWP.php:2130
+#: src/TouchPoint-WP/TouchPointWP.php:2097
+#: src/TouchPoint-WP/TouchPointWP.php:2137
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2098
-#: src/TouchPoint-WP/TouchPointWP.php:2137
+#: src/TouchPoint-WP/TouchPointWP.php:2105
+#: src/TouchPoint-WP/TouchPointWP.php:2144
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2257
+#: src/TouchPoint-WP/TouchPointWP.php:2264
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:252
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:253
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:269
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:270
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:277
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:278
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:299
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:300
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:310
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:311
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:332
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:333
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:343
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:344
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:356
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:368
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:380
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:381
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:393
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:394
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:405
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:406
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:417
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:418
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:436
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:440
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:462
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:480
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:474
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:481
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:475
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:492
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:496
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:734
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:497
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:518
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:534
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:528
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:535
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:529
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:544
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:538
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:539
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:554
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:548
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:549
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:561
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:562
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:570
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:571
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:606
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:607
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:617
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:611
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:618
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:628
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:622
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:629
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:623
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:644
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:645
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:655
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:656
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:674
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:668
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:675
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:669
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:685
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:679
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:686
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:680
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:690
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:691
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:701
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:702
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:712
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:713
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:723
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:724
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:735
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:746
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:753
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:747
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:769
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
 msgid "Events Calendar"
 msgstr "Calendario de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr "Integre con el calendario de eventos de ModernTribe."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:768
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr "Para usar los eventos de su calendario de eventos en la aplicación móvil personalizada, configure el proveedor en <code>Wordpress Plugin - Modern Tribe</code> y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:779
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:794
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:788
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:789
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:883
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:877
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:887
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:888
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:899
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:900
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:911
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:912
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:976
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:970
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:984
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:985
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1008
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1002
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1009
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1003
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1026
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1024
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1042
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1036
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1043
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1054
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1048
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1055
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1226
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1220
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1282
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1276
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1277
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1314
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1308
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1540
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1668
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1662
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1719
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1713
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -975,7 +980,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2198
+#: src/TouchPoint-WP/TouchPointWP.php:2205
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1030,16 +1035,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1395
+#: src/TouchPoint-WP/Involvement.php:1512
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1408
+#: src/TouchPoint-WP/Involvement.php:1525
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1279
+#: src/TouchPoint-WP/Involvement.php:1396
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1157,12 +1162,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:951
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:946
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1201,76 +1206,76 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1396
+#: src/TouchPoint-WP/Involvement.php:1513
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1397
+#: src/TouchPoint-WP/Involvement.php:1514
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1438
+#: src/TouchPoint-WP/Involvement.php:1555
 #: src/TouchPoint-WP/Partner.php:807
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1441
+#: src/TouchPoint-WP/Involvement.php:1558
 #: src/TouchPoint-WP/Partner.php:810
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:644
-#: src/TouchPoint-WP/Involvement.php:664
+#: src/TouchPoint-WP/Involvement.php:729
+#: src/TouchPoint-WP/Involvement.php:749
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:673
+#: src/TouchPoint-WP/Involvement.php:758
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:680
+#: src/TouchPoint-WP/Involvement.php:765
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:690
+#: src/TouchPoint-WP/Involvement.php:775
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:696
+#: src/TouchPoint-WP/Involvement.php:781
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:705
+#: src/TouchPoint-WP/Involvement.php:790
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:711
+#: src/TouchPoint-WP/Involvement.php:796
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:2422
+#: src/TouchPoint-WP/Involvement.php:3096
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
-#: src/templates/admin/invKoForm.php:103
+#: src/templates/admin/invKoForm.php:112
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr "La participación tiene un tipo de registro de \"No Online Registration\""
 
@@ -1278,39 +1283,39 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1535
+#: src/TouchPoint-WP/Involvement.php:1651
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1545
+#: src/TouchPoint-WP/Involvement.php:1661
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1564
+#: src/TouchPoint-WP/Involvement.php:1680
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:338
+#: src/TouchPoint-WP/Meeting.php:331
 #: src/TouchPoint-WP/TouchPointWP.php:945
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:366
+#: src/TouchPoint-WP/Meeting.php:359
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:376
+#: src/TouchPoint-WP/Meeting.php:369
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:2560
-#: src/TouchPoint-WP/Involvement.php:2637
+#: src/TouchPoint-WP/Involvement.php:3246
+#: src/TouchPoint-WP/Involvement.php:3323
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:321
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1322,6 +1327,7 @@ msgstr "clasificar las publicaciones por sus ubicaciones generales."
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
+#. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:712
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
@@ -1374,7 +1380,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:322
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1425,7 +1431,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1322
+#: src/TouchPoint-WP/Involvement.php:1439
 msgid "Language"
 msgstr "Idioma"
 
@@ -1442,11 +1448,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1454,44 +1460,44 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:812
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
 msgid "Meeting Deletion Handling"
 msgstr "Manejo de eliminación de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
 msgid "Always delete from WordPress"
 msgstr "Eliminar siempre de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:2624
-#: src/TouchPoint-WP/Person.php:1720
+#: src/TouchPoint-WP/Involvement.php:3310
+#: src/TouchPoint-WP/Person.php:1735
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:357
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1503,8 +1509,8 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:2614
-#: src/TouchPoint-WP/Person.php:1737
+#: src/TouchPoint-WP/Involvement.php:3300
+#: src/TouchPoint-WP/Person.php:1752
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
@@ -1514,58 +1520,58 @@ msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:28
 #: src/templates/parts/meeting-list-none.php:13
-#: src/TouchPoint-WP/Meeting.php:189
+#: src/TouchPoint-WP/Meeting.php:194
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:190
+#: src/TouchPoint-WP/Meeting.php:195
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:288
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:289
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:825
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:819
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr "Las reuniones que hayan transcurrido más de esta cantidad de días pasados se trasladarán al Archivo de eventos. Una vez que pase esta fecha, la información de la reunión ya no se actualizará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan transcurrido tantos días desde el evento."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1067
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1580,3 +1586,7 @@ msgstr "hoy"
 #: src/TouchPoint-WP/meetingT.php:55
 msgid "Tomorrow"
 msgstr "mañana"
+
+#: src/templates/admin/invKoForm.php:341
+msgid "(named person)"
+msgstr "(persona nombrada)"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index cc2a2f6a..63ef533f 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,28 +9,33 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-02-10T23:17:42+00:00\n"
+"POT-Creation-Date: 2024-02-13T13:44:30+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.9.0\n"
+"X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
 
 #. Plugin Name of the plugin
+#: touchpoint-wp.php
 msgid "TouchPoint WP"
 msgstr ""
 
 #. Plugin URI of the plugin
+#: touchpoint-wp.php
 msgid "https://github.com/tenthpres/touchpoint-wp"
 msgstr ""
 
 #. Description of the plugin
+#: touchpoint-wp.php
 msgid "A WordPress Plugin for integrating with TouchPoint Church Management Software."
 msgstr ""
 
 #. Author of the plugin
+#: touchpoint-wp.php
 msgid "James K"
 msgstr ""
 
 #. Author URI of the plugin
+#: touchpoint-wp.php
 msgid "https://github.com/jkrrv"
 msgstr ""
 
@@ -53,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:924
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
 msgid "Divisions to Import"
 msgstr ""
 
@@ -152,13 +157,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1347
+#: src/TouchPoint-WP/Involvement.php:1464
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1373
+#: src/TouchPoint-WP/Involvement.php:1490
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -196,6 +201,10 @@ msgstr ""
 msgid "Small Groups"
 msgstr ""
 
+#: src/templates/admin/invKoForm.php:341
+msgid "(named person)"
+msgstr ""
+
 #: src/templates/admin/invKoForm.php:378
 msgid "Select..."
 msgstr ""
@@ -234,7 +243,7 @@ msgstr ""
 
 #: src/templates/meeting-archive.php:28
 #: src/templates/parts/meeting-list-none.php:13
-#: src/TouchPoint-WP/Meeting.php:189
+#: src/TouchPoint-WP/Meeting.php:194
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
@@ -242,7 +251,7 @@ msgstr ""
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
 #: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1594
+#: src/TouchPoint-WP/Involvement.php:1710
 msgid "No %s Found."
 msgstr ""
 
@@ -254,7 +263,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:2422
+#: src/TouchPoint-WP/Involvement.php:3096
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -284,201 +293,201 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:441
+#: src/TouchPoint-WP/Involvement.php:466
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:445
+#: src/TouchPoint-WP/Involvement.php:470
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:451
+#: src/TouchPoint-WP/Involvement.php:476
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:456
+#: src/TouchPoint-WP/Involvement.php:481
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:644
-#: src/TouchPoint-WP/Involvement.php:664
+#: src/TouchPoint-WP/Involvement.php:729
+#: src/TouchPoint-WP/Involvement.php:749
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:673
+#: src/TouchPoint-WP/Involvement.php:758
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:680
+#: src/TouchPoint-WP/Involvement.php:765
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:690
+#: src/TouchPoint-WP/Involvement.php:775
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:696
+#: src/TouchPoint-WP/Involvement.php:781
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:705
+#: src/TouchPoint-WP/Involvement.php:790
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:711
+#: src/TouchPoint-WP/Involvement.php:796
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1222
+#: src/TouchPoint-WP/Involvement.php:1339
 #: src/TouchPoint-WP/Partner.php:769
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1279
+#: src/TouchPoint-WP/Involvement.php:1396
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1322
+#: src/TouchPoint-WP/Involvement.php:1439
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1395
+#: src/TouchPoint-WP/Involvement.php:1512
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1396
+#: src/TouchPoint-WP/Involvement.php:1513
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1397
+#: src/TouchPoint-WP/Involvement.php:1514
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1408
+#: src/TouchPoint-WP/Involvement.php:1525
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1430
+#: src/TouchPoint-WP/Involvement.php:1547
 #: src/TouchPoint-WP/Partner.php:791
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1438
+#: src/TouchPoint-WP/Involvement.php:1555
 #: src/TouchPoint-WP/Partner.php:807
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1441
+#: src/TouchPoint-WP/Involvement.php:1558
 #: src/TouchPoint-WP/Partner.php:810
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1535
+#: src/TouchPoint-WP/Involvement.php:1651
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1545
+#: src/TouchPoint-WP/Involvement.php:1661
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1564
+#: src/TouchPoint-WP/Involvement.php:1680
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2395
+#: src/TouchPoint-WP/Involvement.php:3069
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2398
+#: src/TouchPoint-WP/Involvement.php:3072
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2461
+#: src/TouchPoint-WP/Involvement.php:3147
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2469
+#: src/TouchPoint-WP/Involvement.php:3155
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2474
+#: src/TouchPoint-WP/Involvement.php:3160
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2478
+#: src/TouchPoint-WP/Involvement.php:3164
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2483
+#: src/TouchPoint-WP/Involvement.php:3169
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2486
+#: src/TouchPoint-WP/Involvement.php:3172
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2489
+#: src/TouchPoint-WP/Involvement.php:3175
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2492
+#: src/TouchPoint-WP/Involvement.php:3178
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2499
+#: src/TouchPoint-WP/Involvement.php:3185
 #: assets/js/base-defer.js:991
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2508
+#: src/TouchPoint-WP/Involvement.php:3194
 #: src/TouchPoint-WP/Partner.php:1247
 msgid "Show on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2560
-#: src/TouchPoint-WP/Involvement.php:2637
+#: src/TouchPoint-WP/Involvement.php:3246
+#: src/TouchPoint-WP/Involvement.php:3323
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2614
-#: src/TouchPoint-WP/Person.php:1737
+#: src/TouchPoint-WP/Involvement.php:3300
+#: src/TouchPoint-WP/Person.php:1752
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2624
-#: src/TouchPoint-WP/Person.php:1720
+#: src/TouchPoint-WP/Involvement.php:3310
+#: src/TouchPoint-WP/Person.php:1735
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:190
+#: src/TouchPoint-WP/Meeting.php:195
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:338
+#: src/TouchPoint-WP/Meeting.php:331
 #: src/TouchPoint-WP/TouchPointWP.php:945
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:366
+#: src/TouchPoint-WP/Meeting.php:359
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:376
+#: src/TouchPoint-WP/Meeting.php:369
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
@@ -590,6 +599,7 @@ msgstr ""
 msgid "Classify posts by their church campus."
 msgstr ""
 
+#. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:712
 msgid "Classify things by %s."
 msgstr ""
@@ -646,623 +656,623 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1893
+#: src/TouchPoint-WP/TouchPointWP.php:1900
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1950
+#: src/TouchPoint-WP/TouchPointWP.php:1957
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1953
+#: src/TouchPoint-WP/TouchPointWP.php:1960
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1956
+#: src/TouchPoint-WP/TouchPointWP.php:1963
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1961
-#: src/TouchPoint-WP/TouchPointWP.php:1962
+#: src/TouchPoint-WP/TouchPointWP.php:1968
+#: src/TouchPoint-WP/TouchPointWP.php:1969
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2090
-#: src/TouchPoint-WP/TouchPointWP.php:2130
+#: src/TouchPoint-WP/TouchPointWP.php:2097
+#: src/TouchPoint-WP/TouchPointWP.php:2137
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2098
-#: src/TouchPoint-WP/TouchPointWP.php:2137
+#: src/TouchPoint-WP/TouchPointWP.php:2105
+#: src/TouchPoint-WP/TouchPointWP.php:2144
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2198
+#: src/TouchPoint-WP/TouchPointWP.php:2205
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2257
+#: src/TouchPoint-WP/TouchPointWP.php:2264
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:252
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:253
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:269
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:270
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:277
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:278
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:288
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:289
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:299
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:300
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:310
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:311
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:321
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:322
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:332
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:333
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:343
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:344
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:356
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:357
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:368
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:380
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:381
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:393
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:394
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:405
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:406
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:417
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:418
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:447
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:436
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:440
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:462
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:480
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:474
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:481
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:475
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:492
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:496
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:734
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:497
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:518
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:534
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:528
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:535
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:529
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:544
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:538
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:539
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:554
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:548
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:549
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:561
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:562
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:570
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:571
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:606
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:607
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:617
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:611
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:618
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:628
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:622
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:629
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:623
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:644
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:645
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:655
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:656
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:674
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:668
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:675
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:669
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:685
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:679
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:686
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:680
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:690
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:691
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:701
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:702
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:712
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:713
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:723
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:724
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:735
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:746
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:753
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:747
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:769
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
 msgid "Events Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:768
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:779
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:794
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:788
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:789
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:812
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:825
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:819
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
 msgid "Meeting Deletion Handling"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
 msgid "Always delete from WordPress"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
 msgid "Mark the occurrence as cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:883
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:877
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:887
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:888
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:899
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:900
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:911
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:912
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1067
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:951
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:946
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:976
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:970
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:984
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:985
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1008
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1002
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1009
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1003
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1026
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1024
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1042
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1036
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1043
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1054
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1048
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1055
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1226
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1220
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1282
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1276
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1277
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1314
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1308
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1540
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1668
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1662
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1719
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1713
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index a6bf27d5..e43f62fc 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -19,7 +19,7 @@
  * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
  * mobile app.
  *
- * @deprecated since 0.0.90
+ * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
  */
 abstract class EventsCalendar implements api, module
 {
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index f9ff8372..2a1dc25e 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -707,8 +707,8 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 				[
 					'hierarchical'      => true,
 					'show_ui'           => true,
-					/* translators: %s: taxonomy name, singular */
 					'description'       => sprintf(
+						/* translators: %s: taxonomy name, singular */
 						__('Classify things by %s.', 'TouchPoint-WP'),
 						$instance->settings->dv_name_singular
 					),
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 759c1979..291351e5 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -338,7 +338,7 @@ function initInvVm() {
 
         let types = tpvm._vmContext.invTypesVM.invTypes();
         for (let i in types) {
-            let name = tpvm.people[invData[i].taskOwner]?.displayName ?? "(named person)";
+            let name = tpvm.people[invData[i].taskOwner]?.displayName ?? "<?php _e("(named person)", "TouchPoint-WP") ?>";
             applySelect2ForData('#it-' + types[i].slug() + '-taskOwner', name, invData[i].taskOwner);
         }
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 5c8885db..217c8f41 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -6,7 +6,7 @@
  * @author  James K
  * @license AGPLv3+
  * @link    https://github.com/TenthPres/TouchPoint-WP
- * @package TouchPoint-WP
+ * @package TouchPointWP
  */
 
 /*

From 391b8cbec6467d47295495928c0a56611e674822 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 1 Mar 2024 08:42:47 -0500
Subject: [PATCH 074/423] an expandable var_dump and resolving a null issue.

---
 src/TouchPoint-WP/Utilities.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 6cd9df8f..34135851 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -412,6 +412,23 @@ public static function createGuid(): string
 			   . substr($char, 20, 12);
 	}
 
+	/**
+	 * Do a var_dump, but within a container that can be expanded or contracted. 
+	 *
+	 * @param ...$args
+	 *
+	 * @return void
+	 */
+	public static function var_dump_expandable(...$args): void
+	{
+		echo "<div>";
+		echo "<div style=\"display:none;\">";
+		var_dump(...$args);
+		echo "</div>";
+		echo "<a onclick=\"this.parentElement.firstElementChild.style.display = 'block'; this.style.display = 'none';\">" . __("Expand", "TouchPoint-WP") . "</a>";
+		echo "</div>";
+	}
+
 	/**
 	 * Get all HTTP request headers.
 	 *
@@ -451,7 +468,7 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 		// Post image
 		global $wpdb;
 		$oldAttId = get_post_thumbnail_id($postId);
-		$oldFName = $wpdb->get_var( "SELECT meta_value FROM $wpdb->postmeta WHERE post_id = '$oldAttId' AND meta_key = '_wp_attached_file'" );
+		$oldFName = $wpdb->get_var( "SELECT meta_value FROM $wpdb->postmeta WHERE post_id = '$oldAttId' AND meta_key = '_wp_attached_file'" ) ?? "";
 		$oldFName = substr($oldFName, strrpos($oldFName, '/') + 1);
 
 		$newUrl = trim((string)$newUrl); // nulls are now ""

From 7cfec1c2bf5674539a5a6da3033ba35365ecdc82 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 7 Mar 2024 16:12:12 -0500
Subject: [PATCH 075/423] Closes #164.  Needs testing.

---
 assets/js/base-defer.js    | 6 +++++-
 assets/js/meeting-defer.js | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 72b7b7ba..5319884e 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -69,7 +69,11 @@ function utilInit() {
     }
 
     tpvm._utils.clearHash = function() {
-        window.location.hash = "";
+        if (!!window.history) {
+            window.history.pushState("", "", `${window.location.pathname}${window.location.search}`)
+        } else {
+            window.location.hash = "";
+        }
     }
 
     /**
diff --git a/assets/js/meeting-defer.js b/assets/js/meeting-defer.js
index 69b5ba6a..4e7246f3 100644
--- a/assets/js/meeting-defer.js
+++ b/assets/js/meeting-defer.js
@@ -54,7 +54,6 @@ class TP_Meeting {
                             e.stopPropagation();
                             mtg[action + "Action"]();
                         });
-                        tpvm._utils.handleHash(action);
                     }
                 }
 

From f3c7d404916d0697c822ed4919403d3680cc241c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 9 Apr 2024 22:14:47 -0400
Subject: [PATCH 076/423] A few new classes

---
 src/TouchPoint-WP/CalendarGrid.php            | 287 ++++++++++++++++++
 src/TouchPoint-WP/PostTypeCapable.php         |  77 +++++
 .../Utilities/StringableArray.php             |  40 +++
 3 files changed, 404 insertions(+)
 create mode 100644 src/TouchPoint-WP/CalendarGrid.php
 create mode 100644 src/TouchPoint-WP/PostTypeCapable.php
 create mode 100644 src/TouchPoint-WP/Utilities/StringableArray.php

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
new file mode 100644
index 00000000..758da5e5
--- /dev/null
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use DateInterval;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use DateTimeZone;
+use Exception;
+use WP_Query;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+	require_once 'api.php';
+}
+
+/**
+ *
+ * Creates a listing of events, typically arranged in a monthly grid, but transformable to a list.
+ *
+ * @package TouchPointWP
+ */
+class CalendarGrid {
+	public ?DateTimeImmutable $next = null;
+	public ?DateTimeImmutable $prev = null;
+
+	public string $html;
+
+
+	/**
+	 * Create a calendar grid for a given month and year.
+	 *
+	 * @param WP_Query $q
+	 * @param int|null $month
+	 * @param int|null $year
+	 */
+	public function __construct(WP_Query $q, int $month = null, int $year = null)
+	{
+		try {
+			// Validate month & year; create $d as a day within the month
+			$tz = wp_timezone();
+			$month = intval($month);
+			$year  = intval($year);
+			if ($month < 1 || $month > 12 || $year < 2020 || $year > 2100) {
+				$d = new DateTime('now', $tz);
+				$d = new DateTime($d->format('Y-m-01'), $tz);
+			} else {
+				$d = new DateTime("$year-$month-01", $tz);
+			}
+		} catch (Exception $e) {
+			$this->html = "<!-- Could not create calendar grid because an exception occurred: {$e->getMessage()} -->";
+			return;
+		}
+
+		$firstDayOfMonth = DateTimeImmutable::createFromMutable($d);
+		$lastDayOfMonth = DateTimeImmutable::createFromMutable($d);
+
+		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
+		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
+		$d->modify("-$offsetDays days");
+		$r = "";
+
+		// Create a table to display the calendar
+		$r .= '<div class="calGrid">';
+		foreach (Utilities::getDaysOfWeekShort() as $dayStr) {
+			$r .= "<div class='calWeekdayHead'>$dayStr</div>";
+		}
+
+		$isMonthBefore = ($offsetDays !== 0);
+		$isMonthAfter = false;
+		$aDay = new DateInterval("P1D");
+		$dateFormat = get_option('date_format');
+
+		// Loop through the days of the month
+		do {
+			$day = $d->format("j");
+			$fullDay = $d->format($dateFormat);
+			$wd =  $d->format("w");
+
+			try {
+				$newQ = self::adjustQueryForDay($q, $d, $tz);
+
+				$cellClass = ["calDay"];
+				if ($isMonthBefore) {
+					$cellClass[] = "before";
+				} elseif ($isMonthAfter) {
+					$cellClass[] = "after";
+				}
+
+				$posts = $newQ->get_posts();
+
+				if (count($posts) === 0) {
+					$cellClass[] = "empty";
+				}
+
+				if ($d < Utilities::dateTimeTodayAtMidnight()) {
+					$cellClass[] = "past";
+				}
+
+				$cellClass[] = "weekday-$wd";
+
+				$cellClass = implode(" ", $cellClass);
+
+				// Print the cell
+				$r .= "<div class=\"$cellClass\">";
+				$r .= "<h3 class=\"calDayHead\">$fullDay</h3>";
+				$r .= "<span class=\"calDayNum\">$day</span>";
+
+				foreach ($posts as $e) {
+					$m = Meeting::fromPost($e);
+
+					$link = $m->permalink();
+
+					$classes = "event ";
+					$classes .= $m->status();
+					$classes .= $m->tense();
+					if ($m->isFeatured()) {
+						$classes .= " feat";
+					}
+					if ($m->startDt < $d) {
+						$classes .= " notFirstDay";
+					}
+					$ts = $m->startTimeString();
+					$r .= "<a href=\"$link\" class=\"$classes\"><span class=\"time\">$ts</span> <span class=\"title\">$e->post_title</span></a>";
+				}
+
+				$r .= "</div>";
+
+			} catch (Exception $e) {
+				$r .= "<!-- An Exception occurred: {$e->getMessage()} -->";
+			}
+
+			// Increment days
+			$mo1 = $d->format('n');
+			$d->add($aDay);
+			$mo2 = $d->format('n');
+
+			if ($mo1 !== $mo2) {
+				if ($isMonthBefore) {
+					$isMonthBefore = false;
+				} else {
+					$isMonthAfter = true;
+				}
+			} else {
+				if (!$isMonthAfter && $day > 27) {
+					$lastDayOfMonth = DateTimeImmutable::createFromMutable($d);
+				}
+			}
+		} while (!$isMonthAfter || $d->format('w') !== '0');
+		$r .= '</div>';
+
+		$this->html = $r;
+
+		$this->next = $lastDayOfMonth->add($aDay);
+		$this->prev = $firstDayOfMonth->sub($aDay);
+	}
+
+	/**
+	 * Render the grid as HTML.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->html;
+	}
+
+	/**
+	 * Adjust a WP_Query object to filter only to events that overlap with the given day.
+	 *
+	 * @param WP_Query          $q  The original query object.
+	 * @param DateTimeInterface $d  The day to filter down to.  Only events on this day will be included.
+	 * @param DateTimeZone      $tz The timezone to use.
+	 *
+	 * @return WP_Query
+	 * @throws Exception
+	 */
+	private static function adjustQueryForDay(WP_Query $q, DateTimeInterface $d, DateTimeZone $tz): WP_Query
+	{
+		$q = clone $q;
+
+		$dStart = new DateTime($d->format('Y-m-d 00:00:00'), $tz);
+		$dEnd   = new DateTime($d->format('Y-m-d 23:59:59'), $tz);
+
+		$existingMq = $q->get('meta_query');
+
+		$mq = [
+			[
+				'key' => Meeting::MEETING_START_META_KEY,
+				'value' => $dEnd->format('U'),
+				'compare' => "<="
+			],
+			[
+				[
+					'key' => Meeting::MEETING_END_META_KEY,
+					'value' => $dStart->format('U'),
+					'compare' => ">="
+				],
+				[ // This condition is to allow for the possibility of events without end times.
+					[
+						'key' => Meeting::MEETING_END_META_KEY,
+						'compare' => '=',
+						'value' => 0
+					],
+					[
+						'key' => Meeting::MEETING_START_META_KEY,
+						'value' => $dStart->format('U'),
+						'compare' => ">"
+					],
+					'relation' => 'AND'
+				],
+				'relation' => 'OR'
+			],
+			[
+				'key' => Meeting::MEETING_META_KEY,
+				'value' => 0,
+				'compare' => ">"
+			],
+			'relation' => 'AND'
+		];
+
+		if (!empty($existingMq)) {
+			$mq = [
+				'relation' => 'AND',
+				$existingMq,
+				$mq,
+			];
+		}
+
+		$q->set('meta_query', $mq);
+
+		$q->set('meta_key', Meeting::MEETING_START_META_KEY);
+		$q->set('orderby', 'meta_value');
+		$q->set('order', 'ASC');
+
+		$q->set('post_type', Involvement_PostTypeSettings::getPostTypes());
+
+		return $q;
+	}
+
+
+	/**
+	 * Get HTML for a link to the next month.
+	 *
+	 * @return string
+	 */
+	public function getNextLink(): string
+	{
+		return $this->getLinkForDate($this->next);
+	}
+
+	/**
+	 * Get HTML for a link to the previous month.
+	 *
+	 * @return string
+	 */
+	public function getPrevLink(): string
+	{
+		return $this->getLinkForDate($this->prev);
+	}
+
+	/**
+	 * Get an HTML link for the period that includes the given date.  This ONLY provides the URL Parameter portion, and
+	 * is only meant to facilitate the next/prev links.
+	 *
+	 * @param DateTimeInterface $date
+	 *
+	 * @return string
+	 */
+	protected function getLinkForDate(DateTimeInterface $date): string
+	{
+		$link = "?page=" . $date->format('m-Y');
+		if ($date->format('Y') === Utilities::dateTimeNow()->format('Y')) {
+			$label = date_i18n('F', $date->getTimestamp());
+		} else {
+			$label = date_i18n('F Y', $date->getTimestamp());
+		}
+		return "<a href=\"$link\">$label</a>";
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
new file mode 100644
index 00000000..d2ee8eb1
--- /dev/null
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use tp\TouchPointWP\Utilities\StringableArray;
+use WP_Post;
+
+/**
+ * This is a base class for those objects that can be derived from a
+ */
+abstract class PostTypeCapable implements module {
+
+	/**
+	 * Create relevant objects from a given post
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return ?PostTypeCapable
+	 * @throws TouchPointWP_Exception
+	 */
+	public static function fromPost(WP_Post $post): ?self
+	{
+		if (Involvement::postIsType($post)) {
+			return Involvement::fromPost($post);
+		}
+		if (Meeting::postIsType($post)) {
+			return Meeting::fromPost($post);
+		}
+		if (Partner::postIsType($post)) {
+			return Partner::fromPost($post);
+		}
+		return null;
+	}
+
+	/**
+	 * Get the link for the post.
+	 *
+	 * @return string
+	 */
+	public function permalink(): string
+	{
+		return get_permalink($this->post);
+	}
+
+	/**
+	 * Get notable attributes.
+	 *
+	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 *
+	 * @return string[]
+	 */
+	public abstract function notableAttributes(array $exclude = []): array;
+
+	public abstract function getActionButtons(string $context, string $btnClass): StringableArray;
+
+	/**
+	 * Indicates if the given post can be instantiated as the given post type.
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return bool
+	 */
+	public static abstract function postIsType(WP_Post $post): bool;
+
+
+	/**
+	 * Gets a TouchPoint item ID number, regardless of what type of object this is.
+	 *
+	 * @return int
+	 */
+	public abstract function getTouchPointId(): int;
+
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
new file mode 100644
index 00000000..cc0fb16c
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+use ArrayObject;
+
+/**
+ * A collection of things that can be cast to a string by gluing them together with a simple implode().
+ */
+class StringableArray extends ArrayObject
+{
+	protected string $separator;
+
+	/**
+	 * StringableArray constructor.
+	 *
+	 * @param string $separator
+	 * @param object|array $array
+	 * @param int $flags
+	 * @param string $iteratorClass
+	 */
+	public function __construct(string $separator = "\n ", object|array $array = [], int $flags = 0, string $iteratorClass = "ArrayIterator")
+	{
+		$this->separator = $separator;
+		parent::__construct($array, $flags, $iteratorClass);
+	}
+
+	/**
+	 * Standard method to stringify.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return implode($this->separator, $this->getArrayCopy());
+	}
+}
\ No newline at end of file

From 5c54124c94132dd609186edca1a3213a4472db5b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 10 Apr 2024 17:38:49 -0400
Subject: [PATCH 077/423] Correct a bug in classes

---
 src/TouchPoint-WP/CalendarGrid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 758da5e5..94714bb0 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -119,7 +119,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 					$link = $m->permalink();
 
 					$classes = "event ";
-					$classes .= $m->status();
+					$classes .= $m->status() . " ";
 					$classes .= $m->tense();
 					if ($m->isFeatured()) {
 						$classes .= " feat";

From c697f43c7d04a68d514dd5da65068395e7db7a6e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 10 Apr 2024 18:01:05 -0400
Subject: [PATCH 078/423] css for calendar grid

---
 assets/template/calendar-style.css | 66 ++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 assets/template/calendar-style.css

diff --git a/assets/template/calendar-style.css b/assets/template/calendar-style.css
new file mode 100644
index 00000000..384c83a4
--- /dev/null
+++ b/assets/template/calendar-style.css
@@ -0,0 +1,66 @@
+
+div.calGrid {
+    display: grid;
+    grid-template-columns: repeat(7, 1fr);
+}
+
+div.calGrid,
+div.calGrid > div.calDay {
+    border: 1px solid black;
+    min-height: 5em;
+}
+
+div.calGrid div.calDay > h3.calDayHead {
+    display: none;
+}
+
+div.calGrid div.calDay > * {
+    display: block;
+}
+
+div.calGrid div.calDay > a.event.feat {
+    background: #ff0;
+}
+
+div.calGrid div.calDay > a.event.cancelled {
+    color: red;
+    text-decoration: line-through;
+}
+
+div.calGrid div.calDay > a {
+    padding: .2em;
+}
+
+div.calGrid div.calDay.before,
+div.calGrid div.calDay.after {
+    opacity: .8;
+    background: #0001;
+}
+
+@media screen and (max-width: 600px) {
+    div.calGrid {
+        display: grid;
+        grid-template-columns: unset;
+    }
+
+    div.calGrid,
+    div.calGrid > div.calDay {
+        border: unset;
+        min-height: unset;
+    }
+
+    div.calGrid div.calWeekdayHead,
+    div.calGrid div.calDay.before,
+    div.calGrid div.calDay.empty,
+    div.calGrid div.calDay.after {
+        display: none;
+    }
+
+    div.calGrid div.calDay > span.calDayNum {
+        display: none;
+    }
+
+    div.calGrid div.calDay > h3.calDayHead {
+        display:block;
+    }
+}
\ No newline at end of file

From 5223efeba841a739bf475ebb0d9f3e80ed36a0d2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 10 Apr 2024 18:18:06 -0400
Subject: [PATCH 079/423] Date string formatting

---
 src/TouchPoint-WP/Utilities/DateFormats.php | 108 ++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 src/TouchPoint-WP/Utilities/DateFormats.php

diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
new file mode 100644
index 00000000..f59e05d2
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+use DateTimeInterface;
+use tp\TouchPointWP\Utilities;
+
+/**
+ * A collection of people, easily cast to string.
+ */
+abstract class DateFormats
+{
+	/**
+	 * Get a string for a single given DateTime.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return string
+	 */
+	public static function TimeStringFormatted(DateTimeInterface $dt): string
+	{
+		$ts = date_i18n(get_option('time_format'), $dt->getTimestamp());
+
+		/**
+		 * Allows for manipulation of the string returned as a formatted time.
+		 *
+		 * @since 0.0.34
+		 *
+		 * @param string $ts The string, as formatted so far.
+		 * @param DateTimeInterface $dt The DateTimeInterface object for the time being formatted.
+		 */
+		return apply_filters('tp_adjust_time_string', $ts, $dt);
+	}
+
+	/**
+	 * Get a string for a single given datetime string.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return string
+	 */
+	public static function DateStringFormatted(DateTimeInterface $dt): string
+	{
+		// Today
+		$now = Utilities::dateTimeNow();
+		if ($dt->format("Ymd") === $now->format("Ymd")) {
+			if ((int)$dt->format('G') >= 17) { // 5pm or later
+				$r = __("Tonight", "TouchPoint-WP");
+			} else {
+				$r = __("Today", "TouchPoint-WP");
+			}
+		} else {
+			// Tomorrow
+			$tomorrow = Utilities::dateTimeNowPlus1D();
+			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
+				$r = __("Tomorrow", "TouchPoint-WP");
+			} else {
+				$ts    = $dt->getTimestamp();
+				$nowTs = $now->getTimestamp();
+
+
+				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
+					$day = date_i18n(_x('l', "Date string for day of the week, when given without a year.", "TouchPoint-WP"), $ts);
+					$date = date_i18n(_x('M j', "Date string when given without a year", "TouchPoint-WP"), $ts);
+				} else {
+					$day = date_i18n(_x('D', "Date string for day of the week, when given with a year.", "TouchPoint-WP"), $ts);
+					$date = date_i18n(_x('M j, Y', "Date string when given with a year", "TouchPoint-WP"), $ts);
+				}
+
+				// Last week
+				if ($ts - $nowTs > -7 * 86400 && $ts - $nowTs < 0) {
+					// translators: %1s is "Monday".  %2s is "January 1".
+					$r = sprintf(_x('Last %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
+				}
+
+				// This week
+				else if ($ts - $nowTs < 7 * 86400) {
+					// translators: %1s is "Monday".  %2s is "January 1".
+					$r = sprintf(_x('This %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
+				}
+
+				// Next week
+				else if ($ts - $nowTs < 14 * 86400) {
+					// translators: %1$s is "Monday".  %2$s is "January 1".
+					$r = sprintf(_x('Next %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
+
+				// Other Times
+				} else {
+					// translators: %1s is "Monday".  %2s is "January 1".
+					$r = sprintf(_x('%1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
+				}
+			}
+		}
+
+		/**
+		 * Allows for manipulation of the string returned as a formatted date.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @param string $ts The string, as formatted so far.
+		 * @param DateTimeInterface $dt The DateTimeInterface object for the date being formatted.
+		 */
+		return apply_filters('tp_adjust_date_string', $r, $dt);
+	}
+}
\ No newline at end of file

From eb6a7b05187cdc58c795d7e87ec01a787af1cf79 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 15 Apr 2024 17:02:46 -0400
Subject: [PATCH 080/423] WebApi Update to reflect end times

---
 src/python/WebApi.py | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 7b5d27bb..3e26721b 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -192,8 +192,11 @@ def get_person_info_for_sync(person_obj):
 
     regex = re.compile('[^0-9,]')
     divs = regex.sub('', Data.divs)
+    exDivs = regex.sub('', Data.exDivs)
     if (len(divs)) < 1:
         divs = '0'
+    if (len(exDivs)) < 1:
+        exDivs = '-1'
 
     mtgHist = -int(Data.mtgHist) if Data.mtgHist != "" else 0
     mtgFuture = int(Data.mtgFuture) if Data.mtgFuture != "" else 365
@@ -209,7 +212,7 @@ def get_person_info_for_sync(person_obj):
         hostMemTypes = "NULL"
 
     # noinspection SqlResolve,SqlUnusedCte,SqlRedundantOrderingDirection
-    invSql = ('''
+    invSql = (('''
         WITH cteTargetOrgs as
         (
         SELECT 
@@ -228,6 +231,7 @@ def get_person_info_for_sync(person_obj):
                 o.RegistrationTypeId AS regTypeId,
                 o.OrgPickList,
                 o.MainLeaderId,
+                o.ShowInSites,
                 o.ImageUrl,
                 o.BadgeUrl,
                 o.RegistrationMobileId,
@@ -256,6 +260,12 @@ def get_person_info_for_sync(person_obj):
                             AND m.MeetingDate < DATEADD(day, {4}, GETDATE())
                         GROUP BY m.OrganizationId
                     )
+                AND o.OrganizationId NOT IN (
+                        SELECT DISTINCT do.OrgId
+                        FROM dbo.DivOrg do
+                        WHERE do.OrgId = o.OrganizationId
+                        AND do.DivId IN ({5})
+                    )
                 )
         ),
         -- select all members for these organizations to avoid multiple scans of Organization members table
@@ -299,8 +309,8 @@ def get_person_info_for_sync(person_obj):
             SELECT cto.OrganizationId,
                 (
                     SELECT om.MeetingId as mtgId,
-                        FORMAT(om.meetingDate, 'yyyy-MM-ddTHH:mm:ss') as mtgStartDt,
-                        null as mtgEndDt, -- TODO end time
+                        FORMAT(om.MeetingDate, 'yyyy-MM-ddTHH:mm:ss') as mtgStartDt,
+                        FORMAT(om.MeetingEnd, 'yyyy-MM-ddTHH:mm:ss') as mtgEndDt,
                         om.Location as location,
                         om.Description as name,
                         1 - om.DidNotMeet as status,
@@ -311,8 +321,9 @@ def get_person_info_for_sync(person_obj):
                             ON om.OrganizationId = o.OrganizationId
                         LEFT JOIN dbo.MeetingExtra me
                             ON om.MeetingId = me.MeetingId AND 'ParentMeeting' = me.Field
-                    WHERE om.MeetingDate > DATEADD(day, {3}, GETDATE())
-                        AND om.OrganizationId = cto.OrganizationId
+                    WHERE om.OrganizationId = cto.OrganizationId AND
+                        om.MeetingDate > DATEADD(DAY, {3}, GETDATE()) AND
+                        om.MeetingDate < DATEADD(DAY, {4}, GETDATE())
                     FOR JSON PATH, INCLUDE_NULL_VALUES 
                 ) as OrgMeetings
             FROM cteTargetOrgs cto
@@ -381,6 +392,7 @@ def get_person_info_for_sync(person_obj):
             , o.[MemberCount]                AS [memberCount]
             , o.[groupFull]                  AS [groupFull]
             , o.[GenderId]                   AS [genderId]
+            , o.[ShowInSites]                AS [showInSites]
             , o.[Description]                AS [description]
             , o.[closed]                     AS [closed]
             , o.[NotWeekly]                  AS [notWeekly]
@@ -422,7 +434,8 @@ def get_person_info_for_sync(person_obj):
                 ON o.OrganizationId = ol.OrganizationId
             LEFT JOIN lookup.Campus c
                 ON o.CampusId = c.Id
-        ORDER BY o.parentInvId ASC, o.OrganizationId ASC''').format(divs, hostMemTypes, featMtgs, mtgHist, mtgFuture)
+        ORDER BY o.parentInvId ASC, o.OrganizationId ASC''').
+              format(divs, hostMemTypes, featMtgs, mtgHist, mtgFuture, exDivs))
 
     groups = model.SqlListDynamicData(invSql)
 
@@ -567,11 +580,17 @@ def get_person_info_for_sync(person_obj):
                  SELECT p.*, 8 as score FROM People p 
                     WHERE (p.FirstName LIKE '{0}%' OR p.NickName LIKE '{0}%') AND (p.AltName LIKE '{1}%' OR p.MaidenName LIKE '{1}%')
                  UNION
+                 SELECT p.*, 7 as score FROM People p  -- Businesses/Orgs
+                    WHERE p.LastName LIKE '{0}% {1}%'
+                 UNION
+                 SELECT p.*, 6 as score FROM People p  -- Businesses/Orgs
+                    WHERE p.LastName LIKE '{0}%{1}%'
+                 UNION
                  SELECT p.*, 5 as score FROM People p 
                     WHERE (p.FirstName LIKE '{0}%' OR p.NickName LIKE '{0}%') OR p.LastName LIKE '{1}%'
                  UNION
                  SELECT p.*, 4 as score FROM People p 
-                    WHERE (p.FirstName LIKE '{0}%' OR p.NickName LIKE '{0}%') OR (p.AltName LIKE '{1}%' OR p.MaidenName LIKE '{1}')
+                    WHERE (p.FirstName LIKE '{0}%' OR p.NickName LIKE '{0}%') OR (p.AltName LIKE '{1}%' OR p.MaidenName LIKE '{1}%')
              ) p1
              GROUP BY
                  p1.PeopleId,

From 173c2910d12aa6f66e800f2605a78b808f2e36e7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 15 Apr 2024 17:03:35 -0400
Subject: [PATCH 081/423] Prev/Next format for Cal Grid

---
 src/TouchPoint-WP/CalendarGrid.php | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 94714bb0..51ce16c2 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -31,8 +31,20 @@ class CalendarGrid {
 	public ?DateTimeImmutable $next = null;
 	public ?DateTimeImmutable $prev = null;
 
+	/**
+	 * The HTML for the calendar grid.
+	 *
+	 * @var string
+	 */
 	public string $html;
 
+	/**
+	 * The name of the month being displayed.
+	 *
+	 * @var string
+	 */
+	public string $monthName;
+
 
 	/**
 	 * Create a calendar grid for a given month and year.
@@ -62,6 +74,8 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		$firstDayOfMonth = DateTimeImmutable::createFromMutable($d);
 		$lastDayOfMonth = DateTimeImmutable::createFromMutable($d);
 
+		$this->monthName = date_i18n("F", $d->getTimestamp());
+
 		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
 		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
 		$d->modify("-$offsetDays days");
@@ -172,6 +186,34 @@ public function __toString(): string
 		return $this->html;
 	}
 
+	/**
+	 * This method returns a navigation bar for the calendar grid with simply next/prev month links.
+	 *
+	 * @param bool $withMonthName
+	 *
+	 * @return string
+	 */
+	public function navBar(bool $withMonthName = false): string
+	{
+		$r = "<div class=\"calGridNav\">";
+		$r .= "<div class=\"prev\">";
+		$r .= $this->getPrevLink();
+		$r .= "</div>";
+
+		if ($withMonthName) {
+			$r .= "<div class=\"month\">";
+			$r .= "<h2>$this->monthName</h2>";
+			$r .= "</div>";
+		}
+
+		$r .= "<div class=\"next\">";
+		$r .= $this->getNextLink();
+		$r .= "</div>";
+		$r .= "</div>";
+
+		return $r;
+	}
+
 	/**
 	 * Adjust a WP_Query object to filter only to events that overlap with the given day.
 	 *

From 6e035375f34d20db9fbfed96c6f96223bf8078b6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 17 Apr 2024 00:16:09 -0400
Subject: [PATCH 082/423] Resolve an issue where contact buttons (and others,
 presumably) don't work if the involvement identifier is on the button rather
 than the parent element.

---
 assets/js/base-defer.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 5319884e..36b3d814 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -521,7 +521,13 @@ class TP_Mappable {
             this.connectedElements[ei].addEventListener('mouseenter', function(e){e.stopPropagation(); mappable.toggleHighlighted(true);});
             this.connectedElements[ei].addEventListener('mouseleave', function(e){e.stopPropagation(); mappable.toggleHighlighted(false);});
 
-            let actionBtns = this.connectedElements[ei].querySelectorAll('[data-tp-action]')
+            let ce = this.connectedElements[ei],
+                actionBtns = Array.from(ce.querySelectorAll('[data-tp-action]'));
+            if (ce.hasAttribute('data-tp-action')) {
+                // if there's a sole button, it should be added to the list so it works, too.
+                actionBtns.push(ce);
+            }
+
             for (const ai in actionBtns) {
                 if (!actionBtns.hasOwnProperty(ai)) continue;
                 const action = actionBtns[ai].getAttribute('data-tp-action');

From 7c2064d7b614248068a4e8e5d34e8a919412e4e9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 26 Apr 2024 09:10:08 -0400
Subject: [PATCH 083/423] Allow documentation for hooks to be generated
 automatically.

---
 composer.json                               |  2 +
 generateDocs.ps1                            | 15 ++++-
 src/TouchPoint-WP/Auth.php                  | 18 ++++--
 src/TouchPoint-WP/EventsCalendar.php        | 22 +++++++-
 src/TouchPoint-WP/Involvement.php           | 61 +++++++++++++++++++--
 src/TouchPoint-WP/Partner.php               | 30 +++++++++-
 src/TouchPoint-WP/Person.php                | 39 ++++++++++++-
 src/TouchPoint-WP/Report.php                |  9 ++-
 src/TouchPoint-WP/TouchPointWP.php          | 28 ++++++++--
 src/TouchPoint-WP/TouchPointWP_Settings.php |  5 +-
 src/TouchPoint-WP/Utilities.php             | 39 ++++++++++++-
 11 files changed, 241 insertions(+), 27 deletions(-)

diff --git a/composer.json b/composer.json
index 8a9d67f0..88deaebc 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,8 @@
     "ext-zip": "*"
   },
   "require-dev": {
+    "pronamic/wp-documentor": "^1.3",
+    "skayo/phpdoc-md": "^0.2.0"
   },
   "config": {
     "allow-plugins": {
diff --git a/generateDocs.ps1 b/generateDocs.ps1
index fec7fa92..2af32319 100644
--- a/generateDocs.ps1
+++ b/generateDocs.ps1
@@ -7,4 +7,17 @@ if (!(test-path $pharFile -newerThan $compareDt))
     Invoke-WebRequest https://www.phpdoc.org/phpDocumentor.phar -OutFile $pharFile
 }
 
-php phpDocumentor.phar
\ No newline at end of file
+.\vendor\bin\wp-documentor parse --output=docs/wpApi/actions.rst --prefix=tp_ --type=actions --format=phpdocumentor-rst .\src\TouchPoint-WP\
+.\vendor\bin\wp-documentor parse --output=docs/wpApi/filters.rst --prefix=tp_ --type=filters --format=phpdocumentor-rst .\src\TouchPoint-WP\
+
+if (Test-Path .\docs\wpApi\index.rst)
+{
+    Remove-Item .\docs\wpApi\index.rst
+}
+New-Item .\docs\wpApi\index.rst -type File
+Get-Content .\docs\wpApi\filters.rst, .\docs\wpApi\actions.rst | Out-File .\docs\wpApi\index.rst
+
+php phpDocumentor.phar --template=responsive
+
+#.\vendor\bin\phpdocmd docs/phpApi/structure.xml docs/api --lt %c --index _Sidebar.md
+
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 2dd31127..330a2c5d 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -262,10 +262,13 @@ private static function createApiKeyIfNeeded(): void
 	 */
 	public static function redirectLoginFormMaybe()
 	{
-		$redirect = apply_filters(
-			TouchPointWP::HOOK_PREFIX . 'auto_redirect_login',
-			(TouchPointWP::instance()->settings->auth_default === 'on')
-		);
+		$redirect = TouchPointWP::instance()->settings->auth_default === 'on';
+		/**
+		 * Controls whether to redirect to the TouchPoint login automatically.
+		 *
+		 * @param bool $redirect Value preset from setting TouchPoint login as default.
+		 */
+		$redirect = apply_filters('tp_auto_redirect_login', $redirect);
 
 		if (isset($_GET[TouchPointWP::HOOK_PREFIX . 'no_redirect'])) {
 			$redirect = false;
@@ -286,7 +289,12 @@ public static function removeAdminBarMaybe()
 					 && ! is_admin()
 					 && ! current_user_can('edit_posts');
 
-		$removeBar = apply_filters(TouchPointWP::HOOK_PREFIX . 'prevent_admin_bar', $removeBar);
+		/**
+		 * Allows for hiding the WordPress-provided Admin bar.
+		 *
+		 * @param bool $removeBar True if bar should be removed.
+		 */
+		$removeBar = apply_filters('tp_prevent_admin_bar', $removeBar);
 
 		if ($removeBar) {
 			show_admin_bar(false);
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index e43f62fc..8d150ea9 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -67,7 +67,16 @@ protected static function generateEventsList(array $params = []): array
 
 			$content = trim(get_the_content(null, true, $eQ->ID));
 			$content = apply_filters('the_content', $content);
-			$content = apply_filters(TouchPointWP::HOOK_PREFIX . 'app_events_content', $content);
+			/**
+			 * Allows for manipulation of the html returned to the calendar feature of 2.0 Mobile apps.
+			 *
+			 * @since 0.0.2
+			 *
+			 * @depecated 0.0.90 Will be going away with Mobile App version 2.0
+			 *
+			 * @param string $content The html thus far.
+			 */
+			$content = apply_filters('tp_app_events_content', $content);
 
 			$content = html_entity_decode($content);
 
@@ -107,7 +116,16 @@ protected static function generateEventsList(array $params = []): array
 					$cssUrl = TouchPointWP::instance(
 						)->assets_url . 'template/ec-standardizing-style.css?v=' . TouchPointWP::VERSION;
 				}
-				$cssUrl = apply_filters(TouchPointWP::HOOK_PREFIX . 'app_events_css_url', $cssUrl);
+
+				/**
+				 * Insert a CSS file into all event content for mobile 2.0 app.
+				 *
+				 * @since 0.0.3
+				 * @depecated 0.0.90 Will be going away with Mobile App version 2.0
+				 *
+				 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
+				 */
+				$cssUrl = apply_filters('tp_app_events_css_url', $cssUrl);
 				if (is_string($cssUrl)) {
 					$content = "<link rel=\"stylesheet\" href=\"$cssUrl\">" . $content;
 				}
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index df181959..eb3518e8 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1186,7 +1186,17 @@ public static function listShortcode($params = [], string $content = ""): string
 				'type'       => null,
 				'div'        => null,
 				'class'      => self::$containerClass,
-				'includecss' => apply_filters(TouchPointWP::HOOK_PREFIX . 'use_css', true, self::class),
+
+				/**
+				 * Determines whether or not to automatically include the plugin-default CSS.  Return false to use your
+				 * own CSS instead.
+				 *
+				 * @since 0.0.15
+				 *
+				 * @param bool $useCss Whether or not to include the default CSS.  True = include
+				 * @param string $className The name of the current calling class. 
+				 */
+				'includecss' => apply_filters('tp_use_css', true, self::class),
 				'itemclass'  => self::$itemClass,
 				'usequery'   => false
 			],
@@ -2829,6 +2839,7 @@ public function notableAttributes(array $exclude = []): array
 		 * such as the schedule, leaders, and location.
 		 *
 		 * @see Involvement::notableAttributes()
+		 * @see PostTypeCapable::notableAttributes()
 		 *
 		 * @since 0.0.11
 		 *
@@ -2920,7 +2931,29 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 			}
 		}
 
-		return apply_filters(TouchPointWP::HOOK_PREFIX . "involvement_actions", $ret, $this, $context, $btnClass);
+		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
+			$tpHost = TouchPointWP::instance()->host();
+			$title  = sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
+			$logo = TouchPointWP::TouchPointIcon();
+			$ret[]  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
+		}
+
+		/**
+		 * Allows for manipulation of the action buttons for an Involvement.  This is the list of buttons that appear
+		 * on the Involvement to allow the user to interact with it.
+		 *
+		 * @since 0.0.7
+		 *
+		 * @see Involvement::getActionButtons()
+		 * @see PostTypeCapable::getActionButtons()
+		 *
+		 * @param StringableArray $ret The list of action buttons.
+		 * @param Involvement $this The Involvement object.
+		 * @param ?string $context A reference to where the action buttons are meant to be used.
+		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
+		 *     elements.
+		 */
+		return apply_filters("tp_involvement_actions", $ret, $this, $context, $btnClass);
 	}
 
 	public static function getJsInstantiationString(): string
@@ -2990,8 +3023,28 @@ private static function ajaxInvJoin(): void
 	 */
 	protected static function allowContact(string $invType): bool
 	{
-		$allowed = !!apply_filters(TouchPointWP::HOOK_PREFIX . 'allow_contact', true);
-		return !!apply_filters(TouchPointWP::HOOK_PREFIX . 'inv_allow_contact', $allowed, $invType);
+		/**
+		 * Determines whether contact of any kind is allowed.  This is meant to prevent abuse in contact forms by
+		 * removing the ability to contact people and thereby hiding the forms.
+		 *
+		 * @since 0.0.35
+		 *
+		 * @param bool $allowed True if contact is allowed.
+		 */
+		$allowed = !!apply_filters('tp_allow_contact', true);
+
+		/**
+		 * Determines whether contact is allowed for any Involvements.  This is called *after* tp_allow_contact, and
+		 * that will set the default. 
+		 *
+		 * @since 0.0.35
+		 *
+		 * @see tp_allow_contact
+		 *
+		 * @param bool $allowed Previous response from tp_allow_contact.  True if contact is allowed.
+		 * @param string $invType The name of the Involvement Type.
+		 */
+		return !!apply_filters('tp_inv_allow_contact', $allowed, $invType);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index bf933d01..cfa9f325 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -539,7 +539,18 @@ public static function updateFromTouchPoint(bool $verbose = false)
 	 */
 	public static function templateFilter(string $template): string
 	{
-		if (apply_filters(TouchPointWP::HOOK_PREFIX . 'use_default_templates', true, self::class)) {
+		/**
+		 * Determines whether the plugin's default templates should be used.  Theme developers can return false in this
+		 * filter to prevent the default templates from applying, especially if they conflict with the theme.
+		 *
+		 * Default is true.
+		 *
+		 * @since 0.0.6
+		 *
+		 * @param bool $value The value to return.  True will allow the default templates to be applied.
+		 * @param string $className The name of the class calling for the template.
+		 */
+		if (apply_filters('tp_use_default_templates', true, self::class)) {
 			$postTypesToFilter        = self::POST_TYPE;
 			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
@@ -1248,7 +1259,22 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 			$ret  .= "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
 		}
 
-		return apply_filters(TouchPointWP::HOOK_PREFIX . "partner_actions", $ret, $this, $context, $btnClass);
+		/**
+		 * Allows for manipulation of the action buttons for a Partner.  This is the list of buttons that appear
+		 * on the Partner to allow the user to interact with it.
+		 *
+		 * @since 0.0.7
+		 *
+		 * @see Partner::getActionButtons()
+		 * @see PostTypeCapable::getActionButtons()
+		 *
+		 * @param StringableArray $ret The list of action buttons.
+		 * @param Partner $this The Partner object.
+		 * @param ?string $context A reference to where the action buttons are meant to be used.
+		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
+		 *     elements.
+		 */
+		return apply_filters("tp_partner_actions", $ret, $this, $context, $btnClass);
 	}
 
 	public static function getJsInstantiationString(): string
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index eecd2e44..5f08e0fe 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1190,7 +1190,21 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 			$ret = "<button type=\"button\" data-tp-action=\"contact\" $btnClass>$text</button>  ";
 		}
 
-		return apply_filters(TouchPointWP::HOOK_PREFIX . "person_actions", $ret, $this, $context, $btnClass);
+		/**
+		 * Allows for manipulation of the action buttons for a Person.  This is the list of buttons that appear
+		 * on the Person to allow the user to interact with them.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @see Person::getActionButtons()
+		 *
+		 * @param StringableArray $ret The list of action buttons.
+		 * @param Person $this The Person object.
+		 * @param ?string $context A reference to where the action buttons are meant to be used.
+		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
+		 *     elements.
+		 */
+		return apply_filters("tp_person_actions", $ret, $this, $context, $btnClass);
 	}
 
 	/**
@@ -1699,8 +1713,27 @@ public static function api(array $uri): bool
 	 */
 	protected static function allowContact(): bool
 	{
-		$allowed = !!apply_filters(TouchPointWP::HOOK_PREFIX . 'allow_contact', true);
-		return !!apply_filters(TouchPointWP::HOOK_PREFIX . 'person_allow_contact', $allowed);
+		/**
+		 * Determines whether contact of any kind is allowed.  This is meant to prevent abuse in contact forms by
+		 * removing the ability to contact people and thereby hiding the forms.
+		 *
+		 * @since 0.0.35
+		 *
+		 * @param bool $allowed True if contact is allowed.
+		 */
+		$allowed = !!apply_filters('tp_allow_contact', true);
+
+		/**
+		 * Determines whether contact is allowed for any People.  This is called *after* tp_allow_contact, and
+		 * that will set the default.
+		 *
+		 * @since 0.0.35
+		 *
+		 * @see tp_allow_contact
+		 *
+		 * @param bool $allowed Previous response from tp_allow_contact.  True if contact is allowed.
+		 */
+		return !!apply_filters('tp_person_allow_contact', $allowed);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 7312ecfb..e4d9bf8f 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -294,7 +294,14 @@ public static function reportShortcode($params = [], string $content = ""): stri
 
 		// Add Figure elt with a unique ID
 		$idAttr = "id=\"" . wp_unique_id('tp-report-') . "\"";
-		$class = apply_filters(self::FIGURE_CLASS_FILTER, self::FIGURE_CLASS_DEFAULT);
+
+		/**
+		 * Filter the class name to be used for the displaying the report.
+		 *
+		 * @param string $className The class name to be used.
+		 * @param Report $report The report being displayed.
+		 */
+		$class = apply_filters("tp_rpt_figure_class", self::$classDefault, $report);
         $rc     = "<figure $idAttr class=\"$class\">\n\t" . str_replace("\n", "\n\t", $rc);
 
 		// If desired, add a caption that indicates when the table was last updated.
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 2f0f2a2b..551fc876 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -65,7 +65,7 @@ class TouchPointWP
 	 */
 	public const HOOK_PREFIX = "tp_";
 
-	public const INIT_ACTION_HOOK = self::HOOK_PREFIX . "init";
+	public const INIT_ACTION_HOOK = "tp_init"; // Note that this is also hard-coded where the action is declared.
 
 	/**
 	 * Prefix to use for all settings.
@@ -752,7 +752,10 @@ public static function init(): void
 
 		self::requireScript("base");
 
-		do_action(self::INIT_ACTION_HOOK);
+		/**
+		 * Fires after the plugin has been initialized.
+		 */
+		do_action("tp_init");
 	}
 
 	/**
@@ -867,7 +870,12 @@ public function registerScriptsAndStyles(): void
 	 */
 	public static function requireScript(string $name = null): void
 	{
-		if ( ! apply_filters(TouchPointWP::HOOK_PREFIX . "include_script_" . strtolower($name), true)) {
+		/**
+		 * Filter to determine if a given script (which comes with TouchPoint-WP) should be included.
+		 *
+		 * @params bool $include Whether to include the script.
+		 */
+		if ( !apply_filters("tp_include_script_" . strtolower($name), true)) {
 			return;
 		}
 
@@ -895,7 +903,12 @@ public static function requireScript(string $name = null): void
 	 */
 	public static function requireStyle(string $name = null): void
 	{
-		if ( ! apply_filters(TouchPointWP::HOOK_PREFIX . "include_style_" . strtolower($name), true)) {
+		/**
+		 * Filter to determine if a given stylesheet (which comes with TouchPoint-WP) should be included.
+		 *
+		 * @params bool $include Whether to include the stylesheet.
+		 */
+		if ( ! apply_filters("tp_include_style_" . strtolower($name), true)) {
 			return;
 		}
 
@@ -2355,7 +2368,12 @@ public static function enqueuePartialsStyle(): void
 	 */
 	public static function enqueueActionsStyle(string $action): void
 	{
-		$includeActionsStyle = ! ! apply_filters(TouchPointWP::HOOK_PREFIX . "include_actions_style", true, $action);
+		/**
+		 * Filter to determine if the stylesheet that adjusts SWAL and other action-related items should be included.
+		 *
+		 * @params bool $include Whether to include the styles.  Default true = include.
+		 */
+		$includeActionsStyle = !!apply_filters("tp_include_actions_style", true, $action);
 		if ($includeActionsStyle) {
 			wp_enqueue_style(
 				TouchPointWP::SHORTCODE_PREFIX . 'actions-style',
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 5c388d50..56f29569 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1274,8 +1274,11 @@ public function addMenuItems(): void
 	 */
 	private function menu_settings()
 	{
+		/**
+		 * Adjust the menu settings before they're applied.
+		 */
 		return apply_filters(
-			TouchPointWP::SETTINGS_PREFIX . 'menu_settings',
+			'tp_menu_settings',
 			[
 				'location'    => 'options', // Possible settings: options, menu, submenu.
 				'parent_slug' => 'options-general.php',
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 34135851..4fe4fc27 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -575,15 +575,48 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 			return $o;
 		}
 
-		$html      = apply_filters(TouchPointWP::HOOK_PREFIX . 'pre_standardize_html', $html, $context);
-		$maxHeader = intval(apply_filters(TouchPointWP::HOOK_PREFIX . 'standardize_h_tags_max_h', 2, $context));
+		/**
+		 * Make any adjustments to HTML content before the rest of the standardization process happens.
+		 *
+		 * @since 0.0.25
+		 *
+		 * @param string $html The HTML to be standardized.
+		 * @param string $context A context string to pass to hooks.
+		 *
+		 * @return string The standardized HTML.
+		 */
+		$html      = apply_filters('tp_pre_standardize_html', $html, $context);
+
+
+		/**
+		 * The maximum header level to allow in the HTML.  Default is 2.
+		 *
+		 * @since 0.0.25
+		 *
+		 * @param int    $maxHeader The highest header level (lowest number) to allow in the HTML. (e.g. 2 for <h2> tags)
+		 * @param string $context A context string to pass to hooks.
+		 *
+		 * @return int The maximum header level to allow in the HTML.
+		 */
+		$maxHeader = intval(apply_filters('tp_standardize_h_tags_max_h', 2, $context));
 
 		$allowedTags = [
 			'p', 'br', 'a', 'em', 'strong', 'b', 'i', 'u', 'hr', 'ul', 'ol', 'li',
 			'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
 			'table', 'tr', 'th', 'td', 'thead', 'tbody', 'tfoot'
 		];
-		$allowedTags = apply_filters(TouchPointWP::HOOK_PREFIX . 'standardize_allowed_tags', $allowedTags, $context);
+
+		/**
+		 * The allowed tags in the HTML standardization process.  Default is a set of common tags.
+		 *
+		 * @since 0.0.25
+		 *
+		 * @param string[] $allowedTags The allowed tags in the HTML.
+		 * @param string   $context A context string to pass to hooks.
+		 *
+		 * @return string[] The allowed tags in the HTML.
+		 */
+		$allowedTags = apply_filters('tp_standardize_allowed_tags', $allowedTags, $context);
 
 		$html = self::standardizeHTags($maxHeader, $html);
 		$html = strip_tags($html, $allowedTags);

From 4ad69990dbc5597d3c849676e2d9d4d749a38dfb Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 09:16:29 -0400
Subject: [PATCH 084/423] Closes #181

---
 src/TouchPoint-WP/Utilities/DateFormats.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index f59e05d2..53ddd5e2 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -63,27 +63,27 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 
 
 				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
-					$day = date_i18n(_x('l', "Date string for day of the week, when given without a year.", "TouchPoint-WP"), $ts);
-					$date = date_i18n(_x('M j', "Date string when given without a year", "TouchPoint-WP"), $ts);
+					$day = date_i18n(_x('l', "Date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
+					$date = date_i18n(_x('F j', "Date string when the year is current.", "TouchPoint-WP"), $ts);
 				} else {
-					$day = date_i18n(_x('D', "Date string for day of the week, when given with a year.", "TouchPoint-WP"), $ts);
-					$date = date_i18n(_x('M j, Y', "Date string when given with a year", "TouchPoint-WP"), $ts);
+					$day = date_i18n(_x('l', "Date string for day of the week, when te year is not current.", "TouchPoint-WP"), $ts);
+					$date = date_i18n(_x('F j, Y', "Date string when the year is not current.", "TouchPoint-WP"), $ts);
 				}
 
 				// Last week
-				if ($ts - $nowTs > -7 * 86400 && $ts - $nowTs < 0) {
+				if ($ts < $nowTs && $ts - $nowTs > -7 * 86400) {
 					// translators: %1s is "Monday".  %2s is "January 1".
 					$r = sprintf(_x('Last %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 				}
 
 				// This week
-				else if ($ts - $nowTs < 7 * 86400) {
+				else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
 					// translators: %1s is "Monday".  %2s is "January 1".
 					$r = sprintf(_x('This %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 				}
 
 				// Next week
-				else if ($ts - $nowTs < 14 * 86400) {
+				else if ($ts > $nowTs && $ts - $nowTs < 14 * 86400) {
 					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('Next %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 

From a440d60d3dcea7fad6ea8f17cee2440bf306d91a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 09:38:11 -0400
Subject: [PATCH 085/423] Adding TouchPoint logo for linking to
 meetings/involvements/etc

---
 assets/branding/icon-curcolor.svg | 1 +
 assets/template/actions-style.css | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 assets/branding/icon-curcolor.svg

diff --git a/assets/branding/icon-curcolor.svg b/assets/branding/icon-curcolor.svg
new file mode 100644
index 00000000..92713b4b
--- /dev/null
+++ b/assets/branding/icon-curcolor.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41.39 55"><defs><style>.b{fill:currentcolor;stroke-width:0px;}</style></defs><path class="b" d="M.14,18.28c-.09.79-.14,1.59-.14,2.4,0,4.82,1.65,9.25,4.42,12.76l14.54,21.56V12.77c-6.38.28-12.73,2.11-18.82,5.5Z"/><path class="b" d="M20.69,0C11.43,0,3.59,6.08.95,14.46c12.78-6.8,26.7-6.8,39.48,0C37.79,6.08,29.95,0,20.69,0Z"/><path class="b" d="M41.25,18.28c-6.07-3.38-12.42-5.21-18.78-5.5v28.5c10.6-.9,18.92-9.78,18.92-20.6,0-.81-.05-1.62-.14-2.4h0Z"/></svg>
\ No newline at end of file
diff --git a/assets/template/actions-style.css b/assets/template/actions-style.css
index 460e2d28..c01e516c 100644
--- a/assets/template/actions-style.css
+++ b/assets/template/actions-style.css
@@ -27,4 +27,9 @@ div.swal2-content table.tp-radio-list {
 
 button[data-tp-action]:not([disabled]) {
     cursor: pointer;
+}
+
+.tp-TouchPoint-logo svg {
+    height: 1.2em;
+    margin-bottom: -0.2em;
 }
\ No newline at end of file

From 9e3dfc100c289e7f5ee45a031435cdf8bb28032c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 09:39:11 -0400
Subject: [PATCH 086/423] i18n updates

---
 i18n/TouchPoint-WP-es_ES.po                 | 746 +++++++++++--------
 i18n/TouchPoint-WP.pot                      | 778 ++++++++++++--------
 src/TouchPoint-WP/Utilities/DateFormats.php |   2 +-
 3 files changed, 887 insertions(+), 639 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 2ce0cb93..5e38822f 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:944
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -87,9 +87,10 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Rsvp.php:77
-#: assets/js/base-defer.js:188
-#: assets/js/base-defer.js:1123
+#: src/TouchPoint-WP/Meeting.php:537
+#: src/TouchPoint-WP/Rsvp.php:79
+#: assets/js/base-defer.js:192
+#: assets/js/base-defer.js:1133
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -122,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1464
+#: src/TouchPoint-WP/Involvement.php:1624
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1490
+#: src/TouchPoint-WP/Involvement.php:1650
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +174,7 @@ msgstr "Seleccione..."
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
 #: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1710
+#: src/TouchPoint-WP/Involvement.php:1870
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -188,15 +189,15 @@ msgstr "%s se importarán durante la noche por primera vez."
 msgid "Sign in with your %s account"
 msgstr "Inicie sesión con su cuenta de %s"
 
-#: src/TouchPoint-WP/Auth.php:401
+#: src/TouchPoint-WP/Auth.php:409
 msgid "Your login token expired."
 msgstr "Su token de inicio de sesión caducó."
 
-#: src/TouchPoint-WP/Auth.php:416
+#: src/TouchPoint-WP/Auth.php:424
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
-#: src/TouchPoint-WP/Auth.php:428
+#: src/TouchPoint-WP/Auth.php:436
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
@@ -208,735 +209,737 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:466
+#: src/TouchPoint-WP/Involvement.php:467
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:470
+#: src/TouchPoint-WP/Involvement.php:472
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:476
+#: src/TouchPoint-WP/Involvement.php:479
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:481
+#: src/TouchPoint-WP/Involvement.php:485
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1339
-#: src/TouchPoint-WP/Partner.php:769
+#: src/TouchPoint-WP/Involvement.php:1499
+#: src/TouchPoint-WP/Partner.php:787
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1547
-#: src/TouchPoint-WP/Partner.php:791
+#: src/TouchPoint-WP/Involvement.php:1707
+#: src/TouchPoint-WP/Partner.php:809
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3069
+#: src/TouchPoint-WP/Involvement.php:3245
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3072
+#: src/TouchPoint-WP/Involvement.php:3248
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3147
+#: src/TouchPoint-WP/Involvement.php:3319
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3155
+#: src/TouchPoint-WP/Involvement.php:3326
+#: src/TouchPoint-WP/Involvement.php:3364
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3160
+#: src/TouchPoint-WP/Involvement.php:3331
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3164
+#: src/TouchPoint-WP/Involvement.php:3335
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3169
+#: src/TouchPoint-WP/Involvement.php:3340
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3172
+#: src/TouchPoint-WP/Involvement.php:3343
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3175
+#: src/TouchPoint-WP/Involvement.php:3346
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3178
+#: src/TouchPoint-WP/Involvement.php:3349
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3185
-#: assets/js/base-defer.js:991
+#: src/TouchPoint-WP/Involvement.php:3358
+#: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3194
-#: src/TouchPoint-WP/Partner.php:1247
+#: src/TouchPoint-WP/Involvement.php:3376
+#: src/TouchPoint-WP/Partner.php:1283
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:798
+#: src/TouchPoint-WP/Partner.php:816
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1204
+#: src/TouchPoint-WP/Partner.php:1224
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
-#: src/TouchPoint-WP/Person.php:149
+#: src/TouchPoint-WP/Person.php:150
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr "No se proporcionó una identificación de usuario de WordPress para inicializar un objeto de persona."
 
-#: src/TouchPoint-WP/Person.php:641
+#: src/TouchPoint-WP/Person.php:642
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1187
+#: src/TouchPoint-WP/Person.php:1188
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Rsvp.php:82
+#: src/TouchPoint-WP/Meeting.php:536
+#: src/TouchPoint-WP/Rsvp.php:84
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1900
+#: src/TouchPoint-WP/TouchPointWP.php:1928
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1957
+#: src/TouchPoint-WP/TouchPointWP.php:1985
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1960
+#: src/TouchPoint-WP/TouchPointWP.php:1988
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1963
+#: src/TouchPoint-WP/TouchPointWP.php:1991
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1968
-#: src/TouchPoint-WP/TouchPointWP.php:1969
+#: src/TouchPoint-WP/TouchPointWP.php:1996
+#: src/TouchPoint-WP/TouchPointWP.php:1997
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2097
-#: src/TouchPoint-WP/TouchPointWP.php:2137
+#: src/TouchPoint-WP/TouchPointWP.php:2125
+#: src/TouchPoint-WP/TouchPointWP.php:2170
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2105
-#: src/TouchPoint-WP/TouchPointWP.php:2144
+#: src/TouchPoint-WP/TouchPointWP.php:2133
+#: src/TouchPoint-WP/TouchPointWP.php:2177
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2264
+#: src/TouchPoint-WP/TouchPointWP.php:2297
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:252
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:254
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:253
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:269
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:271
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:270
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:277
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:279
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:278
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:299
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:301
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:300
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:310
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:312
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:311
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:332
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:334
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:333
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:343
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:345
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:344
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:356
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:358
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:368
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:370
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:380
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:382
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:381
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:393
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:395
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:394
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:405
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:407
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:406
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:417
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:419
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:418
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:436
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:438
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:440
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:459
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:462
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:474
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:476
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:475
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:487
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:496
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:734
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:498
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:736
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:497
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:515
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:518
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:528
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:530
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:529
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:538
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:539
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:548
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:550
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:549
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:570
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:572
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:571
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:578
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:606
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:608
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:607
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:611
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:622
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:624
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:623
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:644
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:646
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:645
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:655
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:657
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:656
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:668
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:670
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:669
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:679
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:681
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:680
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:690
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:692
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:691
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:701
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:703
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:702
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:712
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:714
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:713
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:723
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:725
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:724
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:735
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:746
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:748
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:747
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:765
 msgid "Events Calendar"
 msgstr "Calendario de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:766
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr "Integre con el calendario de eventos de ModernTribe."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:768
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr "Para usar los eventos de su calendario de eventos en la aplicación móvil personalizada, configure el proveedor en <code>Wordpress Plugin - Modern Tribe</code> y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:788
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:790
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:789
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:902
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:877
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:903
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:970
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1016
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1017
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1002
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1003
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1046
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1024
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1036
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1048
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1075
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1220
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1251
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1276
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1277
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1310
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1311
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1308
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1540
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1574
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1662
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1696
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1713
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1747
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1398
+#: src/TouchPoint-WP/Person.php:1442
 #: src/TouchPoint-WP/Utilities.php:251
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
 
-#: assets/js/base-defer.js:208
-#: assets/js/base-defer.js:1158
+#: assets/js/base-defer.js:212
+#: assets/js/base-defer.js:1168
 msgid "Your Location"
 msgstr "Tu ubicación"
 
-#: assets/js/base-defer.js:229
+#: assets/js/base-defer.js:233
 msgid "User denied the request for Geolocation."
 msgstr "El usuario denegó la solicitud de geolocalización."
 
-#: assets/js/base-defer.js:233
+#: assets/js/base-defer.js:237
 msgid "Location information is unavailable."
 msgstr "La información de ubicación no está disponible."
 
-#: assets/js/base-defer.js:237
+#: assets/js/base-defer.js:241
 msgid "The request to get user location timed out."
 msgstr "Se agotó el tiempo de espera de la solicitud para obtener la ubicación del usuario."
 
-#: assets/js/base-defer.js:241
+#: assets/js/base-defer.js:245
 msgid "An unknown error occurred."
 msgstr "Un error desconocido ocurrió."
 
-#: assets/js/base-defer.js:277
-#: assets/js/base-defer.js:287
+#: assets/js/base-defer.js:281
+#: assets/js/base-defer.js:291
 msgid "No geolocation option available."
 msgstr "No hay opción de geolocalización disponible."
 
-#: assets/js/base-defer.js:921
-#: assets/js/base-defer.js:958
-#: assets/js/base-defer.js:1415
-#: assets/js/meeting-defer.js:183
+#: assets/js/base-defer.js:931
+#: assets/js/base-defer.js:968
+#: assets/js/base-defer.js:1425
+#: assets/js/meeting-defer.js:182
 msgid "Something strange happened."
 msgstr "Algo extraño sucedió."
 
-#: assets/js/base-defer.js:947
-#: assets/js/base-defer.js:1404
+#: assets/js/base-defer.js:957
+#: assets/js/base-defer.js:1414
 msgid "Your message has been sent."
 msgstr "Tu mensaje ha sido enviado."
 
-#: assets/js/base-defer.js:987
+#: assets/js/base-defer.js:997
 msgid "Who is joining the group?"
 msgstr "¿Quién se une al grupo?"
 
-#: assets/js/base-defer.js:992
-#: assets/js/base-defer.js:1050
-#: assets/js/base-defer.js:1366
-#: assets/js/base-defer.js:1459
-#: assets/js/meeting-defer.js:225
+#: assets/js/base-defer.js:1002
+#: assets/js/base-defer.js:1060
+#: assets/js/base-defer.js:1376
+#: assets/js/base-defer.js:1469
+#: assets/js/meeting-defer.js:224
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: assets/js/base-defer.js:1005
+#: assets/js/base-defer.js:1015
 msgid "Select who should be added to the group."
 msgstr "Seleccione quién debe agregarse al grupo."
 
-#: assets/js/base-defer.js:1043
-#: assets/js/base-defer.js:1359
+#: assets/js/base-defer.js:1053
+#: assets/js/base-defer.js:1369
 msgid "From"
 msgstr "De"
 
-#: assets/js/base-defer.js:1044
-#: assets/js/base-defer.js:1360
+#: assets/js/base-defer.js:1054
+#: assets/js/base-defer.js:1370
 msgid "Message"
 msgstr "Mensaje"
 
-#: assets/js/base-defer.js:1059
-#: assets/js/base-defer.js:1375
+#: assets/js/base-defer.js:1069
+#: assets/js/base-defer.js:1385
 msgid "Please provide a message."
 msgstr "Proporcione un mensaje."
 
-#: assets/js/base-defer.js:1144
-#: assets/js/base-defer.js:1146
+#: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:1156
 msgid "We don't know where you are."
 msgstr "No sabemos dónde estás."
 
-#: assets/js/base-defer.js:1144
 #: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:1164
 msgid "Click here to use your actual location."
 msgstr "Haga clic aquí para usar su ubicación real."
 
-#: assets/js/base-defer.js:1305
-#: assets/js/base-defer.js:1322
+#: assets/js/base-defer.js:1315
+#: assets/js/base-defer.js:1332
 msgid "clear"
 msgstr "borrar"
 
-#: assets/js/base-defer.js:1311
+#: assets/js/base-defer.js:1321
 msgid "Other Relatives..."
 msgstr "Otros familiares..."
 
-#: assets/js/base-defer.js:1449
+#: assets/js/base-defer.js:1459
 msgid "Tell us about yourself."
 msgstr "Dinos sobre ti."
 
-#: assets/js/base-defer.js:1451
-#: assets/js/base-defer.js:1506
+#: assets/js/base-defer.js:1461
+#: assets/js/base-defer.js:1516
 msgid "Email Address"
 msgstr "Correo electrónico"
 
-#: assets/js/base-defer.js:1452
-#: assets/js/base-defer.js:1507
+#: assets/js/base-defer.js:1462
+#: assets/js/base-defer.js:1517
 msgid "Zip Code"
 msgstr "Condigo postal"
 
-#: assets/js/base-defer.js:1504
+#: assets/js/base-defer.js:1514
 msgid "Our system doesn't recognize you,<br />so we need a little more info."
 msgstr "Nuestro sistema no te reconoce.<br />Necesitamos un poco más de información."
 
-#: assets/js/base-defer.js:1508
+#: assets/js/base-defer.js:1518
 msgid "First Name"
 msgstr "Primer nombre"
 
-#: assets/js/base-defer.js:1509
+#: assets/js/base-defer.js:1519
 msgid "Last Name"
 msgstr "Apellido"
 
-#: assets/js/base-defer.js:1511
+#: assets/js/base-defer.js:1521
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -944,107 +947,107 @@ msgstr "Teléfono"
 msgid "Event Past"
 msgstr "Evento pasado"
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "Who is coming?"
 msgstr "¿Quien viene?"
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "Indicate who is or is not coming.  This will overwrite any existing RSVP."
 msgstr "Indica quien viene. Esto va a duplicar a una persona que ya está escrita."
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "To avoid overwriting an existing RSVP, leave that person blank."
 msgstr "Para evadir duplicar una persona que ya está escrita, de ja el espacio de la persona vacío."
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "To protect privacy, we won't show existing RSVPs here."
 msgstr "Para proteger tu privacidad, nosotros no mostraremos las personas que están registradas aquí."
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "Yes"
 msgstr "Sí"
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "No"
 msgstr "No"
 
-#: assets/js/meeting-defer.js:223
+#: assets/js/meeting-defer.js:222
 msgid "Add Someone Else"
 msgstr "Agregar a alguien más"
 
-#: assets/js/meeting-defer.js:224
+#: assets/js/meeting-defer.js:223
 msgid "Submit"
 msgstr "Enviar"
 
-#: assets/js/meeting-defer.js:243
+#: assets/js/meeting-defer.js:242
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2205
+#: src/TouchPoint-WP/TouchPointWP.php:2238
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
 #. translators: "RSVP for {Event Name}"  This is the heading on the RSVP modal.  The event name isn't translated because it comes from TouchPoint.
-#: assets/js/meeting-defer.js:205
+#: assets/js/meeting-defer.js:204
 msgid "RSVP for %s"
 msgstr "RSVP para %s"
 
-#: assets/js/meeting-defer.js:172
+#: assets/js/meeting-defer.js:171
 msgid "Response Recorded"
 msgid_plural "Responses Recorded"
 msgstr[0] "Respuesta registrada"
 msgstr[1] "Respuestas registrada"
 
 #. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:910
+#: assets/js/base-defer.js:920
 msgid "Added to %s"
 msgstr "Añadido a %s"
 
 #. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:981
 msgid "Join %s"
 msgstr "Únete %s"
 
 #. translators: %s is a person's name.  This is a heading for a contact modal.
-#: assets/js/base-defer.js:1342
+#: assets/js/base-defer.js:1352
 msgid "Contact %s"
 msgstr "Contactar a %s"
 
 #. translators: %s is the name of an involvement.  This is a heading for a modal.
-#: assets/js/base-defer.js:1026
+#: assets/js/base-defer.js:1036
 msgid "Contact the Leaders of %s"
 msgstr "Contacta a los líderes de %s"
 
-#: assets/js/base-defer.js:1049
-#: assets/js/base-defer.js:1365
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1375
 msgid "Send"
 msgstr "Envía"
 
-#: assets/js/base-defer.js:913
-#: assets/js/base-defer.js:924
-#: assets/js/base-defer.js:950
-#: assets/js/base-defer.js:961
-#: assets/js/base-defer.js:1407
-#: assets/js/base-defer.js:1418
-#: assets/js/meeting-defer.js:175
-#: assets/js/meeting-defer.js:186
+#: assets/js/base-defer.js:923
+#: assets/js/base-defer.js:934
+#: assets/js/base-defer.js:960
+#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:1417
+#: assets/js/base-defer.js:1428
+#: assets/js/meeting-defer.js:174
+#: assets/js/meeting-defer.js:185
 msgid "OK"
 msgstr "OK"
 
-#: assets/js/base-defer.js:1458
+#: assets/js/base-defer.js:1468
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1512
+#: src/TouchPoint-WP/Involvement.php:1672
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1525
+#: src/TouchPoint-WP/Involvement.php:1685
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1396
+#: src/TouchPoint-WP/Involvement.php:1556
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1162,12 +1165,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:946
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:972
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1206,72 +1209,72 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1513
+#: src/TouchPoint-WP/Involvement.php:1673
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1514
+#: src/TouchPoint-WP/Involvement.php:1674
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1555
-#: src/TouchPoint-WP/Partner.php:807
+#: src/TouchPoint-WP/Involvement.php:1715
+#: src/TouchPoint-WP/Partner.php:825
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1558
-#: src/TouchPoint-WP/Partner.php:810
+#: src/TouchPoint-WP/Involvement.php:1718
+#: src/TouchPoint-WP/Partner.php:828
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:729
-#: src/TouchPoint-WP/Involvement.php:749
+#: src/TouchPoint-WP/Involvement.php:880
+#: src/TouchPoint-WP/Involvement.php:900
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:758
+#: src/TouchPoint-WP/Involvement.php:908
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:765
+#: src/TouchPoint-WP/Involvement.php:915
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:775
+#: src/TouchPoint-WP/Involvement.php:925
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:781
+#: src/TouchPoint-WP/Involvement.php:931
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:790
+#: src/TouchPoint-WP/Involvement.php:940
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:796
+#: src/TouchPoint-WP/Involvement.php:946
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3096
+#: src/TouchPoint-WP/Involvement.php:3266
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1283,39 +1286,39 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1651
+#: src/TouchPoint-WP/Involvement.php:1811
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1661
+#: src/TouchPoint-WP/Involvement.php:1821
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1680
+#: src/TouchPoint-WP/Involvement.php:1840
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:331
-#: src/TouchPoint-WP/TouchPointWP.php:945
+#: src/TouchPoint-WP/Meeting.php:469
+#: src/TouchPoint-WP/TouchPointWP.php:973
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:359
+#: src/TouchPoint-WP/Meeting.php:497
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:369
+#: src/TouchPoint-WP/Meeting.php:507
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3246
-#: src/TouchPoint-WP/Involvement.php:3323
+#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3560
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:321
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:323
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1380,7 +1383,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:322
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1423,7 +1426,7 @@ msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:304
+#: src/TouchPoint-WP/Report.php:311
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
@@ -1431,7 +1434,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1439
+#: src/TouchPoint-WP/Involvement.php:1599
 msgid "Language"
 msgstr "Idioma"
 
@@ -1443,16 +1446,16 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1404
+#: src/TouchPoint-WP/Person.php:1448
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1460,133 +1463,254 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:884
 msgid "Meeting Deletion Handling"
 msgstr "Manejo de eliminación de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:891
 msgid "Always delete from WordPress"
 msgstr "Eliminar siempre de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3310
-#: src/TouchPoint-WP/Person.php:1735
+#: src/TouchPoint-WP/Involvement.php:3547
+#: src/TouchPoint-WP/Person.php:1798
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:357
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
-#: assets/js/base-defer.js:1492
+#: assets/js/base-defer.js:1502
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1609
+#: src/TouchPoint-WP/Person.php:1653
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3300
-#: src/TouchPoint-WP/Person.php:1752
+#: src/TouchPoint-WP/Involvement.php:3537
+#: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1541
+#: src/TouchPoint-WP/Person.php:1585
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
-#: src/templates/meeting-archive.php:28
+#: src/templates/meeting-archive.php:27
 #: src/templates/parts/meeting-list-none.php:13
-#: src/TouchPoint-WP/Meeting.php:194
+#: src/TouchPoint-WP/Meeting.php:204
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:195
+#: src/TouchPoint-WP/Meeting.php:205
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:288
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:290
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:289
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:819
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr "Las reuniones que hayan transcurrido más de esta cantidad de días pasados se trasladarán al Archivo de eventos. Una vez que pase esta fecha, la información de la reunión ya no se actualizará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan transcurrido tantos días desde el evento."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1087
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1088
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/meetingT.php:46
+#: src/TouchPoint-WP/Utilities/DateFormats.php:51
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/meetingT.php:48
+#: src/TouchPoint-WP/Utilities/DateFormats.php:53
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/meetingT.php:55
+#: src/TouchPoint-WP/Utilities/DateFormats.php:59
 msgid "Tomorrow"
 msgstr "mañana"
 
 #: src/templates/admin/invKoForm.php:341
 msgid "(named person)"
 msgstr "(persona nombrada)"
+
+#: src/TouchPoint-WP/Utilities.php:428
+msgid "Expand"
+msgstr "Ampliar"
+
+#: src/TouchPoint-WP/Meeting.php:385
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: src/TouchPoint-WP/Meeting.php:386
+msgid "Scheduled"
+msgstr "Programado"
+
+#. translators: %1s is "Monday".  %2s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:76
+msgctxt "Date format string"
+msgid "Last %1$s, %2$s"
+msgstr "el pasado %1$s %2$s"
+
+#. translators: %1s is "Monday".  %2s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:82
+msgctxt "Date format string"
+msgid "This %1$s, %2$s"
+msgstr "este %1$s %2$s"
+
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+msgctxt "Date format string"
+msgid "Next %1$s, %2$s"
+msgstr "el proximo %1$s %2$s"
+
+#. translators: %1s is "Monday".  %2s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:93
+msgctxt "Date format string"
+msgid "%1$s, %2$s"
+msgstr "%1$s %2$s"
+
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
+#: src/TouchPoint-WP/CalendarGrid.php:141
+msgid "%s is cancelled."
+msgstr "%s esta cancelado."
+
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Involvement.php:3388
+msgid "Involvement in %s"
+msgstr "Participaciones en %s"
+
+#: src/TouchPoint-WP/Meeting.php:277
+msgid "In the Past"
+msgstr "en el pasado"
+
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Meeting.php:330
+msgid "Meeting in %s"
+msgstr "Reunión en %s"
+
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Person.php:1196
+msgid "Person in %s"
+msgstr "Persona en %s"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+msgid "Meeting Name (Plural)"
+msgstr "Nombre de las reuniones (singular)"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+msgid "What you call Meetings at your church"
+msgstr "Lo que llamas Reuniones en tu iglesia"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+msgid "Meetings"
+msgstr "Reuniones"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+msgid "Events"
+msgstr "Eventos"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+msgid "Meeting Name (Singular)"
+msgstr "Nombre de la reunión (singular)"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+msgid "What you call a Meeting at your church"
+msgstr "Cómo se llama una Reunión en tu iglesia"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+msgid "Meeting"
+msgstr "Reunión"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+msgid "Event"
+msgstr "Evento"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:66
+msgctxt "Date string for day of the week, when the year is current."
+msgid "l"
+msgstr "l"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:67
+msgctxt "Date string when the year is current."
+msgid "F j"
+msgstr "j F"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:69
+msgctxt "Date string for day of the week, when the year is not current."
+msgid "l"
+msgstr "l"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:70
+msgctxt "Date string when the year is not current."
+msgid "F j, Y"
+msgstr "j F Y"
+
+#: src/TouchPoint-WP/Meeting.php:387
+msgctxt "Event Status is not a recognized value."
+msgid "Unknown"
+msgstr "desconocido"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 63ef533f..98cdabe2 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,33 +9,33 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-02-13T13:44:30+00:00\n"
+"POT-Creation-Date: 2024-04-29T13:24:58+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
 
 #. Plugin Name of the plugin
-#: touchpoint-wp.php
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "TouchPoint WP"
 msgstr ""
 
 #. Plugin URI of the plugin
-#: touchpoint-wp.php
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "https://github.com/tenthpres/touchpoint-wp"
 msgstr ""
 
 #. Description of the plugin
-#: touchpoint-wp.php
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "A WordPress Plugin for integrating with TouchPoint Church Management Software."
 msgstr ""
 
 #. Author of the plugin
-#: touchpoint-wp.php
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "James K"
 msgstr ""
 
 #. Author URI of the plugin
-#: touchpoint-wp.php
+#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
 msgid "https://github.com/jkrrv"
 msgstr ""
 
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:944
 msgid "Divisions to Import"
 msgstr ""
 
@@ -122,9 +122,10 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Rsvp.php:77
-#: assets/js/base-defer.js:188
-#: assets/js/base-defer.js:1123
+#: src/TouchPoint-WP/Meeting.php:537
+#: src/TouchPoint-WP/Rsvp.php:79
+#: assets/js/base-defer.js:192
+#: assets/js/base-defer.js:1133
 msgid "Loading..."
 msgstr ""
 
@@ -157,13 +158,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1464
+#: src/TouchPoint-WP/Involvement.php:1624
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1490
+#: src/TouchPoint-WP/Involvement.php:1650
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -241,9 +242,9 @@ msgstr ""
 msgid "The Campus"
 msgstr ""
 
-#: src/templates/meeting-archive.php:28
+#: src/templates/meeting-archive.php:27
 #: src/templates/parts/meeting-list-none.php:13
-#: src/TouchPoint-WP/Meeting.php:194
+#: src/TouchPoint-WP/Meeting.php:204
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
@@ -251,7 +252,7 @@ msgstr ""
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
 #: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1710
+#: src/TouchPoint-WP/Involvement.php:1870
 msgid "No %s Found."
 msgstr ""
 
@@ -263,7 +264,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3096
+#: src/TouchPoint-WP/Involvement.php:3266
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -273,18 +274,23 @@ msgstr ""
 msgid "Sign in with your %s account"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:401
+#: src/TouchPoint-WP/Auth.php:409
 msgid "Your login token expired."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:416
+#: src/TouchPoint-WP/Auth.php:424
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:428
+#: src/TouchPoint-WP/Auth.php:436
 msgid "Session could not be validated."
 msgstr ""
 
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
+#: src/TouchPoint-WP/CalendarGrid.php:141
+msgid "%s is cancelled."
+msgstr ""
+
 #: src/TouchPoint-WP/EventsCalendar.php:61
 msgid "Recurring"
 msgstr ""
@@ -293,254 +299,280 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:466
+#: src/TouchPoint-WP/Involvement.php:467
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:470
+#: src/TouchPoint-WP/Involvement.php:472
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:476
+#: src/TouchPoint-WP/Involvement.php:479
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:481
+#: src/TouchPoint-WP/Involvement.php:485
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:729
-#: src/TouchPoint-WP/Involvement.php:749
+#: src/TouchPoint-WP/Involvement.php:880
+#: src/TouchPoint-WP/Involvement.php:900
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:758
+#: src/TouchPoint-WP/Involvement.php:908
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:765
+#: src/TouchPoint-WP/Involvement.php:915
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:775
+#: src/TouchPoint-WP/Involvement.php:925
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:781
+#: src/TouchPoint-WP/Involvement.php:931
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:790
+#: src/TouchPoint-WP/Involvement.php:940
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:796
+#: src/TouchPoint-WP/Involvement.php:946
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1339
-#: src/TouchPoint-WP/Partner.php:769
+#: src/TouchPoint-WP/Involvement.php:1499
+#: src/TouchPoint-WP/Partner.php:787
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1396
+#: src/TouchPoint-WP/Involvement.php:1556
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1439
+#: src/TouchPoint-WP/Involvement.php:1599
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1512
+#: src/TouchPoint-WP/Involvement.php:1672
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1513
+#: src/TouchPoint-WP/Involvement.php:1673
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1514
+#: src/TouchPoint-WP/Involvement.php:1674
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1525
+#: src/TouchPoint-WP/Involvement.php:1685
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1547
-#: src/TouchPoint-WP/Partner.php:791
+#: src/TouchPoint-WP/Involvement.php:1707
+#: src/TouchPoint-WP/Partner.php:809
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1555
-#: src/TouchPoint-WP/Partner.php:807
+#: src/TouchPoint-WP/Involvement.php:1715
+#: src/TouchPoint-WP/Partner.php:825
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1558
-#: src/TouchPoint-WP/Partner.php:810
+#: src/TouchPoint-WP/Involvement.php:1718
+#: src/TouchPoint-WP/Partner.php:828
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1651
+#: src/TouchPoint-WP/Involvement.php:1811
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1661
+#: src/TouchPoint-WP/Involvement.php:1821
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1680
+#: src/TouchPoint-WP/Involvement.php:1840
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3069
+#: src/TouchPoint-WP/Involvement.php:3245
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3072
+#: src/TouchPoint-WP/Involvement.php:3248
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3147
+#: src/TouchPoint-WP/Involvement.php:3319
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3155
+#: src/TouchPoint-WP/Involvement.php:3326
+#: src/TouchPoint-WP/Involvement.php:3364
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3160
+#: src/TouchPoint-WP/Involvement.php:3331
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3164
+#: src/TouchPoint-WP/Involvement.php:3335
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3169
+#: src/TouchPoint-WP/Involvement.php:3340
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3172
+#: src/TouchPoint-WP/Involvement.php:3343
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3175
+#: src/TouchPoint-WP/Involvement.php:3346
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3178
+#: src/TouchPoint-WP/Involvement.php:3349
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3185
-#: assets/js/base-defer.js:991
+#: src/TouchPoint-WP/Involvement.php:3358
+#: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3194
-#: src/TouchPoint-WP/Partner.php:1247
+#: src/TouchPoint-WP/Involvement.php:3376
+#: src/TouchPoint-WP/Partner.php:1283
 msgid "Show on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3246
-#: src/TouchPoint-WP/Involvement.php:3323
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Involvement.php:3388
+msgid "Involvement in %s"
+msgstr ""
+
+#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3560
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3300
-#: src/TouchPoint-WP/Person.php:1752
+#: src/TouchPoint-WP/Involvement.php:3537
+#: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3310
-#: src/TouchPoint-WP/Person.php:1735
+#: src/TouchPoint-WP/Involvement.php:3547
+#: src/TouchPoint-WP/Person.php:1798
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:195
+#: src/TouchPoint-WP/Meeting.php:205
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:331
-#: src/TouchPoint-WP/TouchPointWP.php:945
+#: src/TouchPoint-WP/Meeting.php:277
+msgid "In the Past"
+msgstr ""
+
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Meeting.php:330
+msgid "Meeting in %s"
+msgstr ""
+
+#: src/TouchPoint-WP/Meeting.php:385
+msgid "Cancelled"
+msgstr ""
+
+#: src/TouchPoint-WP/Meeting.php:386
+msgid "Scheduled"
+msgstr ""
+
+#: src/TouchPoint-WP/Meeting.php:387
+msgctxt "Event Status is not a recognized value."
+msgid "Unknown"
+msgstr ""
+
+#: src/TouchPoint-WP/Meeting.php:469
+#: src/TouchPoint-WP/TouchPointWP.php:973
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:359
+#: src/TouchPoint-WP/Meeting.php:497
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:369
+#: src/TouchPoint-WP/Meeting.php:507
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/meetingT.php:46
-msgid "Tonight"
-msgstr ""
-
-#: src/TouchPoint-WP/meetingT.php:48
-msgid "Today"
-msgstr ""
-
-#: src/TouchPoint-WP/meetingT.php:55
-msgid "Tomorrow"
+#: src/TouchPoint-WP/Meeting.php:536
+#: src/TouchPoint-WP/Rsvp.php:84
+msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:798
+#: src/TouchPoint-WP/Partner.php:816
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1204
+#: src/TouchPoint-WP/Partner.php:1224
 msgid "Not Shown on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:149
+#: src/TouchPoint-WP/Person.php:150
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:641
+#: src/TouchPoint-WP/Person.php:642
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1187
+#: src/TouchPoint-WP/Person.php:1188
 msgid "Contact"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1398
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Person.php:1196
+msgid "Person in %s"
+msgstr ""
+
+#: src/TouchPoint-WP/Person.php:1442
 #: src/TouchPoint-WP/Utilities.php:251
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1404
+#: src/TouchPoint-WP/Person.php:1448
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1541
+#: src/TouchPoint-WP/Person.php:1585
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1609
+#: src/TouchPoint-WP/Person.php:1653
 msgid "You may need to sign in."
 msgstr ""
 
@@ -553,14 +585,10 @@ msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:304
+#: src/TouchPoint-WP/Report.php:311
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Rsvp.php:82
-msgid "RSVP"
-msgstr ""
-
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:51
 msgid "Search %s"
@@ -656,623 +684,659 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1900
+#: src/TouchPoint-WP/TouchPointWP.php:1928
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1957
+#: src/TouchPoint-WP/TouchPointWP.php:1985
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1960
+#: src/TouchPoint-WP/TouchPointWP.php:1988
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1963
+#: src/TouchPoint-WP/TouchPointWP.php:1991
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1968
-#: src/TouchPoint-WP/TouchPointWP.php:1969
+#: src/TouchPoint-WP/TouchPointWP.php:1996
+#: src/TouchPoint-WP/TouchPointWP.php:1997
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2097
-#: src/TouchPoint-WP/TouchPointWP.php:2137
+#: src/TouchPoint-WP/TouchPointWP.php:2125
+#: src/TouchPoint-WP/TouchPointWP.php:2170
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2105
-#: src/TouchPoint-WP/TouchPointWP.php:2144
+#: src/TouchPoint-WP/TouchPointWP.php:2133
+#: src/TouchPoint-WP/TouchPointWP.php:2177
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2205
+#: src/TouchPoint-WP/TouchPointWP.php:2238
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2264
+#: src/TouchPoint-WP/TouchPointWP.php:2297
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:252
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:254
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:253
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:269
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:271
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:270
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:277
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:279
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:278
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:288
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:290
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:289
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:299
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:301
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:300
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:310
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:312
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:311
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:321
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:323
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:322
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:332
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:334
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:333
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:343
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:345
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:344
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:356
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:358
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:357
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:368
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:370
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:369
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:380
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:382
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:381
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:393
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:395
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:394
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:405
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:407
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:406
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:417
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:419
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:418
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:436
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:438
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:440
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:457
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:459
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:458
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:462
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:474
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:476
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:475
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:487
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:496
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:734
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:498
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:736
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:497
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:515
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:518
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:519
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:528
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:530
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:529
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:538
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:539
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:548
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:550
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:549
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:570
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:572
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:571
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:578
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:606
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:608
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:607
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:611
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:612
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:622
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:624
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:623
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:644
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:646
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:645
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:655
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:657
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:656
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:668
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:670
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:669
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:679
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:681
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:680
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:690
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:692
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:691
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:701
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:703
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:702
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:712
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:714
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:713
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:723
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:725
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:724
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:735
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:746
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:748
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:747
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:765
 msgid "Events Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:764
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:766
 msgid "Integrate with The Events Calendar from ModernTribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:768
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:788
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:790
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:789
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+msgid "Meeting Name (Plural)"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+msgid "What you call Meetings at your church"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+msgid "Meetings"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+msgid "Events"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+msgid "Meeting Name (Singular)"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+msgid "What you call a Meeting at your church"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+msgid "Meeting"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+msgid "Event"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:819
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:884
 msgid "Meeting Deletion Handling"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:891
 msgid "Always delete from WordPress"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
 msgid "Mark the occurrence as cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:902
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:877
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:903
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1087
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:946
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:972
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:970
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1016
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1017
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1002
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1003
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1046
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1024
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1036
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1048
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1075
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1088
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1220
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1251
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1276
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1277
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1310
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1311
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1308
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1540
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1574
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1662
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1696
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1713
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1747
 msgid "Save Settings"
 msgstr ""
 
@@ -1381,165 +1445,225 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: assets/js/base-defer.js:208
-#: assets/js/base-defer.js:1158
+#: src/TouchPoint-WP/Utilities.php:428
+msgid "Expand"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:51
+msgid "Tonight"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:53
+msgid "Today"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:59
+msgid "Tomorrow"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:66
+msgctxt "Date string for day of the week, when the year is current."
+msgid "l"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:67
+msgctxt "Date string when the year is current."
+msgid "F j"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:69
+msgctxt "Date string for day of the week, when the year is not current."
+msgid "l"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:70
+msgctxt "Date string when the year is not current."
+msgid "F j, Y"
+msgstr ""
+
+#. translators: %1s is "Monday".  %2s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:76
+msgctxt "Date format string"
+msgid "Last %1$s, %2$s"
+msgstr ""
+
+#. translators: %1s is "Monday".  %2s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:82
+msgctxt "Date format string"
+msgid "This %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+msgctxt "Date format string"
+msgid "Next %1$s, %2$s"
+msgstr ""
+
+#. translators: %1s is "Monday".  %2s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:93
+msgctxt "Date format string"
+msgid "%1$s, %2$s"
+msgstr ""
+
+#: assets/js/base-defer.js:212
+#: assets/js/base-defer.js:1168
 msgid "Your Location"
 msgstr ""
 
-#: assets/js/base-defer.js:229
+#: assets/js/base-defer.js:233
 msgid "User denied the request for Geolocation."
 msgstr ""
 
-#: assets/js/base-defer.js:233
+#: assets/js/base-defer.js:237
 msgid "Location information is unavailable."
 msgstr ""
 
-#: assets/js/base-defer.js:237
+#: assets/js/base-defer.js:241
 msgid "The request to get user location timed out."
 msgstr ""
 
-#: assets/js/base-defer.js:241
+#: assets/js/base-defer.js:245
 msgid "An unknown error occurred."
 msgstr ""
 
-#: assets/js/base-defer.js:277
-#: assets/js/base-defer.js:287
+#: assets/js/base-defer.js:281
+#: assets/js/base-defer.js:291
 msgid "No geolocation option available."
 msgstr ""
 
 #. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:910
+#: assets/js/base-defer.js:920
 msgid "Added to %s"
 msgstr ""
 
-#: assets/js/base-defer.js:913
-#: assets/js/base-defer.js:924
-#: assets/js/base-defer.js:950
-#: assets/js/base-defer.js:961
-#: assets/js/base-defer.js:1407
-#: assets/js/base-defer.js:1418
-#: assets/js/meeting-defer.js:175
-#: assets/js/meeting-defer.js:186
+#: assets/js/base-defer.js:923
+#: assets/js/base-defer.js:934
+#: assets/js/base-defer.js:960
+#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:1417
+#: assets/js/base-defer.js:1428
+#: assets/js/meeting-defer.js:174
+#: assets/js/meeting-defer.js:185
 msgid "OK"
 msgstr ""
 
-#: assets/js/base-defer.js:921
-#: assets/js/base-defer.js:958
-#: assets/js/base-defer.js:1415
-#: assets/js/meeting-defer.js:183
+#: assets/js/base-defer.js:931
+#: assets/js/base-defer.js:968
+#: assets/js/base-defer.js:1425
+#: assets/js/meeting-defer.js:182
 msgid "Something strange happened."
 msgstr ""
 
-#: assets/js/base-defer.js:947
-#: assets/js/base-defer.js:1404
+#: assets/js/base-defer.js:957
+#: assets/js/base-defer.js:1414
 msgid "Your message has been sent."
 msgstr ""
 
 #. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:981
 msgid "Join %s"
 msgstr ""
 
-#: assets/js/base-defer.js:987
+#: assets/js/base-defer.js:997
 msgid "Who is joining the group?"
 msgstr ""
 
-#: assets/js/base-defer.js:992
-#: assets/js/base-defer.js:1050
-#: assets/js/base-defer.js:1366
-#: assets/js/base-defer.js:1459
-#: assets/js/meeting-defer.js:225
+#: assets/js/base-defer.js:1002
+#: assets/js/base-defer.js:1060
+#: assets/js/base-defer.js:1376
+#: assets/js/base-defer.js:1469
+#: assets/js/meeting-defer.js:224
 msgid "Cancel"
 msgstr ""
 
-#: assets/js/base-defer.js:1005
+#: assets/js/base-defer.js:1015
 msgid "Select who should be added to the group."
 msgstr ""
 
 #. translators: %s is the name of an involvement.  This is a heading for a modal.
-#: assets/js/base-defer.js:1026
+#: assets/js/base-defer.js:1036
 msgid "Contact the Leaders of %s"
 msgstr ""
 
-#: assets/js/base-defer.js:1043
-#: assets/js/base-defer.js:1359
+#: assets/js/base-defer.js:1053
+#: assets/js/base-defer.js:1369
 msgid "From"
 msgstr ""
 
-#: assets/js/base-defer.js:1044
-#: assets/js/base-defer.js:1360
+#: assets/js/base-defer.js:1054
+#: assets/js/base-defer.js:1370
 msgid "Message"
 msgstr ""
 
-#: assets/js/base-defer.js:1049
-#: assets/js/base-defer.js:1365
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1375
 msgid "Send"
 msgstr ""
 
-#: assets/js/base-defer.js:1059
-#: assets/js/base-defer.js:1375
+#: assets/js/base-defer.js:1069
+#: assets/js/base-defer.js:1385
 msgid "Please provide a message."
 msgstr ""
 
-#: assets/js/base-defer.js:1144
-#: assets/js/base-defer.js:1146
+#: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:1156
 msgid "We don't know where you are."
 msgstr ""
 
-#: assets/js/base-defer.js:1144
 #: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:1164
 msgid "Click here to use your actual location."
 msgstr ""
 
-#: assets/js/base-defer.js:1305
-#: assets/js/base-defer.js:1322
+#: assets/js/base-defer.js:1315
+#: assets/js/base-defer.js:1332
 msgid "clear"
 msgstr ""
 
-#: assets/js/base-defer.js:1311
+#: assets/js/base-defer.js:1321
 msgid "Other Relatives..."
 msgstr ""
 
 #. translators: %s is a person's name.  This is a heading for a contact modal.
-#: assets/js/base-defer.js:1342
+#: assets/js/base-defer.js:1352
 msgid "Contact %s"
 msgstr ""
 
-#: assets/js/base-defer.js:1449
+#: assets/js/base-defer.js:1459
 msgid "Tell us about yourself."
 msgstr ""
 
-#: assets/js/base-defer.js:1451
-#: assets/js/base-defer.js:1506
+#: assets/js/base-defer.js:1461
+#: assets/js/base-defer.js:1516
 msgid "Email Address"
 msgstr ""
 
-#: assets/js/base-defer.js:1452
-#: assets/js/base-defer.js:1507
+#: assets/js/base-defer.js:1462
+#: assets/js/base-defer.js:1517
 msgid "Zip Code"
 msgstr ""
 
-#: assets/js/base-defer.js:1458
+#: assets/js/base-defer.js:1468
 msgid "Next"
 msgstr ""
 
-#: assets/js/base-defer.js:1492
+#: assets/js/base-defer.js:1502
 msgid "Something went wrong."
 msgstr ""
 
-#: assets/js/base-defer.js:1504
+#: assets/js/base-defer.js:1514
 msgid "Our system doesn't recognize you,<br />so we need a little more info."
 msgstr ""
 
-#: assets/js/base-defer.js:1508
+#: assets/js/base-defer.js:1518
 msgid "First Name"
 msgstr ""
 
-#: assets/js/base-defer.js:1509
+#: assets/js/base-defer.js:1519
 msgid "Last Name"
 msgstr ""
 
-#: assets/js/base-defer.js:1511
+#: assets/js/base-defer.js:1521
 msgid "Phone"
 msgstr ""
 
@@ -1547,49 +1671,49 @@ msgstr ""
 msgid "Event Past"
 msgstr ""
 
-#: assets/js/meeting-defer.js:172
+#: assets/js/meeting-defer.js:171
 msgid "Response Recorded"
 msgid_plural "Responses Recorded"
 msgstr[0] ""
 msgstr[1] ""
 
 #. translators: "RSVP for {Event Name}"  This is the heading on the RSVP modal.  The event name isn't translated because it comes from TouchPoint.
-#: assets/js/meeting-defer.js:205
+#: assets/js/meeting-defer.js:204
 msgid "RSVP for %s"
 msgstr ""
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "Who is coming?"
 msgstr ""
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "Indicate who is or is not coming.  This will overwrite any existing RSVP."
 msgstr ""
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "To avoid overwriting an existing RSVP, leave that person blank."
 msgstr ""
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "To protect privacy, we won't show existing RSVPs here."
 msgstr ""
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "Yes"
 msgstr ""
 
-#: assets/js/meeting-defer.js:217
+#: assets/js/meeting-defer.js:216
 msgid "No"
 msgstr ""
 
-#: assets/js/meeting-defer.js:223
+#: assets/js/meeting-defer.js:222
 msgid "Add Someone Else"
 msgstr ""
 
-#: assets/js/meeting-defer.js:224
+#: assets/js/meeting-defer.js:223
 msgid "Submit"
 msgstr ""
 
-#: assets/js/meeting-defer.js:243
+#: assets/js/meeting-defer.js:242
 msgid "Nothing to submit."
 msgstr ""
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 53ddd5e2..04346a0c 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -66,7 +66,7 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 					$day = date_i18n(_x('l', "Date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
 					$date = date_i18n(_x('F j', "Date string when the year is current.", "TouchPoint-WP"), $ts);
 				} else {
-					$day = date_i18n(_x('l', "Date string for day of the week, when te year is not current.", "TouchPoint-WP"), $ts);
+					$day = date_i18n(_x('l', "Date string for day of the week, when the year is not current.", "TouchPoint-WP"), $ts);
 					$date = date_i18n(_x('F j, Y', "Date string when the year is not current.", "TouchPoint-WP"), $ts);
 				}
 

From 14ab69cec1413bce4d56f94caf47e130c505272e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 09:41:39 -0400
Subject: [PATCH 087/423] Settings updates and filter docs

---
 src/TouchPoint-WP/TouchPointWP_Settings.php | 45 ++++++++++++++++-----
 src/TouchPoint-WP/Utilities.php             | 26 ++++++++++--
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 56f29569..8161307c 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -68,6 +68,8 @@
  *
  * @property-read string       ec_use_standardizing_style Whether to insert the standardizing stylesheet into mobile app requests.
  *
+ * @property-read string       mc_name_plural     What Meetings should be called, plural (e.g. "Events" or "Meetings")
+ * @property-read string       mc_name_singular   What a Meeting code should be called, singular (e.g. "Event" or "Meeting")
  * @property-read string       mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
  * @property-read int          mc_future_days     Number of days into the future to import.
  * @property-read int          mc_archive_days    Number of days to wait to move something to history.
@@ -127,13 +129,7 @@ public function __construct(TouchPointWP $parent)
 		add_action('admin_menu', [$this, 'addMenuItems']);
 
 		// Add settings link to plugins page.
-		add_filter(
-			'plugin_action_links_' . plugin_basename($this->parent->file),
-			[
-				$this,
-				'add_settings_link',
-			]
-		);
+		add_filter('plugin_action_links_' . plugin_basename($this->parent->file), [$this, 'addSettingsLink']);
 
 		// Configure placement of plugin settings page. See readme for implementation.
 		add_filter(TouchPointWP::SETTINGS_PREFIX . 'menu_settings', [$this, 'configureSettings']);
@@ -583,7 +579,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 						'default'     => '[]',
 						'autoload'    => true,
 						'hidden'      => true,
-						'description' => ! $includeThis ? "" : function () {
+						'description' => !$includeThis ? "" : function () {
 							TouchPointWP::requireScript("base");
 							TouchPointWP::requireScript("knockout-defer");
 							TouchPointWP::requireScript("select2-defer");
@@ -807,6 +803,30 @@ private function settingsFields(bool|string $includeDetail = false): array
 				'title'       => __('Meeting Calendars', 'TouchPoint-WP'),
 				'description' => __('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
 				'fields'      => [
+					[
+						'id'          => 'mc_name_plural',
+						'label'       => __('Meeting Name (Plural)', 'TouchPoint-WP'),
+						'description' => __(
+							'What you call Meetings at your church',
+							'TouchPoint-WP'
+						),
+						'type'        => 'text',
+						'default'     => $tribe ? __('Meetings', 'TouchPoint-WP') : __('Events', 'TouchPoint-WP'),
+						'autoload'    => true,
+						'placeholder' => $tribe ? __('Meetings', 'TouchPoint-WP') : __('Events', 'TouchPoint-WP'),
+					],
+					[
+						'id'          => 'mc_name_singular',
+						'label'       => __('Meeting Name (Singular)', 'TouchPoint-WP'),
+						'description' => __(
+							'What you call a Meeting at your church',
+							'TouchPoint-WP'
+						),
+						'type'        => 'text',
+						'default'     => $tribe ? __('Meeting', 'TouchPoint-WP') : __('Event', 'TouchPoint-WP'),
+						'autoload'    => true,
+						'placeholder' => $tribe ? __('Meeting', 'TouchPoint-WP') : __('Event', 'TouchPoint-WP'),
+					],
 					[
 						'id'          => 'mc_slug',
 						'label'       => __('Meetings Slug', 'TouchPoint-WP'),
@@ -1203,7 +1223,12 @@ private function settingsFields(bool|string $includeDetail = false): array
 				),
 			); */
 
-		$this->settings = apply_filters($this->parent::TOKEN . '_settings_fields', $this->settings);
+		/**
+		 * Adjust the settings array before it's returned.
+		 *
+		 * @since 0.0.90
+		 */
+		$this->settings = apply_filters('tp_settings_fields', $this->settings);
 
 		return $this->settings;
 	}
@@ -1312,7 +1337,7 @@ public function configureSettings(?array $settings = []): array
 	 *
 	 * @return array        Modified links.
 	 */
-	public function add_settings_link(array $links): array
+	public function addSettingsLink(array $links): array
 	{
 		$settings_link = '<a href="options-general.php?page=' . $this->parent::TOKEN . '_Settings">' . __(
 				'Settings',
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 4fe4fc27..27943d5f 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -569,8 +569,18 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 			$html = "";
 		}
 
-		// The tp_standardize_html filter would completely replace the pre-defined process.
-		$o = apply_filters(TouchPointWP::HOOK_PREFIX . 'standardize_html', $html, $context);
+		/**
+		 * Allows for the standardization of HTML content, typically during the import from TouchPoint.  If this
+		 * filter is used, the default filtering will be bypassed. Use other filters for more precise control.
+		 *
+		 * @since 0.0.34
+		 *
+		 * @param string $html The HTML to be standardized.
+		 * @param string $context A context string to pass to hooks.
+		 *
+		 * @return string The standardized HTML.
+		 */
+		$o = apply_filters('tp_standardize_html', $html, $context);
 		if ($o !== $html) {
 			return $o;
 		}
@@ -622,7 +632,17 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		$html = strip_tags($html, $allowedTags);
 		$html = trim($html);
 
-		return apply_filters(TouchPointWP::HOOK_PREFIX . 'post_standardize_html', $html, $context);
+		/**
+		 * Make any adjustments to HTML content after the rest of the standardization process happens.
+		 *
+		 * @since 0.0.25
+		 *
+		 * @param string $html The HTML to be standardized.
+		 * @param string $context A context string to pass to hooks.
+		 *
+		 * @return string The standardized HTML.
+		 */
+		return apply_filters('tp_post_standardize_html', $html, $context);
 	}
 
 	/**

From 7bc27736cea33aad44097a2e66b39286f4049a38 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 10:14:27 -0400
Subject: [PATCH 088/423] Adding filters for custom categorization colors.

---
 src/TouchPoint-WP/Utilities.php | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 27943d5f..2102f431 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -318,7 +318,20 @@ public static function getPostContentWithShortcode($shortcode): array
 	 */
 	public static function getColorFor(string $itemName, string $setName): string
 	{
-		// TODO add hook for custom color algorithm.
+		/**
+		 * Allows for a custom color function to assign a color for a given value.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @param mixed $current The current value.  Null is provided to the function because the color hasn't otherwise been determined yet.
+		 * @param string $itemName The name of the current item.
+		 * @param string $setName The name of the set to which the item belongs.
+		 *
+		 * @return string|null The color in hex, starting with '#'.  Null to defer to the default color assignment.
+		 */
+		$r = apply_filters('tp_custom_color_function', null, $itemName, $setName);
+		if ($r !== null)
+			return $r;
 
 		// If the set is new...
 		if ( ! isset(self::$colorAssignments[$setName])) {
@@ -334,6 +347,23 @@ public static function getColorFor(string $itemName, string $setName): string
 			self::$colorAssignments[$setName][] = $itemName;
 		}
 
+		/**
+		 * Allows for a custom color set to be used for color assignment to match branding. This filter should return an
+		 * array of colors in hex format, starting with '#'.  The colors will be assigned in order, but it is not
+		 * deterministic which color will be assigned to which item.  If it needs to be, use the `tp_custom_color_function`
+		 * filter instead.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @param string[] $array The array of colors in hex format, starting with '#'.
+		 * @param string $setName The name of the set for which the colors are needed.
+		 */
+		$colorSet = apply_filters('tp_custom_color_set', [], $setName);
+
+		if (count($colorSet) > 0) {
+			return $colorSet[$idx % count($colorSet)];
+		}
+
 		// Calc color! (This method generates 24 colors and then repeats. (8 hues * 3 lums)
 		$h = ($idx * 135) % 360;
 		$l = ((($idx >> 3) + 1) * 25) % 75 + 25;

From f49c0ffe7b79939f78295f5341481152ad62bb6d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 10:27:26 -0400
Subject: [PATCH 089/423] Calendar grid styling updates

---
 assets/template/calendar-style.css | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/assets/template/calendar-style.css b/assets/template/calendar-style.css
index 384c83a4..b1a1be28 100644
--- a/assets/template/calendar-style.css
+++ b/assets/template/calendar-style.css
@@ -5,8 +5,12 @@ div.calGrid {
 }
 
 div.calGrid,
+div.calGrid > div.calWeekdayHead,
 div.calGrid > div.calDay {
     border: 1px solid black;
+}
+
+div.calGrid > div.calDay {
     min-height: 5em;
 }
 
@@ -19,16 +23,21 @@ div.calGrid div.calDay > * {
 }
 
 div.calGrid div.calDay > a.event.feat {
-    background: #ff0;
+    font-weight: bold;
+    font-size: 1.2em;
+    padding-bottom: .5em;
 }
 
 div.calGrid div.calDay > a.event.cancelled {
-    color: red;
+    color: #f446;
     text-decoration: line-through;
 }
 
-div.calGrid div.calDay > a {
-    padding: .2em;
+div.calGrid div.calDay > a,
+div.calGrid div.calWeekdayHead,
+div.calGrid div.calDay > h3.calDayHead,
+div.calGrid div.calDay > span.calDayNum {
+    padding: .2em 5px;
 }
 
 div.calGrid div.calDay.before,
@@ -37,7 +46,7 @@ div.calGrid div.calDay.after {
     background: #0001;
 }
 
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 800px) {
     div.calGrid {
         display: grid;
         grid-template-columns: unset;
@@ -47,6 +56,7 @@ div.calGrid div.calDay.after {
     div.calGrid > div.calDay {
         border: unset;
         min-height: unset;
+        margin-bottom: 1em;
     }
 
     div.calGrid div.calWeekdayHead,
@@ -63,4 +73,10 @@ div.calGrid div.calDay.after {
     div.calGrid div.calDay > h3.calDayHead {
         display:block;
     }
+}
+
+div.calGridNav {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
\ No newline at end of file

From 1b9a8fc2f1b34e5a3f6937d13bbde25131677e3b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 11:32:22 -0400
Subject: [PATCH 090/423] reworking documentation automation

---
 .idea/runConfigurations/Build__WSL_.xml |  2 +-
 docs                                    |  2 +-
 generateDocs.php                        | 63 +++++++++++++++++++++++++
 generateDocs.ps1                        | 23 ---------
 phpdoc.dist.xml                         | 13 +++--
 5 files changed, 75 insertions(+), 28 deletions(-)
 create mode 100644 generateDocs.php
 delete mode 100644 generateDocs.ps1

diff --git a/.idea/runConfigurations/Build__WSL_.xml b/.idea/runConfigurations/Build__WSL_.xml
index d2225246..33c3c8ff 100644
--- a/.idea/runConfigurations/Build__WSL_.xml
+++ b/.idea/runConfigurations/Build__WSL_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build (WSL)" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="wsl -e ./build.sh" />
+    <option name="SCRIPT_TEXT" value="./build.sh" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/docs b/docs
index 1543ab4b..571cbb43 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 1543ab4b99a528bf289e0759978f0db70054b70b
+Subproject commit 571cbb436f639c41cbd8af45aab0ce9048ec1e27
diff --git a/generateDocs.php b/generateDocs.php
new file mode 100644
index 00000000..9abc2bbb
--- /dev/null
+++ b/generateDocs.php
@@ -0,0 +1,63 @@
+<?php
+
+const PHPDOC_PHAR_URL = "https://phpdoc.org/phpDocumentor.phar";
+const PHPDOC_PHAR_FILENAME = "phpdoc.phar";
+
+if (!file_exists(PHPDOC_PHAR_FILENAME) || (time() - filemtime(PHPDOC_PHAR_FILENAME) > 86400)) {
+	echo "Downloading updated PHPDoc PHAR...";
+	file_put_contents(PHPDOC_PHAR_FILENAME, fopen(PHPDOC_PHAR_URL, 'r'));
+	echo "    Complete.\n\n";
+}
+
+
+echo "Removing previous WP docs...";
+array_map('unlink', glob('docs/wp-*.md'));
+echo "    Complete.\n\n";
+
+
+echo "Indexing WordPress Hooks...";
+exec("php ./vendor/bin/wp-documentor parse --output=docs/wp-Api.md --prefix=tp_ --format=markdown ./src/TouchPoint-WP/");
+echo "    Complete\n\n";
+
+
+echo "Removing previous documentation files...";
+array_map('unlink', glob('docs/tp-*.md'));
+echo "    Complete.\n\n";
+
+
+echo "Running PHPDoc Analysis...";
+exec("php " . PHPDOC_PHAR_FILENAME . " run -d src -t docs --template=\"xml\"");
+echo "    Complete\n\n";
+
+
+echo "Creating Markdown files...";
+$argv[1] = "docs/structure.xml";
+$argv[2] = "docs/";
+$argv[3] = "--lt";
+$argv[4] = "%c";
+$argv[5] = "--index";
+$argv[6] = "_Sidebar.md";
+include "vendor/skayo/phpdoc-md/bin/phpdocmd";
+echo "    Complete.\n\n";
+
+
+echo "Removing xml files...";
+array_map('unlink', glob('docs/*.xml'));
+echo "    Complete.\n\n";
+
+
+echo "Merging sidebar files...";
+$sidebar = file_get_contents("docs/_Sidebar_prepend.md");
+$sidebar .= file_get_contents("docs/_Sidebar.md");
+file_put_contents("docs/_Sidebar.md", $sidebar);
+echo "    Complete.\n\n";
+
+
+echo "Generating Footer...";
+$footer = "Documentation generated " . date("F j, Y  g:ia.");
+file_put_contents("docs/_Footer.md", $footer);
+echo "    Complete.\n\n";
+
+echo "Committing and pushing to Repository...";
+echo exec("cd " . __DIR__ . "/docs && git add *.md && git commit -m \"Auto-Updated Documentation\" && git push");
+echo "    Complete.\n\n";
\ No newline at end of file
diff --git a/generateDocs.ps1 b/generateDocs.ps1
deleted file mode 100644
index 2af32319..00000000
--- a/generateDocs.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-$pharFile = "phpDocumentor.phar"
-$compareDt = (Get-Date).AddDays(-1)
-
-if (!(test-path $pharFile -newerThan $compareDt))
-{
-    Write-Output "Downloading phpDocumentor as it was not found or is more than a day old..."
-    Invoke-WebRequest https://www.phpdoc.org/phpDocumentor.phar -OutFile $pharFile
-}
-
-.\vendor\bin\wp-documentor parse --output=docs/wpApi/actions.rst --prefix=tp_ --type=actions --format=phpdocumentor-rst .\src\TouchPoint-WP\
-.\vendor\bin\wp-documentor parse --output=docs/wpApi/filters.rst --prefix=tp_ --type=filters --format=phpdocumentor-rst .\src\TouchPoint-WP\
-
-if (Test-Path .\docs\wpApi\index.rst)
-{
-    Remove-Item .\docs\wpApi\index.rst
-}
-New-Item .\docs\wpApi\index.rst -type File
-Get-Content .\docs\wpApi\filters.rst, .\docs\wpApi\actions.rst | Out-File .\docs\wpApi\index.rst
-
-php phpDocumentor.phar --template=responsive
-
-#.\vendor\bin\phpdocmd docs/phpApi/structure.xml docs/api --lt %c --index _Sidebar.md
-
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 28923d91..2cb1ef44 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpdocumentor
         configVersion="3"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://www.phpdoc.org"
 >
+    <title>TouchPoint WP</title>
     <paths>
         <output>docs/phpApi</output>
         <cache>.phpdoc/cache</cache>
     </paths>
-    <version number="3.0.0">
+    <version number="0.0.90">
         <api>
             <source dsn=".">
                 <path>src/TouchPoint-WP</path>
@@ -17,10 +17,17 @@
                 <extension>php</extension>
             </extensions>
             <visibility>public</visibility>
-            <include-source>false</include-source>
+            <include-source>true</include-source>
             <markers>
                 <marker>TODO</marker>
             </markers>
+<!--            <default-package-name>TouchPointWP</default-package-name>-->
         </api>
+        <guide>
+            <source>
+                <path>docs/wpApi</path>
+            </source>
+        </guide>
     </version>
+<!--    <setting name="guides.enabled" value="true"/>-->
 </phpdocumentor>
\ No newline at end of file

From 4698bfa56e7f8d42ec6f46008ce06627a336d3a3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 11:38:09 -0400
Subject: [PATCH 091/423] More efficient query for meetings

---
 src/python/WebApi.py | 51 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 3e26721b..6b78d064 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -213,11 +213,41 @@ def get_person_info_for_sync(person_obj):
 
     # noinspection SqlResolve,SqlUnusedCte,SqlRedundantOrderingDirection
     invSql = (('''
-        WITH cteTargetOrgs as
+        -- Get all orgs that have meetings
+        WITH cteMeetingsQ as
+        (
+        SELECT MIN(m.OrganizationId) org1,
+            MIN(o2.OrganizationId) org2,
+            MIN(o3.OrganizationId) org3,
+            MIN(o3.ParentOrgId) org4
+            FROM Meetings m
+                JOIN Organizations o ON m.OrganizationId = o.OrganizationId
+                LEFT JOIN Organizations o2 ON o.ParentOrgId = o2.OrganizationId
+                LEFT JOIN Organizations o3 ON o2.ParentOrgId = o3.OrganizationId
+            WHERE m.OrganizationId = o.OrganizationId
+                AND o.ShowInSites = {2}
+                AND m.MeetingDate > DATEADD(day, {3}, GETDATE())
+                AND m.MeetingDate < DATEADD(day, {4}, GETDATE())
+            GROUP BY m.OrganizationId, o2.OrganizationId, o3.OrganizationId, o3.ParentOrgId
+        ),
+        -- merge all meeting orgs into one list
+        cteMeetingL as 
+        (
+        SELECT org1 oid, 0 as isParent FROM cteMeetingsQ
+        UNION 
+        SELECT org2 oid, 1 as isParent FROM cteMeetingsQ
+        UNION
+        SELECT org3 oid, 1 as isParent FROM cteMeetingsQ
+        UNION
+        SELECT org4 oid, 1 as isParent FROM cteMeetingsQ
+        ),
+        -- select all target organizations
+        cteTargetOrgs as
         (
         SELECT 
                 o.OrganizationId,
                 o.ParentOrgId as parentInvId,
+                COALESCE(ml.isParent, 0) as isParent, -- indicates this is the parent (or grandparent) of an inv w/ mtgs
                 o.LeaderMemberTypeId,
                 o.Location,
                 o.OrganizationName AS name,
@@ -228,6 +258,7 @@ def get_person_info_for_sync(person_obj):
                 o.Description,
                 o.RegistrationClosed AS closed,
                 o.NotWeekly,
+                o.RedirectUrl as redirectUrl,
                 o.RegistrationTypeId AS regTypeId,
                 o.OrgPickList,
                 o.MainLeaderId,
@@ -243,6 +274,7 @@ def get_person_info_for_sync(person_obj):
                 FORMAT(o.FirstMeetingDate, 'yyyy-MM-ddTHH:mm:ss') AS firstMeeting,
                 FORMAT(o.LastMeetingDate, 'yyyy-MM-ddTHH:mm:ss') AS lastMeeting
         FROM dbo.Organizations o
+            LEFT JOIN cteMeetingL ml ON o.OrganizationId = ml.oid
             WHERE ( o.OrganizationId = (
                         SELECT MIN(OrgId) min
                         FROM dbo.DivOrg do
@@ -252,14 +284,7 @@ def get_person_info_for_sync(person_obj):
                     AND o.organizationStatusId = 30 
                 )
             OR ( o.ShowInSites = {2} 
-                AND o.OrganizationId = (
-                        SELECT MIN(m.OrganizationId) org
-                        FROM Meetings m
-                        WHERE m.OrganizationId = o.OrganizationId
-                            AND m.MeetingDate > DATEADD(day, {3}, GETDATE())
-                            AND m.MeetingDate < DATEADD(day, {4}, GETDATE())
-                        GROUP BY m.OrganizationId
-                    )
+                AND ml.oid IS NOT NULL -- means it has meetings, or it has children that have meetings. 
                 AND o.OrganizationId NOT IN (
                         SELECT DISTINCT do.OrgId
                         FROM dbo.DivOrg do
@@ -354,7 +379,7 @@ def get_person_info_for_sync(person_obj):
         cteOrganizationLocation AS
             (
                 SELECT 
-                    o.[OrganizationId]            
+                    o.[OrganizationId]
                     , COALESCE(oai.[Latitude], paih.[Latitude], faih.[Latitude])           AS [lat]
                     , COALESCE(oai.[Longitude], paih.[Longitude], faih.[Longitude])        AS [lng]
                     , COALESCE(orc.[Description], prch.[Description], frch.[Description])  AS [resCodeName]
@@ -385,6 +410,7 @@ def get_person_info_for_sync(person_obj):
         SELECT 
             o.[OrganizationId]               AS [involvementId]
             , o.[parentInvId]                AS [parentInvId]
+            , o.[isParent]                   AS [isParent]
             , o.[LeaderMemberTypeId]         AS [leaderMemberTypeId]
             , o.[Location]                   AS [location]
             , o.[name]                       AS [name]
@@ -396,13 +422,14 @@ def get_person_info_for_sync(person_obj):
             , o.[Description]                AS [description]
             , o.[closed]                     AS [closed]
             , o.[NotWeekly]                  AS [notWeekly]
+            , o.[redirectUrl]                AS [redirectUrl]
             , o.[regTypeId]                  AS [regTypeId]
             , o.[OrgPickList]                AS [orgPickList]
             , o.[MainLeaderId]               AS [mainLeaderId]
             , o.[ImageUrl]                   AS [imageUrl]
             , o.[BadgeUrl]                   AS [badgeUrl]
-            , o.[RegistrationMobileId]       AS [registrationMobileId]
-            , o.[ShowRegistrantsInMobile]    AS [showRegistrantsInMobile]
+            , o.[RegistrationMobileId]       AS [siteRegTypeId]
+--             , o.[ShowRegistrantsInMobile]    AS [showRegistrantsInMobile]
             , o.[hasRegQuestions]            AS [hasRegQuestions]
             , o.[regStart]                   AS [regStart]
             , o.[regEnd]                     AS [regEnd]

From a5a62b4bd229bf640e5a24485df6697a40810ca9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 11:45:49 -0400
Subject: [PATCH 092/423] documentation and api improvements

---
 src/TouchPoint-WP/Auth.php                   |  2 +-
 src/TouchPoint-WP/CalendarGrid.php           |  1 +
 src/TouchPoint-WP/Involvement.php            | 24 ++++---
 src/TouchPoint-WP/Meeting.php                | 12 +++-
 src/TouchPoint-WP/PostTypeCapable.php        | 46 +++++++++++++-
 src/TouchPoint-WP/TouchPointWP.php           | 66 ++++++++++++++------
 src/TouchPoint-WP/TouchPointWP_Exception.php | 24 +++++--
 src/TouchPoint-WP/TouchPointWP_Settings.php  | 46 +++++++++-----
 src/TouchPoint-WP/Utilities/DateFormats.php  |  2 +-
 src/TouchPoint-WP/jsonLd.php                 |  2 +-
 wpml-config.xml                              |  1 +
 11 files changed, 168 insertions(+), 58 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 330a2c5d..97978553 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -16,7 +16,7 @@
 }
 
 /**
- * Allows users to login to WordPress with their TouchPoint credentials, and provides other user management
+ * Allows users to log in to WordPress with their TouchPoint credentials, and provides other user management
  * functionality.
  */
 abstract class Auth implements api, module
diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 51ce16c2..80db87f9 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -11,6 +11,7 @@
 use DateTimeInterface;
 use DateTimeZone;
 use Exception;
+use tp\TouchPointWP\Utilities\DateFormats;
 use WP_Query;
 
 if ( ! defined('ABSPATH')) {
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index eb3518e8..19edc918 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -20,12 +20,16 @@
 
 use DateInterval;
 use DateTimeImmutable;
+use DateTimeInterface;
+use DateTimeZone;
 use Exception;
 use stdClass;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
+use tp\TouchPointWP\Utilities\StringableArray;
 use tp\TouchPointWP\Utilities\Translation;
+use WP_Error;
 use WP_Post;
 use WP_Query;
 use WP_Term;
@@ -33,7 +37,7 @@
 /**
  * Fundamental object meant to correspond to an Involvement in TouchPoint
  */
-class Involvement implements api, updatesViaCron, hasGeo, module
+class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module
 {
 	use jsInstantiation;
 	use jsonLd;
@@ -43,12 +47,17 @@ class Involvement implements api, updatesViaCron, hasGeo, module
 	public const SHORTCODE_LIST = TouchPointWP::SHORTCODE_PREFIX . "Inv-List";
 	public const SHORTCODE_NEARBY = TouchPointWP::SHORTCODE_PREFIX . "Inv-Nearby";
 	public const SHORTCODE_ACTIONS = TouchPointWP::SHORTCODE_PREFIX . "Inv-Actions";
+
+	protected const SCHEDULE_STRING_CACHE_EXPIRATION = 3600 * 8; // 8 hours.  Automatically deleted during sync.
+	protected const SCHEDULE_STRING_CACHE_GROUP = TouchPointWP::HOOK_PREFIX . "inv_schedule_string";
+
+	protected const MEETING_STRATEGY_NONE = 0;
+	protected const MEETING_STRATEGY_SINGLE = 1;
+	protected const MEETING_STRATEGY_MULTIPLE = 2;
+
 	public const CRON_HOOK = TouchPointWP::HOOK_PREFIX . "inv_cron_hook";
 	public const CRON_OFFSET = 86400 + 3600;
 
-	public const SCHEDULE_STRING_CACHE_EXPIRATION = 3600 * 8; // 8 hours.  Automatically deleted during sync.
-	public const SCHEDULE_STRING_CACHE_GROUP = TouchPointWP::HOOK_PREFIX . "inv_schedule_string";
-
 	protected static bool $_hasUsedMap = false;
 	protected static bool $_hasArchiveMap = false;
 	private static array $_instances = [];
@@ -82,9 +91,8 @@ class Involvement implements api, updatesViaCron, hasGeo, module
 	 */
 	public string $invType;
 
-	public int $post_id;
 	public string $post_excerpt;
-	protected WP_Post $post;
+	protected ?WP_Post $post = null;
 
 	public object $attributes;
 	protected array $divisions;
@@ -92,8 +100,8 @@ class Involvement implements api, updatesViaCron, hasGeo, module
 	/**
 	 * Involvement constructor.
 	 *
-	 * @param $object WP_Post|object an object representing the involvement's post.
-	 *				  Must have post_id AND inv id attributes.
+	 * @param object $object WP_Post|object an object representing the involvement's post.
+	 *                  Must have post_id AND inv id attributes.
 	 *
 	 * @throws TouchPointWP_Exception
 	 */
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index f8e77db2..e82ffc3b 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -13,13 +13,19 @@
 	require_once 'api.php';
 }
 
+use DateTime;
+use DateTimeImmutable;
 use Exception;
+use tp\TouchPointWP\Utilities\DateFormats;
+use tp\TouchPointWP\Utilities\StringableArray;
+use WP_Post;
 use tp\TouchPointWP\Utilities\Http;
+use WP_Term;
 
 /**
  * Handle meeting content, particularly RSVPs.
  */
-abstract class Meeting implements api, module
+class Meeting extends PostTypeCapable implements api, module
 {
 	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . "meeting";
 	
@@ -151,7 +157,7 @@ public static function printCalendarGrid(WP_Query $q, int $month = null, int $ye
 	 * @return object
 	 * @throws TouchPointWP_Exception
 	 */
-	private static function getMeetingInfo($opts): object
+	private static function getMeetingInfoForRsvp($opts): object
 	{
 		// TODO caching
 
@@ -175,7 +181,7 @@ private static function ajaxGetMeetingInfo(): void
 		}
 
 		try {
-			$data = self::getMeetingInfo($_GET);
+			$data = self::getMeetingInfoForRsvp($_GET);
 		} catch (TouchPointWP_Exception $ex) {
 			http_response_code(Http::SERVER_ERROR);
 			echo json_encode(['error' => $ex->getMessage()]);
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index d2ee8eb1..3d2a2008 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -10,10 +10,24 @@
 use WP_Post;
 
 /**
- * This is a base class for those objects that can be derived from a
+ * This is a base class for those objects that can be derived from a Post.
  */
 abstract class PostTypeCapable implements module {
 
+	protected int $post_id;
+	protected ?WP_Post $post = null;
+
+
+	/**
+	 * Get the Post_id.
+	 *
+	 * @return int
+	 */
+	public function post_id(): int
+	{
+		return $this->post_id;
+	}
+
 	/**
 	 * Create relevant objects from a given post
 	 *
@@ -55,7 +69,35 @@ public function permalink(): string
 	 */
 	public abstract function notableAttributes(array $exclude = []): array;
 
-	public abstract function getActionButtons(string $context, string $btnClass): StringableArray;
+	/**
+	 * Handle exclusions for the notableAttributes $exclusion variable.
+	 *
+	 * Removes all array items that have a value or key contained in the $exclude array's values.
+	 *
+	 * @param array $subject
+	 * @param array $exclude
+	 *
+	 * @return array
+	 */
+	protected function processAttributeExclusions(array $subject, array $exclude): array
+	{
+		$subject = array_diff($subject, $exclude);
+		foreach ($exclude as $e) {
+			if (isset($subject[$e])) {
+				unset($subject[$e]);
+			}
+		}
+		return $subject;
+	}
+
+	/**
+	 * @param string $context  A string that gives filters some context for where the request is coming from
+	 * @param string $btnClass HTML class names to put into the buttons/links
+	 * @param bool   $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 *
+	 * @return StringableArray
+	 */
+	public abstract function getActionButtons(string $context, string $btnClass, bool $withTouchPointLink = true): StringableArray;
 
 	/**
 	 * Indicates if the given post can be instantiated as the given post type.
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 551fc876..3cd2d193 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -367,6 +367,21 @@ public static function postHeadersAndFiltering(): string
 		return $inputData;
 	}
 
+
+	/**
+	 * Get TouchPoint icon as an SVG that can printed inline.
+	 *
+	 * @return string
+	 */
+	public static function TouchPointIcon(): string
+	{
+		if (self::$_icon === null) {
+			self::$_icon = file_get_contents(TouchPointWP::$dir . "/assets/branding/icon-curcolor.svg");
+		}
+		return self::$_icon;
+	}
+	protected static ?string $_icon = null;
+
 	/**
 	 * @param bool         $continue Whether to parse the request
 	 * @param WP           $wp Current WordPress environment instance
@@ -690,9 +705,6 @@ public static function load($file): TouchPointWP
 
 		// Load Person for People Indexes.
 		if ($instance->settings->enable_people_lists === "on") {
-			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-				require_once 'Person.php';
-			}
 			$instance->people = Person::load();
 		}
 
@@ -870,12 +882,13 @@ public function registerScriptsAndStyles(): void
 	 */
 	public static function requireScript(string $name = null): void
 	{
+		$filename = strtolower($name);
 		/**
 		 * Filter to determine if a given script (which comes with TouchPoint-WP) should be included.
 		 *
 		 * @params bool $include Whether to include the script.
 		 */
-		if ( !apply_filters("tp_include_script_" . strtolower($name), true)) {
+		if ( !apply_filters("tp_include_script_$filename", true)) {
 			return;
 		}
 
@@ -903,12 +916,13 @@ public static function requireScript(string $name = null): void
 	 */
 	public static function requireStyle(string $name = null): void
 	{
+		$filename = strtolower($name);
 		/**
 		 * Filter to determine if a given stylesheet (which comes with TouchPoint-WP) should be included.
 		 *
 		 * @params bool $include Whether to include the stylesheet.
 		 */
-		if ( ! apply_filters("tp_include_style_" . strtolower($name), true)) {
+		if ( ! apply_filters("tp_include_style_$filename", true)) {
 			return;
 		}
 
@@ -1037,6 +1051,8 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false): false|
 	}
 
 	/**
+	 * Get Reverse Geocode information based on a provided lat/lng.
+	 *
 	 * @param float   $lat Latitude
 	 * @param float   $lng Longitude
 	 * @param bool    $includeIpLoc  Whether to use IP geolocation as a fallback data source.
@@ -1044,7 +1060,7 @@ public function geolocate(bool $useApi = true, bool $includeRaw = false): false|
 	 * @return Geo|false An object with a 'human' attribute, if a location could be identified. Or, false if not
 	 *	 available.
 	 */
-	public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true)
+	public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true): bool|Geo
 	{
 		if ($lat === 0.0 && $lng === 0.0) {
 			return false; // avoiding an easy error case.
@@ -1249,7 +1265,7 @@ public function __wakeup()
 	/**
 	 * Activation. Runs on activation.
 	 */
-	public function activation()
+	public function activation(): void
 	{
 		self::queueFlushRewriteRules();
 
@@ -1259,9 +1275,9 @@ public function activation()
 	/**
 	 * Deactivation. Runs on deactivation.
 	 */
-	public function deactivation()
+	public function deactivation(): void
 	{
-		$this->_log_version_number();
+		$this->logVersion();
 
 		self::clearScheduledHooks();
 
@@ -1269,9 +1285,9 @@ public function deactivation()
 	}
 
 	/**
-	 * Uninstallation. Runs on uninstallation.
+	 * Runs on uninstallation.
 	 */
-	public static function uninstall()
+	public static function uninstall(): void
 	{
 		// TODO remove all options.
 		// TODO remove all taxonomies (maybe)
@@ -1315,7 +1331,7 @@ protected static function dropTables(): void
 	/**
 	 * Log the plugin version number.
 	 */
-	private function _log_version_number()
+	private function logVersion(): void
 	{
 		update_option(self::TOKEN . '_version', self::VERSION, true);
 	}
@@ -1324,6 +1340,8 @@ private function _log_version_number()
 	 * Indicates that Tribe Calendar Pro is enabled.
 	 *
 	 * @return bool
+	 *
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendarPro(): bool
 	{
@@ -1339,7 +1357,7 @@ public static function useTribeCalendarPro(): bool
 	 *
 	 * @return bool
 	 *
-	 * @deprecated since 0.0.90 -- Will not be necessary once mobile 3.0 exists.
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendar(): bool
 	{
@@ -1489,7 +1507,7 @@ public function getDivisions(): array
 	/**
 	 * @return false|object Update the divisions if they're stale.
 	 */
-	private function updateDivisions()
+	private function updateDivisions(): object|bool
 	{
 		try {
 			$data = $this->apiGet('Divisions');
@@ -1507,11 +1525,14 @@ private function updateDivisions()
 		return $obj;
 	}
 
-
 	/**
-	 * @return false|object Get new MemberTypes for a Division.  Does not cache them.
+	 * Get new MemberTypes for a Division.  Does not cache them.
+	 *
+	 * @param $divisions
+	 *
+	 * @return false|object False on failure.  An object with memTypes otherwise.
 	 */
-	private function getMemberTypesForDivisions_fromApi($divisions)
+	private function getMemberTypesForDivisions_fromApi($divisions): object|bool
 	{
 		try {
 			$return = $this->apiGet('MemTypes', ['divs' => $divisions]);
@@ -2093,7 +2114,7 @@ public function updateFamilyEvFields()
 	 *
 	 * @throws TouchPointWP_Exception Thrown if the API credentials are incomplete.
 	 */
-	public function apiGet(string $command, ?array $parameters = null, int $timeout = 5): array|stdClass
+	public function apiGet(string $command, ?array $parameters = null, int $timeout = 5, $verbose = false): array|stdClass
 	{
 		if ( ! is_array($parameters)) {
 			$parameters = (array)$parameters;
@@ -2111,10 +2132,15 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 			throw new TouchPointWP_Exception(__('Host appears to be missing from TouchPoint-WP configuration.', 'TouchPoint-WP'), 170002);
 		}
 
+		$url = $host . "/PythonApi/" .
+		       $this->settings->api_script_name . "?" . http_build_query($parameters);
+		
+		if ($verbose) {
+			echo "<p>Request to $url</p>";
+		}
 
 		$r = $this->getHttpClient()->request(
-			$host . "/PythonApi/" .
-			$this->settings->api_script_name . "?" . http_build_query($parameters),
+			$url,
 			[
 				'method'  => 'GET',
 				'headers' => [
diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index 8de9487b..581d7284 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -8,10 +8,6 @@
 use Exception;
 use Throwable;
 
-if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once 'TouchPointWP_AdminAPI.php';
-}
-
 if ( ! defined('ABSPATH')) {
 	exit;
 }
@@ -39,12 +35,30 @@ public function __construct(string $message = "", int $code = 0, ?Throwable $pre
 				$message .= "<br />" . $this->getFile() . " @ " . $this->getLine() . "<br />";
 				$message .= str_replace("\n", "<br />", $this->getTraceAsString());
 			}
-			TouchPointWP_AdminAPI::showError($message);
+			self::showAdminError($message);
 		}
 		error_log($message);
 		self::debugLog($this->getCode(), $this->getFile(), $this->getLine(), $this->getMessage());
 	}
 
+	/**
+	 * Shows an admin error if and only if admin is loaded.
+	 *
+	 * @param $message
+	 *
+	 * @return void
+	 */
+	protected static function showAdminError($message): void
+	{
+		if (is_admin() && TouchPointWP::currentUserIsAdmin()) {
+			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+				require_once 'TouchPointWP_AdminAPI.php';
+			}
+
+			TouchPointWP_AdminAPI::showError($message);
+		}
+	}
+
 	/**
 	 * @param $code
 	 * @param $file
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 8161307c..613492a9 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1258,7 +1258,7 @@ private function passwordPlaceholder(string $settingName): string
 	 */
 	public function addMenuItems(): void
 	{
-		$args = $this->menu_settings();
+		$args = $this->menuSettings();
 
 		// Do nothing if wrong location key is set.
 		if (is_array($args) && isset($args['location']) && function_exists('add_' . $args['location'] . '_page')) {
@@ -1297,25 +1297,37 @@ public function addMenuItems(): void
 	 *
 	 * @return mixed|void
 	 */
-	private function menu_settings()
+	private function menuSettings()
 	{
+		$settings = [
+			'location'    => 'options', // Possible settings: options, menu, submenu.
+			'parent_slug' => 'options-general.php',
+			'page_title'  => __('TouchPoint-WP', 'TouchPoint-WP'),
+			'menu_title'  => __('TouchPoint-WP', 'TouchPoint-WP'),
+			'capability'  => 'manage_options',
+			'menu_slug'   => $this->parent::TOKEN . '_Settings',
+			'function'    => [$this, 'settingsPage'],
+			'icon_url'    => '',
+			'position'    => null,
+		];
+
 		/**
-		 * Adjust the menu settings before they're applied.
+		 * Allows for manipulation of menu settings for the plugin. 
+		 *
+		 * @param array $settings The settings array.  Default values below.
+		 *
+		 * 'location'    => 'options', // Possible settings: options, menu, submenu.
+		 * 'parent_slug' => 'options-general.php',
+		 * 'page_title'  => __('TouchPoint-WP', 'TouchPoint-WP'),
+		 * 'menu_title'  => __('TouchPoint-WP', 'TouchPoint-WP'),
+		 * 'capability'  => 'manage_options',
+		 * 'menu_slug'   => $this->parent::TOKEN . '_Settings',
+		 * 'function'    => [$this, 'settingsPage'],
+		 * 'icon_url'    => '',
+		 * 'position'    => null,
+		 *
 		 */
-		return apply_filters(
-			'tp_menu_settings',
-			[
-				'location'    => 'options', // Possible settings: options, menu, submenu.
-				'parent_slug' => 'options-general.php',
-				'page_title'  => __('TouchPoint-WP', 'TouchPoint-WP'),
-				'menu_title'  => __('TouchPoint-WP', 'TouchPoint-WP'),
-				'capability'  => 'manage_options',
-				'menu_slug'   => $this->parent::TOKEN . '_Settings',
-				'function'    => [$this, 'settingsPage'],
-				'icon_url'    => '',
-				'position'    => null,
-			]
-		);
+		return apply_filters('tp_menu_settings', $settings);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 04346a0c..2dc8aa84 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -100,7 +100,7 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 		 *
 		 * @since 0.0.90
 		 *
-		 * @param string $ts The string, as formatted so far.
+		 * @param string $r The string, as formatted so far.
 		 * @param DateTimeInterface $dt The DateTimeInterface object for the date being formatted.
 		 */
 		return apply_filters('tp_adjust_date_string', $r, $dt);
diff --git a/src/TouchPoint-WP/jsonLd.php b/src/TouchPoint-WP/jsonLd.php
index c4dabb8c..211107ea 100644
--- a/src/TouchPoint-WP/jsonLd.php
+++ b/src/TouchPoint-WP/jsonLd.php
@@ -20,7 +20,7 @@ trait jsonLd
 	/** @var jsonLd[] */
 	protected static array $queueForJsonLd = [];
 
-	public int $post_id;
+	protected int $post_id;
 
 	/**
 	 * Add to a queue for instantiation.
diff --git a/wpml-config.xml b/wpml-config.xml
index d8035779..622386c7 100644
--- a/wpml-config.xml
+++ b/wpml-config.xml
@@ -22,6 +22,7 @@
         <custom-field action="ignore">tp_groupclosed</custom-field>
         <custom-field action="ignore">tp_hasregquestions</custom-field>
         <custom-field action="ignore">tp_regtypeid</custom-field>
+        <custom-field action="ignore">tp_siteregtypeid</custom-field>
         <custom-field action="ignore">tp_meetings</custom-field>
         <custom-field action="ignore">tp_schedules</custom-field>
         <custom-field action="ignore">tp_geo_lat</custom-field>

From 506d6a255fa083e54add45ca445de824b2ebffd0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 29 Apr 2024 22:01:53 -0400
Subject: [PATCH 093/423] Closes #182

---
 src/TouchPoint-WP/Involvement.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 19edc918..9cb68df3 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -426,6 +426,12 @@ public static function templateFilter(string $template): string
 				return $template;
 			}
 
+			if (is_post_type_archive(Meeting::POST_TYPE) && file_exists(
+					TouchPointWP::$dir . '/src/templates/meeting-archive.php'
+				)) {
+				return TouchPointWP::$dir . '/src/templates/meeting-archive.php';
+			}
+
 			if (is_post_type_archive($postTypesToFilter) && file_exists(
 					TouchPointWP::$dir . '/src/templates/involvement-archive.php'
 				)) {

From b5b457399baffd977424c7af7a25d9ab215d59ea Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 10:39:18 -0400
Subject: [PATCH 094/423] Style adjustment

---
 assets/template/calendar-style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/template/calendar-style.css b/assets/template/calendar-style.css
index b1a1be28..922a44b0 100644
--- a/assets/template/calendar-style.css
+++ b/assets/template/calendar-style.css
@@ -46,7 +46,7 @@ div.calGrid div.calDay.after {
     background: #0001;
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 1000px) {
     div.calGrid {
         display: grid;
         grid-template-columns: unset;

From 0cbfd4db2d7d87d6b6e445a5efa88e6722c51c32 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 19:44:05 -0400
Subject: [PATCH 095/423] Documentation improvements

---
 .idea/.gitignore |  2 ++
 .idea/vcs.xml    | 10 ++++++++++
 generateDocs.php |  8 ++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 13566b81..a9d7db9c 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,5 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+# GitHub Copilot persisted chat sessions
+/copilot/chatSessions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c297a493..45ef162f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/TenthPres/TouchPoint-WP/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/docs" vcs="Git" />
diff --git a/generateDocs.php b/generateDocs.php
index 9abc2bbb..73cb8df8 100644
--- a/generateDocs.php
+++ b/generateDocs.php
@@ -47,8 +47,12 @@
 
 
 echo "Merging sidebar files...";
-$sidebar = file_get_contents("docs/_Sidebar_prepend.md");
-$sidebar .= file_get_contents("docs/_Sidebar.md");
+$sidebar = file_get_contents("docs/.Sidebar.md");
+$automaticSidebar = file_get_contents("docs/_Sidebar.md");
+$automaticSidebar = str_replace("API Index", "PHP API Index",$automaticSidebar);
+
+$sidebar .= $automaticSidebar;
+
 file_put_contents("docs/_Sidebar.md", $sidebar);
 echo "    Complete.\n\n";
 

From 641f402a8398607e650cbda11dd53f2fa784f238 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 19:45:34 -0400
Subject: [PATCH 096/423] Documentation improvements

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 571cbb43..e3bc0ab2 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 571cbb436f639c41cbd8af45aab0ce9048ec1e27
+Subproject commit e3bc0ab26aa58ae0e378cfb3f75f95cfaa3becc4

From 18064cbdfc065df7514d08b521087ae7bd4ad2e3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:02:50 -0400
Subject: [PATCH 097/423] Fixing a bug with partner taxonomies

---
 src/TouchPoint-WP/Partner.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index cfa9f325..bda45068 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -407,10 +407,10 @@ public static function updateFromTouchPoint(bool $verbose = false)
 					);
 					TouchPointWP::queueFlushRewriteRules();
 				}
-				if ( !! $term && ! ! $term['term_id']) {
+				if ( !!$term && !!$term['term_id']) {
 					$termsToKeep[] = $term['term_id'];
 					// Apply term to post
-					wp_set_post_terms($post->ID, $term['term_id'], Taxonomies::TAX_GP_CATEGORY, false);
+					wp_set_post_terms($post->ID, [$term['term_id']], Taxonomies::TAX_GP_CATEGORY, false);
 				}
 			}
 

From 98d6befe812dfe1620bf87186b9664f50e306fa8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:03:40 -0400
Subject: [PATCH 098/423] Improvements to helper classes

---
 .../Utilities/DateTimeExtended.php            | 22 +++++++++++++++++++
 .../Utilities/StringableArray.php             | 22 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 src/TouchPoint-WP/Utilities/DateTimeExtended.php

diff --git a/src/TouchPoint-WP/Utilities/DateTimeExtended.php b/src/TouchPoint-WP/Utilities/DateTimeExtended.php
new file mode 100644
index 00000000..fe5e2efa
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/DateTimeExtended.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+use DateTimeImmutable;
+
+/**
+ * A collection of people, easily cast to string.
+ */
+class DateTimeExtended extends DateTimeImmutable
+{
+	public bool $isAllDay = false;
+
+	public function __construct($time = "now", $timezone = null)
+	{
+		parent::__construct($time, $timezone);
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index cc0fb16c..4c2a784c 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -28,6 +28,28 @@ public function __construct(string $separator = "\n ", object|array $array = [],
 		parent::__construct($array, $flags, $iteratorClass);
 	}
 
+	/**
+	 * Length of array.
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->getArrayCopy());
+	}
+
+	/**
+	 * Append to the end of the array.
+	 *
+	 * @param mixed $value
+	 */
+	public function prepend($value): void
+	{
+		$array = $this->getArrayCopy();
+		array_unshift($array, $value);
+		$this->exchangeArray($array);
+	}
+
 	/**
 	 * Standard method to stringify.
 	 *

From fddac2a31617d8bc587f4edcd784be73232bf995 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:10:47 -0400
Subject: [PATCH 099/423] Reworking action buttons and schedule strings

---
 src/TouchPoint-WP/Involvement.php           | 175 +++++++++-----
 src/TouchPoint-WP/Meeting.php               | 122 ++++++++++
 src/TouchPoint-WP/Utilities/DateFormats.php | 253 +++++++++++++++++++-
 3 files changed, 489 insertions(+), 61 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 9cb68df3..343bfb63 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2665,14 +2665,24 @@ public function leaders(): PersonArray
 		if ( ! isset($this->_leaders)) {
 			$s = $this->settings();
 
-			$q = new PersonQuery(
-				[
-					'meta_key'     => Person::META_INV_MEMBER_PREFIX . $this->invId,
-					'meta_value'   => $s->leaderTypes,
-					'meta_compare' => 'IN'
-				]
-			);
-
+			// If there aren't leader types (as is the case for all Event types), default to attend leader type.
+			if (count($s->leaderTypes) == 0) {
+				$q = new PersonQuery(
+					[
+						'meta_key'     => Person::META_INV_ATTEND_PREFIX . $this->invId,
+						'meta_value'   => ['at10'], // Leader Attend type.
+						'meta_compare' => 'IN'
+					]
+				);
+			} else {
+				$q = new PersonQuery(
+					[
+						'meta_key'     => Person::META_INV_MEMBER_PREFIX . $this->invId,
+						'meta_value'   => $s->leaderTypes,
+						'meta_compare' => 'IN'
+					]
+				);
+			}
 			$this->_leaders = $q->get_results();
 		}
 
@@ -2865,16 +2875,15 @@ public function notableAttributes(array $exclude = []): array
 
 	/**
 	 * Returns the html with buttons for actions the user can perform.  This must be called *within* an element with
-	 * the
-	 * `data-tp-involvement` attribute with the post_id (NOT the Inv ID) as the value.
+	 * the `data-tp-involvement` attribute with the post_id (NOT the Inv ID) as the value.
 	 *
 	 * @param ?string $context A reference to where the action buttons are meant to be used.
 	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
 	 *     elements.
 	 *
-	 * @return string
+	 * @return StringableArray()
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = ""): string
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $includeRegister = true): StringableArray
 	{
 		TouchPointWP::requireScript('swal2-defer');
 		TouchPointWP::requireScript('base-defer');
@@ -2882,21 +2891,72 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 		$this->enqueueForJsonLdInstantiation();
 		Person::enqueueUsersForJsInstantiation();
 
+		$classesOnly = $btnClass;
 		if ($btnClass !== "") {
 			$btnClass = " class=\"$btnClass\"";
 		}
 
-		$ret = "";
-		$count = 0;
-		if (self::allowContact($this->invType)) {
+		$ret = new StringableArray();
+		if (self::allowContact($this->invType) && $this->leaders()->count() > 0) {
 			$text = __("Contact Leaders", 'TouchPoint-WP');
-			$ret  = "<button type=\"button\" data-tp-action=\"contact\" $btnClass>$text</button> ";
+			$ret[] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button> ";
 			TouchPointWP::enqueueActionsStyle('inv-contact');
-			$count++;
 		}
 
-		if ($this->acceptingNewMembers() === true) {
-			if ($this->useRegistrationForm()) {
+		// Register Button
+		if ($includeRegister === true) {
+			$ret[] = $this->getRegisterButton($btnClass);
+		}
+
+		// Show on map button.  (Only works if map is called before this is.)
+		if (self::$_hasArchiveMap && $this->geo !== null) {
+			$text = __("Show on Map", 'TouchPoint-WP');
+			if ($ret->count() > 1) {
+				TouchPointWP::requireScript("fontAwesome");
+				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"fa-solid fa-location-pin\"></i></button>");
+			} else {
+				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>");
+			}
+		}
+
+		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
+			$tpHost = TouchPointWP::instance()->host();
+			// Translators: %s is the system name.  "TouchPoint" by default.
+			$title  = wp_sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
+			$logo = TouchPointWP::TouchPointIcon();
+			$ret[]  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
+		}
+
+		/**
+		 * Allows for manipulation of the action buttons for an Involvement.  This is the list of buttons that appear
+		 * on the Involvement to allow the user to interact with it.
+		 *
+		 * @since 0.0.7
+		 *
+		 * @see Involvement::getActionButtons()
+		 * @see PostTypeCapable::getActionButtons()
+		 *
+		 * @param StringableArray $ret The list of action buttons.
+		 * @param Involvement $this The Involvement object.
+		 * @param ?string $context A reference to where the action buttons are meant to be used.
+		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
+		 *     elements.
+		 */
+		return apply_filters("tp_involvement_actions", $ret, $this, $context, $btnClass);
+	}
+
+	/**
+	 * Get the HTML for the register button.  Labels depend on several settings within TouchPoint.
+	 *
+	 * @param string $btnClass
+	 * @param bool   $includeRsvp
+	 *
+	 * @return ?string HTML for the registration button, whatever that should be. Null if nothing to return.
+	 */
+	public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?string
+	{
+		switch ($this->getRegistrationType()) {
+			case RegistrationType::FORM:
 				$text = __('Register', 'TouchPoint-WP');
 				switch (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) {
 					case 1:  // Join Involvement (skip other options because this option is common)
@@ -2923,53 +2983,54 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 						$text = __('Get Tickets', 'TouchPoint-WP');
 						break;
 				}
-				$link = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
-				$ret  .= "<a class=\"btn button\" href=\"$link\" $btnClass>$text</a>  ";
+				$link  = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
 				TouchPointWP::enqueueActionsStyle('inv-register');
-			} else {
+				return "<a class=\"btn button\" href=\"$link\" $btnClass>$text</a>  ";
+
+			case RegistrationType::JOIN:
 				$text = __('Join', 'TouchPoint-WP');
-				$ret  .= "<button type=\"button\" data-tp-action=\"join\" $btnClass>$text</button>  ";
 				TouchPointWP::enqueueActionsStyle('inv-join');
-			}
-			$count++;
-		}
+				return "<button type=\"button\" data-tp-action=\"join\" $btnClass>$text</button>  ";
 
-		// Show on map button.  (Only works if map is called before this is.)
-		if (self::$_hasArchiveMap && $this->geo !== null) {
-			$text = __("Show on Map", 'TouchPoint-WP');
-			if ($count > 1) {
-				TouchPointWP::requireScript("fontAwesome");
-				$ret = "<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"fa-solid fa-location-pin\"></i></button>  " . $ret;
-			} else {
-				$ret = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  " . $ret;
-			}
-		}
+			case RegistrationType::EXTERNAL:
+				$text = __('Register', 'TouchPoint-WP');
+				$link = $this->getRegistrationUrl();
+				TouchPointWP::enqueueActionsStyle('inv-register');
+				return "<a class=\"btn button\" href=\"$link\" $btnClass>$text</a>  ";
 
-		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
-			$tpHost = TouchPointWP::instance()->host();
-			$title  = sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
-			$logo = TouchPointWP::TouchPointIcon();
-			$ret[]  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
+			case RegistrationType::RSVP:
+				if ($includeRsvp) {
+					$asAMeeting = $this->AsAMeeting();
+					if ($asAMeeting !== null) {
+						return $asAMeeting->getRsvpButton($btnClass);
+					}
+				}
 		}
+		return null;
+	}
 
-		/**
-		 * Allows for manipulation of the action buttons for an Involvement.  This is the list of buttons that appear
-		 * on the Involvement to allow the user to interact with it.
-		 *
-		 * @since 0.0.7
-		 *
-		 * @see Involvement::getActionButtons()
-		 * @see PostTypeCapable::getActionButtons()
-		 *
-		 * @param StringableArray $ret The list of action buttons.
-		 * @param Involvement $this The Involvement object.
-		 * @param ?string $context A reference to where the action buttons are meant to be used.
-		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
-		 *     elements.
-		 */
-		return apply_filters("tp_involvement_actions", $ret, $this, $context, $btnClass);
+	/**
+	 * If the post for this involvement is also a single Meeting post, return that object.  Otherwise, null.
+	 * 
+	 * @return ?Meeting
+	 */
+	protected function AsAMeeting(): ?Meeting
+	{
+		if (Meeting::postIsType($this->post)) {
+			try {
+				return Meeting::fromPost($this->post);
+			} catch (TouchPointWP_Exception $e) {
+				return null;
+			}
+		}
+		return null;
 	}
 
+	/**
+	 * Get the JS for instantiation.
+	 *
+	 * @return string
+	 */
 	public static function getJsInstantiationString(): string
 	{
 		$queue = static::getQueueForJsInstantiation();
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index e82ffc3b..08d422dc 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -229,4 +229,126 @@ private static function ajaxSubmitRsvps(): void
 		echo json_encode(['success' => $data->success]);
 		exit;
 	}
+
+	/**
+	 * @param $btnClass
+	 *
+	 * @return string
+	 */
+	public function getRsvpButton(string $btnClass = ""): string
+	{
+		TouchPointWP::requireScript('swal2-defer');
+		TouchPointWP::requireScript('meeting-defer');
+		TouchPointWP::enqueueActionsStyle('rsvp');
+		Person::enqueueUsersForJsInstantiation();
+
+		$link = __("RSVP", "TouchPoint-WP");
+		$preloadMsg = __("Loading...", "TouchPoint-WP");
+		
+		$btnClass = trim($btnClass);
+		if ($btnClass !== '') {
+			$btnClass = "class=\"$btnClass\"";
+		}
+
+		return "<a href=\"#\" onclick=\"return false;\" $btnClass disabled data-tp-action=\"rsvp\" data-tp-mtg=\"$this->mtgId\"><span class=\"rsvp-btn-content\" style=\"display:none\">$link</span><span class=\"rsvp-btn-preload\">$preloadMsg</span></a>";
+	}
+
+	/**
+	 * Indicates if the given post can be instantiated as a Meeting.
+	 *
+	 * @param \WP_Post $post
+	 *
+	 * @return bool
+	 */
+	public static function postIsType(WP_Post $post): bool
+	{
+		return intval(get_post_meta($post->ID, Meeting::MEETING_META_KEY, true)) > 0;
+	}
+
+	public static function load(): bool
+	{
+		// TODO: Implement load() method... or make not a module anymore.
+		return true;
+	}
+
+	/**
+	 * Indicate the tense of the meeting.
+	 *
+	 * @return string
+	 */
+	public function tense(): string
+	{
+		if ($this->endDt < Utilities::dateTimeNow()) {
+			return Taxonomies::TAX_TENSE_PAST;
+		}
+		if ($this->startDt > Utilities::dateTimeNow()) {
+			return Taxonomies::TAX_TENSE_FUTURE;
+		}
+		return Taxonomies::TAX_TENSE_PRESENT;
+	}
+
+	/**
+	 * Indicates if the meeting is multi-day.
+	 *
+	 * @return bool
+	 */
+	public function isMultiDay(): bool
+	{
+		if ($this->endDt === null) {
+			return false;
+		}
+		return $this->startDt->format("Ymd") !== $this->endDt->format("Ymd");
+	}
+
+	/**
+	 * Indicates if the meeting is labeled as all-day.
+	 * 
+	 * Currently, TouchPoint doesn't have the capacity for this.
+	 *
+	 * TODO When TouchPoint supports an all-day marker, add it here. #184
+	 *
+	 * @return bool
+	 */
+	public function isAllDay(): bool
+	{
+		return $this->startDt->format("His") === "000000";
+	}
+
+	/**
+	 * Get the date portion for the meeting start, formatted.
+	 *
+	 * @return string
+	 */
+	public function dateString(): string
+	{
+		if (!$this->isMultiDay() || $this->endDt === null) {
+			return DateFormats::DateStringFormatted($this->startDt);
+		}
+		return DateFormats::DateStringFormatted($this->startDt) . " &endash; " . DateFormats::DateStringFormatted($this->endDt);
+	}
+
+	/**
+	 * Get the time portion for the meeting start, formatted.
+	 *
+	 * @return ?string
+	 */
+	public function startTimeString(): ?string
+	{
+		if ($this->isAllDay())
+			return null;
+		return DateFormats::TimeStringFormatted($this->startDt);
+	}
+
+	/**
+	 * Get the time portion for the meeting end, formatted.  Null if no end is defined or end is same as start.
+	 *
+	 * @return ?string
+	 */
+	public function endTimeString(): ?string
+	{
+		if ($this->endDt === null) {
+			return null;
+		}
+		return DateFormats::TimeStringFormatted($this->endDt);
+	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 2dc8aa84..4e60e651 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -9,7 +9,7 @@
 use tp\TouchPointWP\Utilities;
 
 /**
- * A collection of people, easily cast to string.
+ * Formatting Dates
  */
 abstract class DateFormats
 {
@@ -35,6 +35,40 @@ public static function TimeStringFormatted(DateTimeInterface $dt): string
 		return apply_filters('tp_adjust_time_string', $ts, $dt);
 	}
 
+	/**
+	 * Get a time string for a given pair of DateTimesInterfaces.  This should generally only be used when all of these
+	 * are true:
+	 * - The DateTimes are on the same day.
+	 * - The event represented is not all-day.
+	 * - Neither are null
+	 *
+	 * @param DateTimeInterface $startDt
+	 * @param DateTimeInterface $endDt
+	 *
+	 * @return string
+	 */
+	public static function TimeRangeStringFormatted(DateTimeInterface $startDt, DateTimeInterface $endDt): string
+	{
+		$startStr = self::TimeStringFormatted($startDt);
+		$endStr = self::TimeStringFormatted($endDt);
+
+		$ts = wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $startStr, $endStr);
+
+		/**
+		 * Allows for manipulation of a time range string.  For example, combined with `tp_adjust_time_string`, you
+		 * can change a range of 1:00pm - 2:00pm to 1pm - 2pm.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @param string            $ts The string, as formatted so far.
+		 * @param string            $startStr The start string, with default formatting.
+		 * @param string            $endStr The end string, with default formatting
+		 * @param DateTimeInterface $startDt The DateTimeInterface object for the start.
+		 * @param DateTimeInterface $endDt The DateTimeInterface object for the $end.
+		 */
+		return apply_filters('tp_adjust_time_range_string', $ts, $startStr, $endStr, $startDt, $endDt);
+	}
+
 	/**
 	 * Get a string for a single given datetime string.
 	 *
@@ -72,13 +106,13 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 
 				// Last week
 				if ($ts < $nowTs && $ts - $nowTs > -7 * 86400) {
-					// translators: %1s is "Monday".  %2s is "January 1".
+					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('Last %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 				}
 
 				// This week
 				else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
-					// translators: %1s is "Monday".  %2s is "January 1".
+					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('This %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 				}
 
@@ -89,7 +123,7 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 
 				// Other Times
 				} else {
-					// translators: %1s is "Monday".  %2s is "January 1".
+					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('%1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 				}
 			}
@@ -105,4 +139,215 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 		 */
 		return apply_filters('tp_adjust_date_string', $r, $dt);
 	}
+
+
+	/**
+	 * Get a (shorter) string for a single given datetime string.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return string
+	 */
+	public static function DateStringFormattedShort(DateTimeInterface $dt): string
+	{
+		// Today
+		$now = Utilities::dateTimeNow();
+		if ($dt->format("Ymd") === $now->format("Ymd")) {
+			if ((int)$dt->format('G') >= 17) { // 5pm or later
+				$r = __("Tonight", "TouchPoint-WP");
+			} else {
+				$r = __("Today", "TouchPoint-WP");
+			}
+		} else {
+			// Tomorrow
+			$tomorrow = Utilities::dateTimeNowPlus1D();
+			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
+				$r = __("Tomorrow", "TouchPoint-WP");
+			} else {
+				$ts    = $dt->getTimestamp();
+				$nowTs = $now->getTimestamp();
+
+
+				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
+					$day = date_i18n(_x('D', "Short date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
+					$date = date_i18n(_x('M j', "Short date string when the year is current.", "TouchPoint-WP"), $ts);
+				} else {
+					$day = date_i18n(_x('D', "Short date string for day of the week, when the year is not current.", "TouchPoint-WP"), $ts);
+					$date = date_i18n(_x('M j, Y', "Short date string when the year is not current.", "TouchPoint-WP"), $ts);
+				}
+
+				// Last week
+				if ($ts < $nowTs && $ts - $nowTs > -7 * 86400) {
+					// translators: %1$s is "Mon".  %2$s is "Jan 1".
+					$r = sprintf(_x('Last %1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
+				}
+
+				// This week
+				else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
+					// translators: %1$s is "Mon".  %2$s is "Jan 1".
+					$r = sprintf(_x('This %1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
+				}
+
+				// Next week
+				else if ($ts > $nowTs && $ts - $nowTs < 14 * 86400) {
+					// translators: %1$s is "Mon".  %2$s is "Jan 1".
+					$r = sprintf(_x('Next %1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
+
+				// Other Times
+				} else {
+					// translators: %1$s is "Mon".  %2$s is "Jan 1".
+					$r = sprintf(_x('%1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
+				}
+			}
+		}
+
+		/**
+		 * Allows for manipulation of the string returned as a formatted date.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @param string $r The string, as formatted so far.
+		 * @param DateTimeInterface $dt The DateTimeInterface object for the date being formatted.
+		 */
+		return apply_filters('tp_adjust_date_string', $r, $dt);
+	}
+
+
+	/**
+	 * Get a string for the period between $start and $end.
+	 *
+	 * @param ?DateTimeExtended $start
+	 * @param ?DateTimeExtended $end
+	 * @param bool|null        $multiDay
+	 *
+	 * @return ?string
+	 */
+	public static function DurationToString(?DateTimeExtended $start, ?DateTimeExtended $end, ?bool $multiDay = null, ): ?string
+	{
+		if ($start === null) {
+			return null;
+		}
+
+		if ($multiDay === null) {
+			if ($end === null) {
+				$multiDay = false;
+			} else {
+				$multiDay = ($start->format('Ymd') !== $end->format('Ymd'));
+			}
+		}
+
+		$allDay = $start->isAllDay;
+
+		if ($allDay && !$multiDay) {
+			return self::DateStringFormatted($start);
+		}
+
+		if ($allDay && $multiDay) {
+			$date1 = self::DateStringFormattedShort($start);
+			$date2 = ($end == null) ? null : self::DateStringFormattedShort($end);
+
+			// Translators: %1$s is the start date, %2$s is the end date.
+			return wp_sprintf(__('%1$s &ndash; %1$s', 'TouchPoint-WP'), $date1, $date2);
+		}
+
+		$time1 = self::TimeStringFormatted($start);
+		$time2 = ($end == null) ? null : self::TimeStringFormatted($end);
+
+		if (!$multiDay) {
+			// translators: %1$s is the start time, %2$s is the end time.
+			return wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $time1, $time2);
+		}
+
+		$date1 = self::DateStringFormattedShort($start);
+		$date2 = ($end == null) ? null : self::DateStringFormattedShort($end);
+
+		// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+		return wp_sprintf(__('%1$s at %2$s &ndash; %3$s at %4$s', 'TouchPoint-WP'), $date1, $time1, $date2, $time2);
+	}
+
+	/**
+	 * Takes a start and end and returns one or two strings that are intended for use in a Meeting's Notable Attributes,
+	 * but can be used for other similar cases.
+	 *
+	 * @param ?DateTimeInterface $start
+	 * @param ?DateTimeInterface $end
+	 * @param bool               $multiDay
+	 * @param bool               $allDay
+	 *
+	 * @return array|string[]
+	 */
+	public static function DurationToStringArray(?DateTimeInterface $start, ?DateTimeInterface $end, bool $multiDay, bool $allDay): array
+	{
+		if ($start === null) {
+			return [];
+		}
+
+		// outputs are commented by bits corresponding to multiDay, end==null, and allDay
+
+		if ($allDay === true) {
+			if ($multiDay && $end !== null) {
+				// 001
+
+				$date1 = self::DateStringFormattedShort($start);
+				$date2 = self::DateStringFormattedShort($end);
+
+				// Translators: %1$s is the start date, %2$s is the end date.
+				return [
+					'datetime' => wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $date1, $date2)
+				];
+			} else {
+				// 011
+				// 101
+				// 111
+
+				return [
+					'datetime' => self::DateStringFormatted($start)
+				];
+			}
+		}
+
+		if ($multiDay) {
+			if ($end === null) {
+				// 110
+
+				$date = self::DateStringFormatted($start);
+				$time = self::TimeStringFormatted($start);
+				// Translators: %1$s is the start date, %2$s is the start time.
+				return [
+					'datetime' => wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $date, $time)
+				];
+			} else {
+				// 100
+
+				$date1 = self::DateStringFormattedShort($start);
+				$date2 = self::DateStringFormattedShort($end);
+
+				$time1 = self::TimeStringFormatted($start);
+				$time2 = self::TimeStringFormatted($end);
+
+				// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+				return [
+					'datetime' => wp_sprintf(__('%1$s at %2$s &ndash; %3$s at %4$s', 'TouchPoint-WP'), $date1, $time1, $date2, $time2)
+				];
+			}
+		}
+
+		$attrs = [
+			'date' => self::DateStringFormatted($start),
+		];
+
+		if ($end === null) {
+			// 010
+
+			$time = self::TimeStringFormatted($start);
+			$attrs['time'] = $time;
+		} else {
+			// 000
+
+			$attrs['time'] = self::TimeRangeStringFormatted($start, $end);
+		}
+
+		return $attrs;
+
+	}
 }
\ No newline at end of file

From 0b03c5819ab2be39527e7801a87fa296a1c7b0d2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:11:15 -0400
Subject: [PATCH 100/423] Additional files

---
 touchpoint-wp.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 217c8f41..2990212f 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -48,14 +48,23 @@
 
 	require_once __DIR__ . "/src/TouchPoint-WP/api.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/module.php";
-	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Cleanup.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/PostTypeCapable.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/RegistrationType.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Geo.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Cleanup.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Translation.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/StringableArray.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateFormats.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateTimeExtended.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Taxonomies.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/hasGeo.php";
 
 	require_once __DIR__ . "/src/TouchPoint-WP/Person.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Meeting.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/CalendarGrid.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Involvement.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Location.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Report.php";

From b6f4c403c32ed9333c285f634d24542047d19b62 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:12:38 -0400
Subject: [PATCH 101/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 277 ++++++++++++++++++++++-------------
 i18n/TouchPoint-WP.pot      | 279 +++++++++++++++++++++++-------------
 2 files changed, 363 insertions(+), 193 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 5e38822f..c7067c59 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,8 +87,8 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:537
-#: src/TouchPoint-WP/Rsvp.php:79
+#: src/TouchPoint-WP/Meeting.php:545
+#: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
 msgid "Loading..."
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1624
+#: src/TouchPoint-WP/Involvement.php:1696
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1650
+#: src/TouchPoint-WP/Involvement.php:1722
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -174,7 +174,7 @@ msgstr "Seleccione..."
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
 #: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1870
+#: src/TouchPoint-WP/Involvement.php:1942
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -209,81 +209,81 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:467
+#: src/TouchPoint-WP/Involvement.php:469
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:472
+#: src/TouchPoint-WP/Involvement.php:474
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:479
+#: src/TouchPoint-WP/Involvement.php:481
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:485
+#: src/TouchPoint-WP/Involvement.php:487
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1499
+#: src/TouchPoint-WP/Involvement.php:1571
 #: src/TouchPoint-WP/Partner.php:787
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1707
+#: src/TouchPoint-WP/Involvement.php:1779
 #: src/TouchPoint-WP/Partner.php:809
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3245
+#: src/TouchPoint-WP/Involvement.php:3344
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3248
+#: src/TouchPoint-WP/Involvement.php:3347
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3319
+#: src/TouchPoint-WP/Involvement.php:3418
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3326
-#: src/TouchPoint-WP/Involvement.php:3364
+#: src/TouchPoint-WP/Involvement.php:3425
+#: src/TouchPoint-WP/Involvement.php:3463
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3331
+#: src/TouchPoint-WP/Involvement.php:3430
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3335
+#: src/TouchPoint-WP/Involvement.php:3434
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3340
+#: src/TouchPoint-WP/Involvement.php:3439
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3343
+#: src/TouchPoint-WP/Involvement.php:3442
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3346
+#: src/TouchPoint-WP/Involvement.php:3445
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3349
+#: src/TouchPoint-WP/Involvement.php:3448
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3358
+#: src/TouchPoint-WP/Involvement.php:3457
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3376
-#: src/TouchPoint-WP/Partner.php:1283
+#: src/TouchPoint-WP/Involvement.php:3475
+#: src/TouchPoint-WP/Partner.php:1282
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
@@ -292,7 +292,7 @@ msgstr "Muestra en el mapa"
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1224
+#: src/TouchPoint-WP/Partner.php:1223
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -308,43 +308,43 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:536
-#: src/TouchPoint-WP/Rsvp.php:84
+#: src/TouchPoint-WP/Meeting.php:544
+#: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1928
+#: src/TouchPoint-WP/TouchPointWP.php:1924
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1985
+#: src/TouchPoint-WP/TouchPointWP.php:1981
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1988
+#: src/TouchPoint-WP/TouchPointWP.php:1984
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1991
+#: src/TouchPoint-WP/TouchPointWP.php:1987
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1996
-#: src/TouchPoint-WP/TouchPointWP.php:1997
+#: src/TouchPoint-WP/TouchPointWP.php:1992
+#: src/TouchPoint-WP/TouchPointWP.php:1993
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2125
-#: src/TouchPoint-WP/TouchPointWP.php:2170
+#: src/TouchPoint-WP/TouchPointWP.php:2121
+#: src/TouchPoint-WP/TouchPointWP.php:2166
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2133
-#: src/TouchPoint-WP/TouchPointWP.php:2177
+#: src/TouchPoint-WP/TouchPointWP.php:2129
+#: src/TouchPoint-WP/TouchPointWP.php:2173
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2297
+#: src/TouchPoint-WP/TouchPointWP.php:2293
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -798,24 +798,24 @@ msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1310
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1311
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1306
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1574
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1586
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1708
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1747
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1759
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -983,7 +983,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2238
+#: src/TouchPoint-WP/TouchPointWP.php:2234
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1038,16 +1038,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1672
+#: src/TouchPoint-WP/Involvement.php:1744
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1685
+#: src/TouchPoint-WP/Involvement.php:1757
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1556
+#: src/TouchPoint-WP/Involvement.php:1628
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1209,67 +1209,68 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1673
+#: src/TouchPoint-WP/Involvement.php:1745
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1674
+#: src/TouchPoint-WP/Involvement.php:1746
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1715
+#: src/TouchPoint-WP/Involvement.php:1787
 #: src/TouchPoint-WP/Partner.php:825
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1718
+#: src/TouchPoint-WP/Involvement.php:1790
 #: src/TouchPoint-WP/Partner.php:828
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:880
-#: src/TouchPoint-WP/Involvement.php:900
+#: src/TouchPoint-WP/Involvement.php:929
+#: src/TouchPoint-WP/Involvement.php:958
+#: src/TouchPoint-WP/Utilities/DateFormats.php:317
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:908
+#: src/TouchPoint-WP/Involvement.php:967
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:915
+#: src/TouchPoint-WP/Involvement.php:974
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:925
+#: src/TouchPoint-WP/Involvement.php:984
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:931
+#: src/TouchPoint-WP/Involvement.php:990
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:940
+#: src/TouchPoint-WP/Involvement.php:999
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:946
+#: src/TouchPoint-WP/Involvement.php:1005
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3266
+#: src/TouchPoint-WP/Involvement.php:3365
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1286,35 +1287,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1811
+#: src/TouchPoint-WP/Involvement.php:1883
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1821
+#: src/TouchPoint-WP/Involvement.php:1893
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1840
+#: src/TouchPoint-WP/Involvement.php:1912
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:469
-#: src/TouchPoint-WP/TouchPointWP.php:973
+#: src/TouchPoint-WP/Meeting.php:477
+#: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:497
+#: src/TouchPoint-WP/Meeting.php:505
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:507
+#: src/TouchPoint-WP/Meeting.php:515
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3463
-#: src/TouchPoint-WP/Involvement.php:3560
+#: src/TouchPoint-WP/Involvement.php:3562
+#: src/TouchPoint-WP/Involvement.php:3659
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1434,7 +1435,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1599
+#: src/TouchPoint-WP/Involvement.php:1671
 msgid "Language"
 msgstr "Idioma"
 
@@ -1487,7 +1488,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3547
+#: src/TouchPoint-WP/Involvement.php:3646
 #: src/TouchPoint-WP/Person.php:1798
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1512,7 +1513,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3537
+#: src/TouchPoint-WP/Involvement.php:3636
 #: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1578,15 +1579,18 @@ msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones dis
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:51
+#: src/TouchPoint-WP/Utilities/DateFormats.php:85
+#: src/TouchPoint-WP/Utilities/DateFormats.php:157
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:53
+#: src/TouchPoint-WP/Utilities/DateFormats.php:87
+#: src/TouchPoint-WP/Utilities/DateFormats.php:159
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:59
+#: src/TouchPoint-WP/Utilities/DateFormats.php:93
+#: src/TouchPoint-WP/Utilities/DateFormats.php:165
 msgid "Tomorrow"
 msgstr "mañana"
 
@@ -1594,58 +1598,58 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:428
+#: src/TouchPoint-WP/Utilities.php:458
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:385
+#: src/TouchPoint-WP/Meeting.php:393
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:386
+#: src/TouchPoint-WP/Meeting.php:394
 msgid "Scheduled"
 msgstr "Programado"
 
-#. translators: %1s is "Monday".  %2s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:76
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:110
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
-#. translators: %1s is "Monday".  %2s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:82
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:116
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+#: src/TouchPoint-WP/Utilities/DateFormats.php:122
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
-#. translators: %1s is "Monday".  %2s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:93
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:127
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:141
+#: src/TouchPoint-WP/CalendarGrid.php:149
 msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3388
+#: src/TouchPoint-WP/Involvement.php:3487
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:277
+#: src/TouchPoint-WP/Meeting.php:283
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:330
+#: src/TouchPoint-WP/Meeting.php:338
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1690,27 +1694,108 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:66
+#: src/TouchPoint-WP/Utilities/DateFormats.php:100
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:67
+#: src/TouchPoint-WP/Utilities/DateFormats.php:101
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:69
+#: src/TouchPoint-WP/Utilities/DateFormats.php:103
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:70
+#: src/TouchPoint-WP/Utilities/DateFormats.php:104
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:387
+#: src/TouchPoint-WP/Meeting.php:395
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
+
+#: src/TouchPoint-WP/Involvement.php:132
+msgid "Creating an Involvement object from an object without a post_id is not yet supported."
+msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
+
+#. translators: "Mon All Day"  or  "Sundays All Day"
+#: src/TouchPoint-WP/Involvement.php:932
+#: src/TouchPoint-WP/Involvement.php:953
+msgid "%1$s All Day"
+msgstr "todo el dia los %1$s"
+
+#: src/TouchPoint-WP/Meeting.php:84
+msgid "Creating a Meeting object from an object without a post_id is not yet supported."
+msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
+
+#. translators: %1$s is the start time, %2$s is the end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:55
+#: src/TouchPoint-WP/Utilities/DateFormats.php:258
+#: src/TouchPoint-WP/Utilities/DateFormats.php:296
+msgid "%1$s &ndash; %2$s"
+msgstr "%1$s &ndash; %2$s"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:172
+msgctxt "Short date string for day of the week, when the year is current."
+msgid "D"
+msgstr "D"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+msgctxt "Short date string when the year is current."
+msgid "M j"
+msgstr "j M"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:175
+msgctxt "Short date string for day of the week, when the year is not current."
+msgid "D"
+msgstr "D"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:176
+msgctxt "Short date string when the year is not current."
+msgid "M j, Y"
+msgstr "j M Y"
+
+#. Translators: %1$s is the start date, %2$s is the end date.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:250
+msgid "%1$s &ndash; %1$s"
+msgstr "%1$s &ndash; %1$s"
+
+#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:265
+#: src/TouchPoint-WP/Utilities/DateFormats.php:330
+msgid "%1$s at %2$s &ndash; %3$s at %4$s"
+msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:182
+msgctxt "Short date format string"
+msgid "Last %1$s, %2$s"
+msgstr "el pasado %1$s %2$s"
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:188
+msgctxt "Short date format string"
+msgid "This %1$s, %2$s"
+msgstr "este %1$s %2$s"
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+msgctxt "Short date format string"
+msgid "Next %1$s, %2$s"
+msgstr "proximo %1$s %2$s"
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:199
+msgctxt "Short date format string"
+msgid "%1$s, %2$s"
+msgstr "%1$s %2$s"
+
+#. Translators: %s is the plural name of the of the Meetings, such as "Events".
+#: src/TouchPoint-WP/CalendarGrid.php:212
+msgid "There are no %s published for this month."
+msgstr "No hay %s publicados para este mes."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 98cdabe2..1b699caf 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-04-29T13:24:58+00:00\n"
+"POT-Creation-Date: 2024-05-07T23:13:28+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -122,8 +122,8 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:537
-#: src/TouchPoint-WP/Rsvp.php:79
+#: src/TouchPoint-WP/Meeting.php:545
+#: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
 msgid "Loading..."
@@ -158,13 +158,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1624
+#: src/TouchPoint-WP/Involvement.php:1696
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1650
+#: src/TouchPoint-WP/Involvement.php:1722
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -252,7 +252,7 @@ msgstr ""
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
 #: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1870
+#: src/TouchPoint-WP/Involvement.php:1942
 msgid "No %s Found."
 msgstr ""
 
@@ -264,7 +264,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3266
+#: src/TouchPoint-WP/Involvement.php:3365
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -287,10 +287,15 @@ msgid "Session could not be validated."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:141
+#: src/TouchPoint-WP/CalendarGrid.php:149
 msgid "%s is cancelled."
 msgstr ""
 
+#. Translators: %s is the plural name of the of the Meetings, such as "Events".
+#: src/TouchPoint-WP/CalendarGrid.php:212
+msgid "There are no %s published for this month."
+msgstr ""
+
 #: src/TouchPoint-WP/EventsCalendar.php:61
 msgid "Recurring"
 msgstr ""
@@ -299,235 +304,250 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:467
+#: src/TouchPoint-WP/Involvement.php:132
+msgid "Creating an Involvement object from an object without a post_id is not yet supported."
+msgstr ""
+
+#: src/TouchPoint-WP/Involvement.php:469
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:472
+#: src/TouchPoint-WP/Involvement.php:474
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:479
+#: src/TouchPoint-WP/Involvement.php:481
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:485
+#: src/TouchPoint-WP/Involvement.php:487
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:880
-#: src/TouchPoint-WP/Involvement.php:900
+#: src/TouchPoint-WP/Involvement.php:929
+#: src/TouchPoint-WP/Involvement.php:958
+#: src/TouchPoint-WP/Utilities/DateFormats.php:317
 msgid "%1$s at %2$s"
 msgstr ""
 
+#. translators: "Mon All Day"  or  "Sundays All Day"
+#: src/TouchPoint-WP/Involvement.php:932
+#: src/TouchPoint-WP/Involvement.php:953
+msgid "%1$s All Day"
+msgstr ""
+
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:908
+#: src/TouchPoint-WP/Involvement.php:967
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:915
+#: src/TouchPoint-WP/Involvement.php:974
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:925
+#: src/TouchPoint-WP/Involvement.php:984
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:931
+#: src/TouchPoint-WP/Involvement.php:990
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:940
+#: src/TouchPoint-WP/Involvement.php:999
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:946
+#: src/TouchPoint-WP/Involvement.php:1005
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1499
+#: src/TouchPoint-WP/Involvement.php:1571
 #: src/TouchPoint-WP/Partner.php:787
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1556
+#: src/TouchPoint-WP/Involvement.php:1628
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1599
+#: src/TouchPoint-WP/Involvement.php:1671
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1672
+#: src/TouchPoint-WP/Involvement.php:1744
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1673
+#: src/TouchPoint-WP/Involvement.php:1745
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1674
+#: src/TouchPoint-WP/Involvement.php:1746
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1685
+#: src/TouchPoint-WP/Involvement.php:1757
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1707
+#: src/TouchPoint-WP/Involvement.php:1779
 #: src/TouchPoint-WP/Partner.php:809
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1715
+#: src/TouchPoint-WP/Involvement.php:1787
 #: src/TouchPoint-WP/Partner.php:825
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1718
+#: src/TouchPoint-WP/Involvement.php:1790
 #: src/TouchPoint-WP/Partner.php:828
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1811
+#: src/TouchPoint-WP/Involvement.php:1883
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1821
+#: src/TouchPoint-WP/Involvement.php:1893
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1840
+#: src/TouchPoint-WP/Involvement.php:1912
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3245
+#: src/TouchPoint-WP/Involvement.php:3344
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3248
+#: src/TouchPoint-WP/Involvement.php:3347
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3319
+#: src/TouchPoint-WP/Involvement.php:3418
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3326
-#: src/TouchPoint-WP/Involvement.php:3364
+#: src/TouchPoint-WP/Involvement.php:3425
+#: src/TouchPoint-WP/Involvement.php:3463
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3331
+#: src/TouchPoint-WP/Involvement.php:3430
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3335
+#: src/TouchPoint-WP/Involvement.php:3434
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3340
+#: src/TouchPoint-WP/Involvement.php:3439
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3343
+#: src/TouchPoint-WP/Involvement.php:3442
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3346
+#: src/TouchPoint-WP/Involvement.php:3445
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3349
+#: src/TouchPoint-WP/Involvement.php:3448
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3358
+#: src/TouchPoint-WP/Involvement.php:3457
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3376
-#: src/TouchPoint-WP/Partner.php:1283
+#: src/TouchPoint-WP/Involvement.php:3475
+#: src/TouchPoint-WP/Partner.php:1282
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3388
+#: src/TouchPoint-WP/Involvement.php:3487
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3463
-#: src/TouchPoint-WP/Involvement.php:3560
+#: src/TouchPoint-WP/Involvement.php:3562
+#: src/TouchPoint-WP/Involvement.php:3659
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3537
+#: src/TouchPoint-WP/Involvement.php:3636
 #: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3547
+#: src/TouchPoint-WP/Involvement.php:3646
 #: src/TouchPoint-WP/Person.php:1798
 msgid "Contact Prohibited."
 msgstr ""
 
+#: src/TouchPoint-WP/Meeting.php:84
+msgid "Creating a Meeting object from an object without a post_id is not yet supported."
+msgstr ""
+
 #: src/TouchPoint-WP/Meeting.php:205
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:277
+#: src/TouchPoint-WP/Meeting.php:283
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:330
+#: src/TouchPoint-WP/Meeting.php:338
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:385
+#: src/TouchPoint-WP/Meeting.php:393
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:386
+#: src/TouchPoint-WP/Meeting.php:394
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:387
+#: src/TouchPoint-WP/Meeting.php:395
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:469
-#: src/TouchPoint-WP/TouchPointWP.php:973
+#: src/TouchPoint-WP/Meeting.php:477
+#: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:497
+#: src/TouchPoint-WP/Meeting.php:505
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:507
+#: src/TouchPoint-WP/Meeting.php:515
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:536
-#: src/TouchPoint-WP/Rsvp.php:84
+#: src/TouchPoint-WP/Meeting.php:544
+#: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
 
@@ -536,7 +556,7 @@ msgstr ""
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1224
+#: src/TouchPoint-WP/Partner.php:1223
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -684,42 +704,42 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1928
+#: src/TouchPoint-WP/TouchPointWP.php:1924
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1985
+#: src/TouchPoint-WP/TouchPointWP.php:1981
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1988
+#: src/TouchPoint-WP/TouchPointWP.php:1984
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1991
+#: src/TouchPoint-WP/TouchPointWP.php:1987
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1996
-#: src/TouchPoint-WP/TouchPointWP.php:1997
+#: src/TouchPoint-WP/TouchPointWP.php:1992
+#: src/TouchPoint-WP/TouchPointWP.php:1993
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2125
-#: src/TouchPoint-WP/TouchPointWP.php:2170
+#: src/TouchPoint-WP/TouchPointWP.php:2121
+#: src/TouchPoint-WP/TouchPointWP.php:2166
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2133
-#: src/TouchPoint-WP/TouchPointWP.php:2177
+#: src/TouchPoint-WP/TouchPointWP.php:2129
+#: src/TouchPoint-WP/TouchPointWP.php:2173
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2238
+#: src/TouchPoint-WP/TouchPointWP.php:2234
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2297
+#: src/TouchPoint-WP/TouchPointWP.php:2293
 msgid "People Query Failed"
 msgstr ""
 
@@ -1319,24 +1339,24 @@ msgstr ""
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1310
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1311
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1306
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1574
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1586
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1708
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1747
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1759
 msgid "Save Settings"
 msgstr ""
 
@@ -1445,66 +1465,131 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:428
+#: src/TouchPoint-WP/Utilities.php:458
 msgid "Expand"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:51
+#. translators: %1$s is the start time, %2$s is the end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:55
+#: src/TouchPoint-WP/Utilities/DateFormats.php:258
+#: src/TouchPoint-WP/Utilities/DateFormats.php:296
+msgid "%1$s &ndash; %2$s"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:85
+#: src/TouchPoint-WP/Utilities/DateFormats.php:157
 msgid "Tonight"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:53
+#: src/TouchPoint-WP/Utilities/DateFormats.php:87
+#: src/TouchPoint-WP/Utilities/DateFormats.php:159
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:59
+#: src/TouchPoint-WP/Utilities/DateFormats.php:93
+#: src/TouchPoint-WP/Utilities/DateFormats.php:165
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:66
+#: src/TouchPoint-WP/Utilities/DateFormats.php:100
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:67
+#: src/TouchPoint-WP/Utilities/DateFormats.php:101
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:69
+#: src/TouchPoint-WP/Utilities/DateFormats.php:103
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:70
+#: src/TouchPoint-WP/Utilities/DateFormats.php:104
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
-#. translators: %1s is "Monday".  %2s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:76
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:110
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
-#. translators: %1s is "Monday".  %2s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:82
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:116
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+#: src/TouchPoint-WP/Utilities/DateFormats.php:122
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
-#. translators: %1s is "Monday".  %2s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:93
+#. translators: %1$s is "Monday".  %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:127
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
+#: src/TouchPoint-WP/Utilities/DateFormats.php:172
+msgctxt "Short date string for day of the week, when the year is current."
+msgid "D"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+msgctxt "Short date string when the year is current."
+msgid "M j"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:175
+msgctxt "Short date string for day of the week, when the year is not current."
+msgid "D"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:176
+msgctxt "Short date string when the year is not current."
+msgid "M j, Y"
+msgstr ""
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:182
+msgctxt "Short date format string"
+msgid "Last %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:188
+msgctxt "Short date format string"
+msgid "This %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+msgctxt "Short date format string"
+msgid "Next %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Mon".  %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:199
+msgctxt "Short date format string"
+msgid "%1$s, %2$s"
+msgstr ""
+
+#. Translators: %1$s is the start date, %2$s is the end date.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:250
+msgid "%1$s &ndash; %1$s"
+msgstr ""
+
+#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:265
+#: src/TouchPoint-WP/Utilities/DateFormats.php:330
+msgid "%1$s at %2$s &ndash; %3$s at %4$s"
+msgstr ""
+
 #: assets/js/base-defer.js:212
 #: assets/js/base-defer.js:1168
 msgid "Your Location"

From b426a6e1282e1f9f5714ad42d40f03588aeb957b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:16:53 -0400
Subject: [PATCH 102/423] Removing unused consts

---
 src/TouchPoint-WP/Report.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index e4d9bf8f..e9d31de0 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -36,8 +36,8 @@ class Report implements api, module, JsonSerializable, updatesViaCron
 	public const NAME_META_KEY = self::META_PREFIX . "name";
 	public const P1_META_KEY = self::META_PREFIX . "p1";
 	public const DEFAULT_CONTENT = '';
-    public const FIGURE_CLASS_FILTER = TouchPointWP::SETTINGS_PREFIX . "rpt_figure_class";
-    public const FIGURE_CLASS_DEFAULT = "TouchPoint-report";
+
+	public static string $classDefault = "TouchPoint-report";
 
 
 	public static bool $_isLoaded = false;

From 44a1087c790a411e4eb07895354ade5bbed9dc9b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 7 May 2024 22:17:38 -0400
Subject: [PATCH 103/423] Closes #177

---
 .github/workflows/releases.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 5d315037..4d3ebffc 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -36,4 +36,17 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./touchpoint-wp.zip
           asset_name: touchpoint-wp.zip
-          asset_content_type: application/zip
\ No newline at end of file
+          asset_content_type: application/zip
+
+  docs:
+    name: Update Documentation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Permissions
+        run: chmod +x build.sh
+        shell: bash
+      - name: Generate Docs
+        run: php ./generateDocs.php
+        shell: bash
\ No newline at end of file

From 05e25fa01ca6abeff6d8174c9ce3c8786ad4ab38 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:22:30 -0400
Subject: [PATCH 104/423] Calendar grid styling

---
 ...ndar-style.css => calendar-grid-style.css} |   5 +
 assets/template/partials-template-style.css   |   6 +
 src/TouchPoint-WP/CalendarGrid.php            | 109 ++++++++++++++----
 src/TouchPoint-WP/Utilities.php               |  17 +++
 4 files changed, 116 insertions(+), 21 deletions(-)
 rename assets/template/{calendar-style.css => calendar-grid-style.css} (92%)

diff --git a/assets/template/calendar-style.css b/assets/template/calendar-grid-style.css
similarity index 92%
rename from assets/template/calendar-style.css
rename to assets/template/calendar-grid-style.css
index 922a44b0..50f22b6a 100644
--- a/assets/template/calendar-style.css
+++ b/assets/template/calendar-grid-style.css
@@ -59,6 +59,11 @@ div.calGrid div.calDay.after {
         margin-bottom: 1em;
     }
 
+    div.calGrid div.calDay > a.event.notFirstDay,
+    div.calGrid div.calDay.noFirstDays {
+        display: none;
+    }
+
     div.calGrid div.calWeekdayHead,
     div.calGrid div.calDay.before,
     div.calGrid div.calDay.empty,
diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index a3294d0f..e65ec75c 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -194,6 +194,12 @@ article .TouchPointWP-detail-cell.TouchPointWP-map-container {
     padding-bottom: 30%;
 }
 
+main.TouchPointWP-main {
+    max-width: 1200px;
+    margin: auto;
+    padding: 0 1em;
+}
+
 article .TouchPointWP-detail-cell .TouchPointWP-detail-cell-section {
     text-align:center;
     margin-bottom: 2em;
diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 80db87f9..8617916f 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -46,6 +46,13 @@ class CalendarGrid {
 	 */
 	public string $monthName;
 
+	/**
+	 * The number of events included in the grid.  Used for the "no events" logic.
+	 * 
+	 * @var int 
+	 */
+	public int $eventCount = 0;
+
 
 	/**
 	 * Create a calendar grid for a given month and year.
@@ -75,7 +82,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		$firstDayOfMonth = DateTimeImmutable::createFromMutable($d);
 		$lastDayOfMonth = DateTimeImmutable::createFromMutable($d);
 
-		$this->monthName = date_i18n("F", $d->getTimestamp());
+		$this->monthName = self::getMonthNameForDate($d);
 
 		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
 		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
@@ -91,13 +98,12 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		$isMonthBefore = ($offsetDays !== 0);
 		$isMonthAfter = false;
 		$aDay = new DateInterval("P1D");
-		$dateFormat = get_option('date_format');
 
 		// Loop through the days of the month
 		do {
-			$day = $d->format("j");
-			$fullDay = $d->format($dateFormat);
-			$wd =  $d->format("w");
+			$day = date_i18n("j", $d->getTimestamp());
+			$fullDay = DateFormats::DateStringFormatted($d);
+			$wd =  date_i18n("w", $d->getTimestamp());
 
 			try {
 				$newQ = self::adjustQueryForDay($q, $d, $tz);
@@ -105,8 +111,12 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 				$cellClass = ["calDay"];
 				if ($isMonthBefore) {
 					$cellClass[] = "before";
+					$adder = 0;
 				} elseif ($isMonthAfter) {
 					$cellClass[] = "after";
+					$adder = 0;
+				} else {
+					$adder = 1;
 				}
 
 				$posts = $newQ->get_posts();
@@ -121,31 +131,55 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 				$cellClass[] = "weekday-$wd";
 
-				$cellClass = implode(" ", $cellClass);
-
-				// Print the cell
-				$r .= "<div class=\"$cellClass\">";
-				$r .= "<h3 class=\"calDayHead\">$fullDay</h3>";
-				$r .= "<span class=\"calDayNum\">$day</span>";
+				$dayHtml = "";
+				$hasFirstDays = false;
 
 				foreach ($posts as $e) {
 					$m = Meeting::fromPost($e);
 
 					$link = $m->permalink();
 
+					$notFirstDay = $m->startDt < $d;
+
+					$attr = "";
+					$status = $m->status();
+
+					if ($status === "cancelled") {
+						// Translators: %s is the singular name of the of a Meeting, such as "Event".
+						$title = wp_sprintf(__("%s is cancelled.", "TouchPoint-WP"), TouchPointWP::instance()->settings->mc_name_singular);
+						$attr = "title=\"$title\"";
+					}
+
 					$classes = "event ";
-					$classes .= $m->status() . " ";
+					$classes .= $status . " ";
 					$classes .= $m->tense();
-					if ($m->isFeatured()) {
+					if ($m->isFeatured() && !$notFirstDay) {
 						$classes .= " feat";
 					}
-					if ($m->startDt < $d) {
+					if ($notFirstDay) {
 						$classes .= " notFirstDay";
+						$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr><span class=\"title\">$e->post_title</span></a>";
+					} else {
+						$hasFirstDays = true;
+						$this->eventCount += $adder;
+						$ts = $m->startTimeString();
+						$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr><span class=\"time\">$ts</span> <span class=\"title\">$e->post_title</span></a>";
 					}
-					$ts = $m->startTimeString();
-					$r .= "<a href=\"$link\" class=\"$classes\"><span class=\"time\">$ts</span> <span class=\"title\">$e->post_title</span></a>";
 				}
 
+				if (!$hasFirstDays) {
+					$cellClass[] = "noFirstDays";
+				}
+
+				$cellClass = implode(" ", $cellClass);
+
+				// Print the cell
+				$r .= "<div class=\"$cellClass\">";
+				$r .= "<h3 class=\"calDayHead\">$fullDay</h3>";
+				$r .= "<span class=\"calDayNum\">$day</span>";
+
+				$r .= $dayHtml;
+
 				$r .= "</div>";
 
 			} catch (Exception $e) {
@@ -171,7 +205,13 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		} while (!$isMonthAfter || $d->format('w') !== '0');
 		$r .= '</div>';
 
-		$this->html = $r;
+		if ($this->eventCount > 0) {
+			$this->html = $r;
+		} else {
+			// Translators: %s is the plural name of the of the Meetings, such as "Events".
+			$message = wp_sprintf(__("There are no %s published for this month.", "TouchPoint-WP"), TouchPointWP::instance()->settings->mc_name_plural);
+			$this->html = "<div class=\"calGrid noEvents\">$message</div>";
+		}
 
 		$this->next = $lastDayOfMonth->add($aDay);
 		$this->prev = $firstDayOfMonth->sub($aDay);
@@ -184,9 +224,23 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 	 */
 	public function __toString(): string
 	{
+		self::enqueueCalendarStyle();
 		return $this->html;
 	}
 
+	/**
+	 * This function enqueues the stylesheet for the calendar grid.
+	 */
+	public static function enqueueCalendarStyle(): void
+	{
+		wp_enqueue_style(
+			TouchPointWP::SHORTCODE_PREFIX . 'calendar-grid-style',
+			TouchPointWP::instance()->assets_url . 'template/calendar-grid-style.css',
+			[],
+			TouchPointWP::VERSION
+		);
+	}
+
 	/**
 	 * This method returns a navigation bar for the calendar grid with simply next/prev month links.
 	 *
@@ -296,7 +350,7 @@ private static function adjustQueryForDay(WP_Query $q, DateTimeInterface $d, Dat
 	 */
 	public function getNextLink(): string
 	{
-		return $this->getLinkForDate($this->next);
+		return self::getLinkForDate($this->next);
 	}
 
 	/**
@@ -306,7 +360,7 @@ public function getNextLink(): string
 	 */
 	public function getPrevLink(): string
 	{
-		return $this->getLinkForDate($this->prev);
+		return self::getLinkForDate($this->prev);
 	}
 
 	/**
@@ -317,14 +371,27 @@ public function getPrevLink(): string
 	 *
 	 * @return string
 	 */
-	protected function getLinkForDate(DateTimeInterface $date): string
+	protected static function getLinkForDate(DateTimeInterface $date): string
 	{
 		$link = "?page=" . $date->format('m-Y');
+		$label = self::getMonthNameForDate($date);
+		return "<a href=\"$link\">$label</a>";
+	}
+
+	/**
+	 * Get the name of the month for a given date, with the year if different from current year.
+	 *
+	 * @param DateTimeInterface $date
+	 *
+	 * @return string
+	 */
+	protected static function getMonthNameForDate(DateTimeInterface $date): string
+	{
 		if ($date->format('Y') === Utilities::dateTimeNow()->format('Y')) {
 			$label = date_i18n('F', $date->getTimestamp());
 		} else {
 			$label = date_i18n('F Y', $date->getTimestamp());
 		}
-		return "<a href=\"$link\">$label</a>";
+		return $label;
 	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 2102f431..f991d0ea 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -675,6 +675,23 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		return apply_filters('tp_post_standardize_html', $html, $context);
 	}
 
+	/**
+	 * Sometimes WordPress tries to be smarter than we want it to be.
+	 *
+	 * THIS DOES NOT DO ANY KIND OF VALIDATION OR REPLACEMENT.  It is assumed that the input is already completely ready
+	 * to go and won't cause collisions.
+	 *
+	 * @param $postId
+	 * @param $newSlug
+	 *
+	 * @return void
+	 */
+	public static function forceSlugUpdate($postId, $newSlug): void
+	{
+		global $wpdb;
+		$wpdb->update($wpdb->posts, ['post_name' => $newSlug], ['ID' => $postId]);
+	}
+
 	/**
 	 * Returns true if a new release is available.
 	 *

From ec1e5ec152e920d51f22c181583fe4a2ae321d7c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:23:48 -0400
Subject: [PATCH 105/423] Adding schedule end datetimes

---
 src/python/WebApi.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 6b78d064..4809fad3 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -357,7 +357,8 @@ def get_person_info_for_sync(person_obj):
         cteSchedule AS
         (SELECT cto.OrganizationId, 
             (
-            SELECT FORMAT(os.NextMeetingDate, 'yyyy-MM-ddTHH:mm:ss') as nextStartDt
+            SELECT FORMAT(os.NextMeetingDate, 'yyyy-MM-ddTHH:mm:ss') as nextStartDt,
+                FORMAT(DATEADD(minute, os.DurationMins, os.NextMeetingDate), 'yyyy-MM-ddTHH:mm:ss') as nextEndDt
             FROM dbo.OrgSchedule os WITH(NOLOCK)
                 INNER JOIN cteTargetOrgs o
                     ON os.OrganizationId = o.OrganizationId

From 9e3373d43acaf465bc441eca79fc5a0993a0d66c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:28:16 -0400
Subject: [PATCH 106/423] Resolving an issue that prevented involvements from
 initializing correctly in JS.

---
 src/TouchPoint-WP/jsInstantiation.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/jsInstantiation.php b/src/TouchPoint-WP/jsInstantiation.php
index 5b6d6855..43023af6 100644
--- a/src/TouchPoint-WP/jsInstantiation.php
+++ b/src/TouchPoint-WP/jsInstantiation.php
@@ -5,13 +5,19 @@
 
 namespace tp\TouchPointWP;
 
+use Closure;
+
 if ( ! defined('ABSPATH')) {
 	exit(1);
 }
 
 
 /**
- * Used for client-side instantiation
+ * Used for client-side instantiation.
+ *
+ * Note that classes that use this trait will likely also need to implement the JsonSerialize interface (implementation
+ * is provided here).
+ * 
  */
 trait jsInstantiation
 {
@@ -78,6 +84,19 @@ public static function requireAllObjectsInJs(bool $require = true): void
 		self::$requireAllObjectsInJs = $require;
 	}
 
+	/**
+	 * Get the JS for instantiation.
+	 *
+	 * @return object
+	 */
+	public function jsonSerialize(): object
+	{
+		$item = Closure::fromCallable("get_object_vars")->__invoke($this);
+		$item['post_id'] = $this->post_id();
+
+		return (object)$item;
+	}
+
 	/**
 	 * Gets a TouchPoint item ID number, regardless of what type of object this is.
 	 *

From ad8f5d46887e05c20b382f26a8d035584706d6d5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:32:36 -0400
Subject: [PATCH 107/423] Change post_id to be protected to prevent overwriting

---
 src/TouchPoint-WP/jsInstantiation.php | 1 +
 src/TouchPoint-WP/jsonLd.php          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/jsInstantiation.php b/src/TouchPoint-WP/jsInstantiation.php
index 43023af6..2644c204 100644
--- a/src/TouchPoint-WP/jsInstantiation.php
+++ b/src/TouchPoint-WP/jsInstantiation.php
@@ -91,6 +91,7 @@ public static function requireAllObjectsInJs(bool $require = true): void
 	 */
 	public function jsonSerialize(): object
 	{
+		// TODO PHP 8.1: rework closure method to 8.1+ standard
 		$item = Closure::fromCallable("get_object_vars")->__invoke($this);
 		$item['post_id'] = $this->post_id();
 
diff --git a/src/TouchPoint-WP/jsonLd.php b/src/TouchPoint-WP/jsonLd.php
index 211107ea..e5e3c986 100644
--- a/src/TouchPoint-WP/jsonLd.php
+++ b/src/TouchPoint-WP/jsonLd.php
@@ -46,7 +46,7 @@ protected function enqueueForJsonLdInstantiation(): bool
 	 */
 	public function getPermalink(): string
 	{
-		return get_permalink($this->post_id);
+		return get_permalink($this->post_id());
 	}
 
 	/**

From 2b2c663fbf089be49d96cdda6316a47c8fa4a681 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:32:49 -0400
Subject: [PATCH 108/423] Add registration types as an enum

---
 src/TouchPoint-WP/RegistrationType.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/TouchPoint-WP/RegistrationType.php

diff --git a/src/TouchPoint-WP/RegistrationType.php b/src/TouchPoint-WP/RegistrationType.php
new file mode 100644
index 00000000..447ebbf6
--- /dev/null
+++ b/src/TouchPoint-WP/RegistrationType.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+/**
+ * an enum.
+ *
+ * TODO PHP 8.1: convert to enum
+ */
+abstract class RegistrationType
+{
+	const CLOSED = 0;
+	const JOIN = 1;
+	const FORM = 2;
+	const RSVP = 3;
+	const EXTERNAL = 9;
+}
\ No newline at end of file

From 4f09b070ef30572e2f0f38905454c2581b19bf85 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:35:01 -0400
Subject: [PATCH 109/423] Add link to people profiles in TouchPoint.

---
 src/TouchPoint-WP/Person.php | 59 +++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 5f08e0fe..6949665c 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -27,6 +27,7 @@
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
 use tp\TouchPointWP\Utilities\Session;
+use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Term;
 use WP_User;
 
@@ -1172,7 +1173,7 @@ protected function resCode(): ?WP_Term
 	 *
 	 * @return string
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = ""): string
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true): string
 	{
 		TouchPointWP::requireScript('swal2-defer');
 		TouchPointWP::requireScript('base-defer');
@@ -1182,12 +1183,19 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 			$btnClass = " class=\"$btnClass\"";
 		}
 
-		$ret = "";
+		$ret = new StringableArray();
 		if (self::allowContact()) {
 			$text = __("Contact", "TouchPoint-WP");
 			TouchPointWP::enqueueActionsStyle('person-contact');
 			self::enqueueUsersForJsInstantiation();
-			$ret = "<button type=\"button\" data-tp-action=\"contact\" $btnClass>$text</button>  ";
+			$ret[] = "<button type=\"button\" data-tp-action=\"contact\" $btnClass>$text</button>  ";
+		}
+
+		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
+			// Translators: %s is the system name.  "TouchPoint" by default.
+			$title  = sprintf(__("Person in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
+			$logo = TouchPointWP::TouchPointIcon();
+			$ret[]  = "<a href=\"{$this->getProfileUrl()}\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
 		}
 
 		/**
@@ -1366,20 +1374,42 @@ protected static function generateUserName(object $pData): string
 		return self::BACKUP_USER_PREFIX . $pData->PeopleId;
 	}
 
-	public function hasProfilePage(): bool
+	/**
+	 * Returns true if the person has posts and therefore has a user page.
+	 *
+	 * @return bool
+	 */
+	public function hasUserPage(): bool
 	{
 		return count_user_posts($this->ID) > 0;
 	}
 
-	public function getProfileUrl(): ?string
+
+	/**
+	 * Get the link to the person's author post page.
+	 *
+	 * @return ?string
+	 */
+	public function getUserUrl(): ?string
 	{
-		if ( ! ! apply_filters(TouchPointWP::HOOK_PREFIX . 'use_person_link', $this->hasProfilePage(), $this)) {
+		if ($this->hasUserPage()) {
 			return get_author_posts_url($this->ID);
 		} else {
 			return null;
 		}
 	}
 
+	/**
+	 * Returns the person's TouchPoint profile URL.
+	 *
+	 * @return ?string
+	 */
+	public function getProfileUrl(): ?string
+	{
+		$tpHost = TouchPointWP::instance()->host();
+		return "$tpHost/Person/$this->peopleId";
+	}
+
 	/**
 	 * Take an array of Person-ish objects and return a nicely human-readable list of names.
 	 *
@@ -1650,10 +1680,25 @@ private static function ajaxSrc(): void
 			];
 
 			$out['results'] = [];
+
+			$hasDupNames = false;
+			$names = [];
 			foreach ($data as $p) {
+				$name = "$p->goesBy $p->lastName";
+				if (in_array($name, $names)) {
+					$hasDupNames = true;
+					break;
+				} else {
+					$names[] = $name;
+				}
+			}
+
+			foreach ($data as $p) {
+				$showPid = $hasDupNames || str_contains($q['q'], $p->peopleId);
+
 				$out['results'][] = [
 					'id'   => $p->peopleId,
-					'text' => $p->goesBy . " " . $p->lastName
+					'text' => trim("$p->goesBy $p->lastName" . ($showPid ? " ($p->peopleId)" : ""))
 				];
 			}
 		} else {

From f6dee86b512e9410faa3816d27e79f01397ee232 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 09:35:13 -0400
Subject: [PATCH 110/423] Add link to people profiles in TouchPoint.

---
 src/templates/parts/person-list-item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/parts/person-list-item.php b/src/templates/parts/person-list-item.php
index 704d8002..e15eb78a 100644
--- a/src/templates/parts/person-list-item.php
+++ b/src/templates/parts/person-list-item.php
@@ -18,7 +18,7 @@
     <header class="entry-header">
         <div class="entry-header-inner">
             <?php
-            $link = $person->getProfileUrl();
+            $link = $person->getUserUrl();
             $useLink = $link !== null;
             if ($useLink) {
                 /** @noinspection HtmlUnknownTarget */

From 962db15294f88b80d1f410b1dcb0f3f6c3ce8c0d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 May 2024 13:35:35 -0400
Subject: [PATCH 111/423] Fixing a bug related to partner taxonomies

---
 src/TouchPoint-WP/Partner.php | 86 +++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index bda45068..d43fd23e 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -19,6 +19,7 @@
 use Exception;
 use JsonSerializable;
 use stdClass;
+use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Error;
 use WP_Post;
 use WP_Query;
@@ -27,10 +28,11 @@
 /**
  * An Outreach partner, corresponding to a family in TouchPoint.
  */
-class Partner implements api, JsonSerializable, updatesViaCron, hasGeo, module
+class Partner extends PostTypeCapable implements api, JsonSerializable, updatesViaCron, hasGeo, module
 {
 	use jsInstantiation {
 		jsInstantiation::enqueueForJsInstantiation as protected enqueueForJsInstantiationTrait;
+		jsonSerialize as public jsonSerializeTrait;
 	}
 	use extraValues;
 
@@ -60,10 +62,6 @@ class Partner implements api, JsonSerializable, updatesViaCron, hasGeo, module
 	public string $name;
 	protected int $familyId;
 
-	public int $post_id;
-	public string $post_excerpt;
-	protected WP_Post $post;
-
 	public const FAMILY_META_KEY = TouchPointWP::SETTINGS_PREFIX . "famId";
 
 	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . "partner";
@@ -377,6 +375,12 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
 			if ($post instanceof WP_Error) {
 				new TouchPointWP_WPError($post);
+
+				if ($verbose) {
+					var_dump($post);
+					echo "<hr />";
+				}
+
 				continue;
 			}
 
@@ -408,6 +412,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
 					TouchPointWP::queueFlushRewriteRules();
 				}
 				if ( !!$term && !!$term['term_id']) {
+					$term['term_id'] = intval($term['term_id']);
 					$termsToKeep[] = $term['term_id'];
 					// Apply term to post
 					wp_set_post_terms($post->ID, [$term['term_id']], Taxonomies::TAX_GP_CATEGORY, false);
@@ -550,7 +555,7 @@ public static function templateFilter(string $template): string
 		 * @param bool $value The value to return.  True will allow the default templates to be applied.
 		 * @param string $className The name of the class calling for the template.
 		 */
-		if (apply_filters('tp_use_default_templates', true, self::class)) {
+		if (!!apply_filters('tp_use_default_templates', true, self::class)) {
 			$postTypesToFilter        = self::POST_TYPE;
 			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
@@ -666,7 +671,17 @@ public static function listShortcode($params = [], string $content = ""): string
 		$params = shortcode_atts(
 			[
 				'class'      => self::$containerClass,
-				'includecss' => apply_filters(TouchPointWP::HOOK_PREFIX . 'use_css', true, self::class),
+
+				/**
+				 * Determines whether or not to automatically include the plugin-default CSS.  Return false to use your
+				 * own CSS instead.
+				 *
+				 * @since 0.0.15
+				 *
+				 * @param bool $useCss Whether or not to include the default CSS.  True = include
+				 * @param string $className The name of the current calling class.
+				 */
+				'includecss' => apply_filters('tp_use_css', true, self::class),
 				'itemclass'  => self::$itemClass,
 			],
 			$params,
@@ -762,7 +777,7 @@ protected static final function filterDropdownHtml($params = []): string
 		$params = shortcode_atts(
 			[
 				'class'              => "TouchPoint-Partner filterBar",
-				'filters'            => strtolower(implode(",", ["partner_category"])),
+				'filters'            => "partner_category",
 				'includeMapWarnings' => self::$_hasArchiveMap
 			],
 			$params,
@@ -1105,7 +1120,6 @@ public static function mapShortcode($params = [], string $content = ""): string
 				$script
 			);
 
-			// TODO move the style to a css file... or something.
 			$content = "<div class=\"TouchPoint-Partner-Map\" style=\"height: 100%; width: 100%; position: absolute; top: 0; left: 0; \" id=\"$mapDivId\"></div>";
 		} else {
 			$content = "<!-- Error: Partner map can only be used once per page. -->";
@@ -1194,29 +1208,46 @@ public static function getFamEvAsContent(string $ev, object $famObj, ?string $de
 	/**
 	 * Get notable attributes as strings.
 	 *
+	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 *
 	 * @return string[]
 	 */
-	public function notableAttributes(): array
+	public function notableAttributes(array $exclude = []): array
 	{
 		$r = [];
 
 		if ($this->decoupleLocation) {
-			$r[] = TouchPointWP::instance()->settings->global_name_singular_decoupled;
+			$r['secure'] = TouchPointWP::instance()->settings->global_name_singular_decoupled;
 		} elseif ($this->location !== "" && $this->location !== null) {
-			$r[] = $this->location;
+			$r['location'] = $this->location;
 		}
 
 		foreach ($this->category as $c) {
-			$r[] = $c->name;
+			$r['category'] = $c->name;
 		}
 
 		// Not shown on map (only if there is a map, and the partner isn't on it because they lack geo.)
 		if (self::$_hasArchiveMap && $this->geo === null && ! $this->decoupleLocation) {
-			$r[] = __("Not Shown on Map", "TouchPoint-WP");
+			$r['hidden'] = __("Not Shown on Map", "TouchPoint-WP");
 			TouchPointWP::requireScript("fontAwesome");  // For map icons
 		}
 
-		return apply_filters(TouchPointWP::HOOK_PREFIX . "partner_attributes", $r, $this);
+		$r = $this->processAttributeExclusions($r, $exclude);
+
+		/**
+		 * Allows for manipulation of the notable attributes strings for an Partner.  An array of strings.
+		 * Typically, these are the standardized strings that appear on the Partner to give information about it,
+		 * such as the type and location.
+		 *
+		 * @see Partner::notableAttributes()
+		 * @see PostTypeCapable::notableAttributes()
+		 *
+		 * @since 0.0.6
+		 *
+		 * @param string[] $attrs The list of notable attributes.
+		 * @param Partner $this The Partner object.
+		 */
+		return apply_filters("tp_partner_attributes", $r, $this);
 	}
 
 	/**
@@ -1241,14 +1272,15 @@ protected function enqueueForJsInstantiation(): bool
 	 * @param ?string $context A reference to where the action buttons are meant to be used.
 	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
 	 *     elements.
+	 * @param bool $withTouchPointLink Whether or not to include the TouchPoint link.  Default is true.
 	 *
-	 * @return string
+	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = ""): string
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true): StringableArray
 	{
 		$this->enqueueForJsInstantiation();
 
-		$ret = "";
+		$ret = new StringableArray();
 		if ($btnClass !== "") {
 			$btnClass = " class=\"$btnClass\"";
 		}
@@ -1256,9 +1288,11 @@ public function getActionButtons(string $context = null, string $btnClass = ""):
 		// Show on map button.  (Only works if map is called before this is.)
 		if (self::$_hasArchiveMap && ! $this->decoupleLocation && $this->geo !== null) {
 			$text = __("Show on Map", "TouchPoint-WP");
-			$ret  .= "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
+			$ret[] = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
 		}
 
+		// TouchPoint link is excluded for privacy, and because we don't really have People IDs readily available.
+
 		/**
 		 * Allows for manipulation of the action buttons for a Partner.  This is the list of buttons that appear
 		 * on the Partner to allow the user to interact with it.
@@ -1370,6 +1404,18 @@ protected function removeExtraValueWP(string $name): bool
 		return delete_post_meta($this->post_id, self::META_FEV_PREFIX . $name);
 	}
 
+	/**
+	 * Indicates if the given post can be instantiated as a Partner.
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return bool
+	 */
+	public static function postIsType(WP_Post $post): bool
+	{
+		return intval(get_post_meta($post->ID, self::FAMILY_META_KEY, true)) > 0;
+	}
+
 	/**
 	 * Serialize.  Mostly, manage the security requirements.
 	 *
@@ -1395,7 +1441,7 @@ public function jsonSerialize(): object
 			}
 		}
 
-		return $this;
+		return $this->jsonSerializeTrait();
 	}
 
 	/**

From 8366416111743d09a4e7706543a834d020bf3144 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 May 2024 12:07:50 -0400
Subject: [PATCH 112/423] Namespacing issue

---
 src/TouchPoint-WP/CalendarGrid.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 8617916f..f6367afd 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -119,9 +119,9 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 					$adder = 1;
 				}
 
-				$posts = $newQ->get_posts();
+				$calDayPosts = $newQ->get_posts();
 
-				if (count($posts) === 0) {
+				if (count($calDayPosts) === 0) {
 					$cellClass[] = "empty";
 				}
 
@@ -134,7 +134,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 				$dayHtml = "";
 				$hasFirstDays = false;
 
-				foreach ($posts as $e) {
+				foreach ($calDayPosts as $e) {
 					$m = Meeting::fromPost($e);
 
 					$link = $m->permalink();

From e9930ff0ca322bcb227371167fb00da45a6595f9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 May 2024 12:40:02 -0400
Subject: [PATCH 113/423] Adding links to people and divisions on Involvements
 and Meetings.

---
 src/TouchPoint-WP/Involvement.php           | 39 ++++++++++++++++++---
 src/TouchPoint-WP/Person.php                | 25 ++++++++++---
 src/TouchPoint-WP/Utilities/PersonArray.php | 10 ++++++
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 343bfb63..a874ee21 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -798,15 +798,16 @@ protected function scheduleString_calc(): string
 		return $dayStr;
 	}
 
+
 	/**
-	 * Returns an array of the Involvement's Divisions, excluding those that cause it to be included.
+	 * Gets the division terms for the involvement.
 	 *
-	 * @return string[]
+	 * @return WP_Term[]
 	 */
-	public function getDivisionsStrings(): array
+	protected function getDivisions(): array
 	{
 		$exclude = $this->settings()->importDivs;
-
+		
 		if ( ! isset($this->divisions)) {
 			if (count($exclude) > 1) {
 				$mq = ['relation' => "AND"];
@@ -824,15 +825,43 @@ public function getDivisionsStrings(): array
 
 			$this->divisions = wp_get_post_terms($this->post_id, Taxonomies::TAX_DIV, ['meta_query' => $mq]);
 		}
+		
+		return $this->divisions;
+	}
 
+	/**
+	 * Returns an array of the Involvement's Divisions, excluding those that cause it to be included.
+	 *
+	 * @return string[]
+	 */
+	public function getDivisionsStrings(): array
+	{
 		$out = [];
-		foreach ($this->divisions as $d) {
+		foreach ($this->getDivisions() as $d) {
 			$out[] = $d->name;
 		}
 
 		return $out;
 	}
 
+
+	/**
+	 * Returns an array of links to the Involvement's Divisions, excluding those that cause it to be included.
+	 *
+	 * @return string[]
+	 */
+	public function getDivisionsLinks(): array
+	{
+		$out = [];
+		foreach ($this->getDivisions() as $d) {
+			$name = $d->name;
+			$link = get_term_link($d);
+			$out[] = "<a href=\"$link\">$name</a>";
+		}
+
+		return $out;
+	}
+
 	/**
 	 * Get the setting object for a specific post type or involvement type
 	 *
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 6949665c..6bf45780 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1417,7 +1417,7 @@ public function getProfileUrl(): ?string
 	 *
 	 * @return ?string  Returns a human-readable list of names, nicely formatted with commas and such.
 	 */
-	public static function arrangeNamesForPeople($people, int $familyLimit = 3): ?string
+	public static function arrangeNamesForPeople($people, bool $asLink = false, int $familyLimit = 3): ?string
 	{
 		$people = self::groupByFamily($people);
 		if (count($people) === 0) {
@@ -1433,7 +1433,7 @@ public static function arrangeNamesForPeople($people, int $familyLimit = 3): ?st
 		$and         = ' & ';
 		$useOxford   = false;
 		foreach ($people as $family) {
-			$fn = self::formatNamesForFamily($family);
+			$fn = self::formatNamesForFamily($family, $asLink);
 			if (strpos($fn, ', ') !== false) {
 				$comma     = '; ';
 				$useOxford = true;
@@ -1471,7 +1471,7 @@ public static function arrangeNamesForPeople($people, int $familyLimit = 3): ?st
 	 *
 	 * @return ?string Returns a human-readable list of names, nicely formatted with commas and such.
 	 */
-	protected static function formatNamesForFamily(array $family): ?string  // Standardize API  (#120)
+	protected static function formatNamesForFamily(array $family, bool $asLink = false): ?string  // Standardize API  (#120)
 	{
 		if (count($family) < 1) {
 			return null;
@@ -1484,24 +1484,41 @@ protected static function formatNamesForFamily(array $family): ?string  // Stand
 		usort($family, fn($a, $b) => ($a->GenderId ?? 0) <=> ($b->GenderId ?? 0));
 
 		$isFirst = true;
+		$hasLink = false;
 		foreach ($family as $p) {
 			$last = $p->LastName ?? $p->last_name;
 			if ($standingLastName != $last) {
 				$string .= " " . $standingLastName;
 
+				if ($hasLink) {
+					$string .= "</a>";
+				}
+
 				$standingLastName = $last;
 			}
 
-			if ( ! $isFirst && count($family) > 1) {
+			if (!$isFirst && count($family) > 1) {
 				$string .= " & ";
 			}
 
+			$hasLink = false;
+			if ($asLink) {
+				$link = $p->getUserUrl();
+				if ($link !== null) {
+					$string .= "<a href=\"$link\">";
+					$hasLink = true;
+				}
+			}
 			$string .= $p->GoesBy ?? $p->first_name;
 
 			$isFirst = false;
 		}
 		$string .= " " . $standingLastName;
 
+		if ($hasLink) {
+			$string .= "</a>";
+		}
+
 		$lastAmpPos = strrpos($string, " & ");
 
 		return str_replace(" & ", ", ", substr($string, 0, $lastAmpPos)) . substr($string, $lastAmpPos);
diff --git a/src/TouchPoint-WP/Utilities/PersonArray.php b/src/TouchPoint-WP/Utilities/PersonArray.php
index df2a2642..836362b8 100644
--- a/src/TouchPoint-WP/Utilities/PersonArray.php
+++ b/src/TouchPoint-WP/Utilities/PersonArray.php
@@ -17,4 +17,14 @@ public function __toString()
 	{
 		return Person::arrangeNamesForPeople($this) ?? "";
 	}
+
+	/**
+	 * Get the list of people, as a human-readable list of people, with links to their author pages.
+	 *
+	 * @return string
+	 */
+	public function toLinks(): string
+	{
+		return Person::arrangeNamesForPeople($this, true) ?? "";
+	}
 }
\ No newline at end of file

From ec9c42d7be5778f54ba8bd22f31e4b778d88b647 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 May 2024 20:40:34 -0400
Subject: [PATCH 114/423] Resolving an issue with image imports timing out. 
 Closes #165, I think.

---
 src/TouchPoint-WP/Utilities.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index f991d0ea..50eaf2a6 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -522,6 +522,7 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 					wp_delete_attachment($oldAttId, true);
 				}
 				if ($newUrl !== "") { // Load and save new one
+					set_time_limit(60);
 					$attId = media_sideload_image($newUrl, $postId, $title, 'id');
 					set_post_thumbnail($postId, $attId);
 				}
@@ -629,7 +630,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 
 
 		/**
-		 * The maximum header level to allow in the HTML.  Default is 2.
+		 * The maximum header level to allow in an HTML string.  Default is 2.
 		 *
 		 * @since 0.0.25
 		 *
@@ -647,7 +648,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		];
 
 		/**
-		 * The allowed tags in the HTML standardization process.  Default is a set of common tags.
+		 * The allowed tags in the HTML standardization process.  Default is a set of common tags, but tags such as script, style, img, and others are stripped.
 		 *
 		 * @since 0.0.25
 		 *

From ae9e397cf0c4109ae05e0a5ee159eb8950d2681e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 May 2024 20:41:20 -0400
Subject: [PATCH 115/423] Simplifying date logic

---
 src/TouchPoint-WP/Utilities/DateFormats.php | 41 +++++++++------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 4e60e651..5126507f 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -238,31 +238,18 @@ public static function DurationToString(?DateTimeExtended $start, ?DateTimeExten
 
 		$allDay = $start->isAllDay;
 
-		if ($allDay && !$multiDay) {
-			return self::DateStringFormatted($start);
-		}
-
-		if ($allDay && $multiDay) {
-			$date1 = self::DateStringFormattedShort($start);
-			$date2 = ($end == null) ? null : self::DateStringFormattedShort($end);
+		$r = self::DurationToStringArray($start, $end, $multiDay, $allDay);
 
-			// Translators: %1$s is the start date, %2$s is the end date.
-			return wp_sprintf(__('%1$s &ndash; %1$s', 'TouchPoint-WP'), $date1, $date2);
+		if (isset($r['datetime'])) {
+			return $r['datetime'];
 		}
 
-		$time1 = self::TimeStringFormatted($start);
-		$time2 = ($end == null) ? null : self::TimeStringFormatted($end);
-
-		if (!$multiDay) {
-			// translators: %1$s is the start time, %2$s is the end time.
-			return wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $time1, $time2);
+		if (isset($r['date']) && isset($r['time'])) {
+			// translators: %1$s is the date, %2$s is the time.
+			return wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $r['date'], $r['time']);
 		}
 
-		$date1 = self::DateStringFormattedShort($start);
-		$date2 = ($end == null) ? null : self::DateStringFormattedShort($end);
-
-		// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-		return wp_sprintf(__('%1$s at %2$s &ndash; %3$s at %4$s', 'TouchPoint-WP'), $date1, $time1, $date2, $time2);
+		return null;
 	}
 
 	/**
@@ -271,17 +258,25 @@ public static function DurationToString(?DateTimeExtended $start, ?DateTimeExten
 	 *
 	 * @param ?DateTimeInterface $start
 	 * @param ?DateTimeInterface $end
-	 * @param bool               $multiDay
-	 * @param bool               $allDay
+	 * @param ?bool              $multiDay
+	 * @param ?bool              $allDay
 	 *
 	 * @return array|string[]
 	 */
-	public static function DurationToStringArray(?DateTimeInterface $start, ?DateTimeInterface $end, bool $multiDay, bool $allDay): array
+	public static function DurationToStringArray(?DateTimeInterface $start, ?DateTimeInterface $end, ?bool $multiDay = null, ?bool $allDay = null): array
 	{
 		if ($start === null) {
 			return [];
 		}
 
+		if ($multiDay === null) {
+			if ($end === null) {
+				$multiDay = false;
+			} else {
+				$multiDay = ($start->format('Ymd') !== $end->format('Ymd'));
+			}
+		}
+
 		// outputs are commented by bits corresponding to multiDay, end==null, and allDay
 
 		if ($allDay === true) {

From 9a7f9023f158c46ca5543ff2933c60fc2eb6664a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 May 2024 20:57:24 -0400
Subject: [PATCH 116/423] A bunch of relatively small stuff

---
 src/TouchPoint-WP/Involvement.php             | 1555 ++++++++++++-----
 .../Involvement_PostTypeSettings.php          |   34 +-
 src/TouchPoint-WP/Meeting.php                 |    2 +-
 src/TouchPoint-WP/Rsvp.php                    |    6 +-
 .../Utilities/StringableArray.php             |   23 +
 src/TouchPoint-WP/module.php                  |    3 +
 src/templates/involvement-archive.php         |    5 +
 src/templates/involvement-single.php          |   44 +-
 src/templates/meeting-archive.php             |   24 +-
 src/templates/partner-archive.php             |    3 +
 src/templates/partner-single.php              |    2 +-
 src/templates/parts/involvement-list-item.php |    7 +-
 12 files changed, 1190 insertions(+), 518 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index a874ee21..f4c516dc 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -20,10 +20,12 @@
 
 use DateInterval;
 use DateTimeImmutable;
-use DateTimeInterface;
 use DateTimeZone;
 use Exception;
+use JsonSerializable;
 use stdClass;
+use tp\TouchPointWP\Utilities\DateFormats;
+use tp\TouchPointWP\Utilities\DateTimeExtended;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
@@ -37,7 +39,7 @@
 /**
  * Fundamental object meant to correspond to an Involvement in TouchPoint
  */
-class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module
+class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module, JsonSerializable
 {
 	use jsInstantiation;
 	use jsonLd;
@@ -71,9 +73,9 @@ class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo
 	static protected object $compareGeo;
 
 	protected ?string $locationName = null;
-	protected ?DateTimeImmutable $_nextMeeting;
-	protected ?DateTimeImmutable $firstMeeting = null;
-	protected ?DateTimeImmutable $lastMeeting = null;
+	protected ?DateTimeExtended $_nextMeeting;
+	protected ?DateTimeExtended $firstMeeting = null;
+	protected ?DateTimeExtended $lastMeeting = null;
 	protected ?string $_scheduleString;
 	protected ?array $_meetings = null;
 	protected ?array $_schedules = null;
@@ -118,7 +120,7 @@ protected function __construct(object $object)
 			$this->invType = get_post_type($this->post_id);
 
 			if ($this->invId === 0) {
-				throw new TouchPointWP_Exception("No Involvement ID provided in the post.");
+				throw new TouchPointWP_Exception("No Involvement ID provided in the post.", 171002);
 			}
 		} elseif (gettype($object) === "object") {
 			// Sql Object, probably.
@@ -127,7 +129,7 @@ protected function __construct(object $object)
 				_doing_it_wrong(
 					__FUNCTION__,
 					esc_html(
-						__('Creating an Involvement object from an object without a post_id is not yet supported.')
+						__('Creating an Involvement object from an object without a post_id is not yet supported.', 'TouchPoint-WP')
 					),
 					esc_attr(TouchPointWP::VERSION)
 				);
@@ -268,7 +270,8 @@ public static function init(): void
 						'singular_name' => $type->nameSingular
 					],
 					'public'            => true,
-					'hierarchical'      => $type->hierarchical,
+					'hierarchical'      => $type->hierarchical || $type->importMeetings ||
+					                       TouchPointWP::instance()->settings->enable_meeting_cal === 'on',
 					'show_ui'           => false,
 					'show_in_nav_menus' => true,
 					'show_in_rest'      => true,
@@ -343,13 +346,27 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 		$count   = 0;
 		$success = true;
 
+		$startTime = microtime(true);
+
 		// Prevent other threads from attempting for an hour.
 		TouchPointWP::instance()->settings->set('inv_cron_last_run', time() - self::CRON_OFFSET + 3600);
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
 
+		ini_set('max_execution_time', 300);
+		ini_set('memory_limit', '512M');
+		if (!defined('WP_MAX_MEMORY_LIMIT')) {
+			define('WP_MAX_MEMORY_LIMIT', '512M');
+		}
+
+
 		foreach (self::allTypeSettings() as $type) {
-			if (count($type->importDivs) < 1) {
+
+			if ($verbose) {
+				echo "<h2>$type->namePlural</h2>";
+			}
+
+			if (count($type->importDivs) < 1 && $type->postType !== Meeting::POST_TYPE) {
 				// Don't update if there aren't any divisions selected yet.
 				if ($verbose) {
 					print "Skipping $type->namePlural because no divisions are selected.";
@@ -358,9 +375,8 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 			}
 
 			// Divisions
-			$divs   = Utilities::idArrayToIntArray($type->importDivs, false);
 			try {
-				$update = self::updateInvolvementPostsForType($type, $divs, $verbose);
+				$update = self::updateInvolvementPostsForType($type, $verbose);
 			} catch (Exception $e) {
 				if ($verbose) {
 					echo "An exception occurred while syncing $type->namePlural: " . $e->getMessage();
@@ -373,6 +389,11 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 			} else {
 				$count += $update;
 			}
+
+			if ($verbose) {
+				$time = microtime(true) - $startTime;
+				echo "<p>$time seconds have elapsed.</p>";
+			}
 		}
 		unset($type);
 
@@ -406,7 +427,7 @@ public static function templateFilter(string $template): string
 		/**
 		 * Determines whether the plugin's default templates should be used.  Theme developers can return false in this
 		 * filter to prevent the default templates from applying, especially if they conflict with the theme.
-		 * 
+		 *
 		 * Default is true.
 		 *
 		 * @since 0.0.6
@@ -422,7 +443,7 @@ public static function templateFilter(string $template): string
 				return $template;
 			}
 
-			if ( ! in_array(ltrim(strrchr($template, '/'), '/'), $templateFilesToOverwrite)) {
+			if (!in_array(ltrim(strrchr($template, '/'), '/'), $templateFilesToOverwrite)) {
 				return $template;
 			}
 
@@ -435,13 +456,13 @@ public static function templateFilter(string $template): string
 			if (is_post_type_archive($postTypesToFilter) && file_exists(
 					TouchPointWP::$dir . '/src/templates/involvement-archive.php'
 				)) {
-				$template = TouchPointWP::$dir . '/src/templates/involvement-archive.php';
+				return TouchPointWP::$dir . '/src/templates/involvement-archive.php';
 			}
 
 			if (is_singular($postTypesToFilter) && file_exists(
 					TouchPointWP::$dir . '/src/templates/involvement-single.php'
 				)) {
-				$template = TouchPointWP::$dir . '/src/templates/involvement-single.php';
+				return TouchPointWP::$dir . '/src/templates/involvement-single.php';
 			}
 		}
 
@@ -457,35 +478,139 @@ public static function templateFilter(string $template): string
 	 */
 	public function acceptingNewMembers(): bool|string
 	{
-		if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupFull", true) === '1') {
-			return __("Currently Full", 'TouchPoint-WP');
-		}
+		if (!isset($this->_acceptingNewMembers)) {
+			if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupFull", true) === '1') {
+				$this->_acceptingNewMembers = __("Currently Full", 'TouchPoint-WP');
+				return $this->_acceptingNewMembers;
+			}
 
-		if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupClosed", true) === '1') {
-			return __("Currently Closed", 'TouchPoint-WP');
-		}
+			if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupClosed", true) === '1') {
+				$this->_acceptingNewMembers = __("Currently Closed", 'TouchPoint-WP');
+				return $this->_acceptingNewMembers;
+			}
 
-		$now      = Utilities::dateTimeNow();
-		$regStart = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regStart", true);
-		if ($regStart !== false && $regStart !== '' && $regStart > $now) {
-			return __("Registration Not Open Yet", 'TouchPoint-WP');
-		}
+			$now      = Utilities::dateTimeNow();
+			$regStart = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regStart", true);
+			if ($regStart !== false && $regStart !== '' && $regStart > $now) {
+				$this->_acceptingNewMembers = __("Registration Not Open Yet", 'TouchPoint-WP');
+				return $this->_acceptingNewMembers;
+			}
+
+			$regEnd = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regEnd", true);
+			if ($regEnd !== false && $regEnd !== '' && $regEnd < $now) {
+				$this->_acceptingNewMembers = __("Registration Closed", 'TouchPoint-WP');
+				return $this->_acceptingNewMembers;
+			}
 
-		$regEnd = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regEnd", true);
-		if ($regEnd !== false && $regEnd !== '' && $regEnd < $now) {
-			return __("Registration Closed", 'TouchPoint-WP');
+			if (intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) === 0) {
+				$this->_acceptingNewMembers = false; // no online registration available
+				return $this->_acceptingNewMembers;
+			}
+
+			$this->_acceptingNewMembers = true;
 		}
 
-		if (intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) === 0) {
-			return false; // no online registration available
+		return $this->_acceptingNewMembers;
+	}
+	private mixed $_acceptingNewMembers;
+
+
+	/**
+	 * Gets a URL for registration.  A registration url will be provided unless there is no viable registration url to
+	 * send users to, in which case null will be returned.
+	 *
+	 * @return ?string
+	 */
+	public function getRegistrationUrl(): ?string
+	{
+		if ($this->_registrationUrl === "") {
+			$regUrl = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regUrl", true);
+			$regType = intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true));
+			$hasRegQuestions = intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true));
+			if ($hasRegQuestions && ($regUrl === "" || $regUrl === null)) {
+				$this->_registrationUrl = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
+			} elseif ($regType === 0 || $regUrl === "" || $regUrl === null) {
+				$this->_registrationUrl = null;
+			} elseif (stristr($regUrl, "http") === false) {
+				$this->_registrationUrl = TouchPointWP::instance()->host() . $regUrl;
+			} else {
+				$this->_registrationUrl = $regUrl;
+			}
 		}
+		return $this->_registrationUrl;
+	}
+	private ?string $_registrationUrl = "";
 
-		return true;
+
+	/**
+	 * Get the registration type for the involvement.
+	 *
+	 * @return int enum of RegistrationType
+	 */
+	public function getRegistrationType(): int
+	{
+		if (!isset($this->_registrationType)) {
+			if ($this->acceptingNewMembers() !== true) {
+				$this->_registrationType = RegistrationType::CLOSED;
+				return $this->_registrationType;
+			}
+
+			// Determine intended indication based on site setting.
+			$siteRegType = intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", true));
+			$regUrl = $this->getRegistrationUrl();
+			switch ($siteRegType) {
+				case 1:
+					$this->_registrationType = RegistrationType::FORM;
+					return $this->_registrationType;
+
+				case 3:
+					$this->_registrationType = RegistrationType::RSVP;
+					return $this->_registrationType;
+
+				case 5:
+					if ($regUrl !== null) {
+						$this->_registrationType = RegistrationType::EXTERNAL;
+						return $this->_registrationType;
+					}
+					break; // Registration isn't possible at a link, therefore, assume there was a mistake and continue.
+
+					
+				case 7:
+					$this->_registrationType = RegistrationType::CLOSED;
+					return $this->_registrationType;
+			}
+			
+			// If the involvement has a redirection link, assume it's an external form
+			if ($regUrl !== null) {
+				$this->_registrationType = RegistrationType::EXTERNAL;
+				return $this->_registrationType;
+			}
+
+
+			// If the involvement has registration questions, assume it's a form.
+			if (
+				// Has registration questions
+				intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true)) === 1 ||
+
+				// Has registration type not equal to Join
+				intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1
+			) {
+				$this->_registrationType = RegistrationType::FORM;
+				return $this->_registrationType;
+			}
+
+			$this->_registrationType = RegistrationType::JOIN;
+		}
+		return $this->_registrationType;
 	}
+	private int $_registrationType;
+
 
 	/**
 	 * Whether the involvement should link to a registration form, rather than directly joining the org.
 	 *
+	 * @deprecated 0.0.90  Does not take into account all the possible registration types; will be removed in a future version.
+	 *
 	 * @return bool
 	 */
 	public function useRegistrationForm(): bool
@@ -498,7 +623,13 @@ public function useRegistrationForm(): bool
 	}
 	private bool $_useRegistrationForm;
 
+
 	/**
+	 * Get an array of objects that correspond to key details of meetings.  Does NOT return the actual Meeting objects.
+	 * Since this is used for involvements regardless of whether their meetings are imported, this pulls from the object
+	 * array that's imported directly from the API.  It does not take into account Meeting objects, or meetings that
+	 * belong to child involvements. 
+	 *
 	 * @return stdClass[]
 	 */
 	protected function meetings(): array
@@ -571,9 +702,9 @@ public static function scheduleString(int $invId, $inv = null): ?string
 	/**
 	 * Get the next meeting date/time from either the meetings or schedules.
 	 *
-	 * @return DateTimeImmutable|null
+	 * @return DateTimeExtended|null
 	 */
-	public function nextMeeting(): ?DateTimeImmutable
+	public function nextMeeting(): ?DateTimeExtended
 	{
 		$now                = new DateTimeImmutable();
 		$this->_nextMeeting = null;
@@ -605,17 +736,45 @@ public function nextMeeting(): ?DateTimeImmutable
 	}
 
 	/**
+	 * @param $apiMeeting
+	 *
+	 * @return bool
+	 *
+	 * TODO update with #184
+	 */
+	protected static function apiMeetingIsAllDay($apiMeeting): bool
+	{
+		return $apiMeeting->mtgStartDt->format("His") === "000000";
+	}
+
+
+	/**
+	 * @param $apiSchedule
+	 *
+	 * @return bool
+	 *
+	 * TODO remove or change with #184
+	 */
+	protected static function apiScheduleIsAllDay($apiSchedule): bool
+	{
+		return $apiSchedule->nextStartDt->format("His") === "000000";
+	}
+
+	/**
+	 * Group meetings and schedules together such that typical recurrences can be stated. Only returns patterns that
+	 * have at least N occurrences.
+	 *
 	 * @param array $meetings
 	 * @param array $schedules
+	 * @param int   $minNumber (N) The minimum required number of recurrences.
 	 *
 	 * @return ?array[]
 	 */
-	private static function computeCommonOccurrences(array $meetings = [], array $schedules = []): ?array
+	protected static function computeCommonOccurrences(array $meetings = [], array $schedules = [], int $minNumber = 3): ?array
 	{
 		try {
-			$siteTz = wp_timezone();
-			$now    = new DateTimeImmutable(null, $siteTz);
-		} catch (Exception $e) {
+			$now = Utilities::dateTimeNow();
+		} catch (Exception) {
 			return null;
 		}
 
@@ -627,15 +786,20 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc
 				continue;
 			}
 
-			$dt = $s->nextStartDt;
-
-			$coInx                     = $dt->format('w-Hi');
+			/** @var DateTimeExtended $start */
+			$start = $s->nextStartDt;
+			if ($start->isAllDay) {
+				$coInx = $start->format('w-9999');
+			} else {
+				$coInx = $start->format('w-Hi');
+			}
 			$commonOccurrences[$coInx] = [
-				'count'   => 20,
-				'example' => $dt
+				'count'      => 20,
+				'example'    => $start,
+				'exampleEnd' => null
 			];
 		}
-		unset($dt, $coInx, $s);
+		unset($start, $coInx, $s);
 
 		// If there isn't a schedule, but there are common meeting dates/times, use those.
 		foreach ($meetings as $m) {
@@ -643,25 +807,34 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc
 				continue;
 			}
 
-			$dt = $m->mtgStartDt;
+			/** @var DateTimeExtended $start */
+			$start = $m->mtgStartDt;
+
+			/** @var ?DateTimeExtended $end */
+			$end = $m->mtgEndDt;
 
-			if ($dt < $now) {
+			if ($start < $now) {
 				continue;
 			}
 
-			$coInx = $dt->format('w-Hi');
+			if ($start->isAllDay) {
+				$coInx = $start->format('w-9999');
+			} else {
+				$coInx = $start->format('w-Hi');
+			}
 			if (isset($commonOccurrences[$coInx])) {
 				$commonOccurrences[$coInx]['count']++;
 			} else {
 				$commonOccurrences[$coInx] = [
-					'count'   => 1,
-					'example' => $dt
+					'count'      => 1,
+					'example'    => $start,
+					'exampleEnd' => $end
 				];
 			}
 		}
-		unset($dt, $coInx, $m);
+		unset($start, $coInx, $m);
 
-		return array_filter($commonOccurrences, fn($co) => $co['count'] > 2);
+		return array_filter($commonOccurrences, fn($co) => $co['count'] >= $minNumber);
 	}
 
 	/**
@@ -673,55 +846,81 @@ protected function scheduleString_calc(): string
 	{
 		$commonOccurrences = self::computeCommonOccurrences($this->meetings(), $this->schedules());
 
-		$dayStr     = "";
-		$timeFormat = get_option('time_format');
 		$dateFormat = get_option('date_format');
 
-		if (count($commonOccurrences) > 0) {
-			$uniqueTimeStrings = [];
-			$days              = [];
-			if (count($commonOccurrences) > 1) { // this is only needed if there's multiple schedules
-				foreach ($commonOccurrences as $k => $co) {
-					$timeStr = substr($k, 2);
-					if ( ! in_array($timeStr, $uniqueTimeStrings, true)) {
-						$uniqueTimeStrings[] = $timeStr;
-					}
 
-					$weekday = "d" . $k[0];
-					if ( ! isset($days[$weekday])) {
-						$days[$weekday] = [];
-					}
+		$uniqueTimeStrings = [];
+		$days              = [];
+		$common            = true;
+		if (count($commonOccurrences) > 1) { // this is only needed if there's multiple schedules
+			foreach ($commonOccurrences as $k => $co) {
+				$timeStr = substr($k, 2);
+				if ( ! in_array($timeStr, $uniqueTimeStrings, true)) {
+					$uniqueTimeStrings[] = $timeStr;
+				}
 
-					if ( ! in_array($co['example'], $days[$weekday], true)) {
-						$days[$weekday][] = $co['example'];
-					}
+				$weekday = "d" . $k[0];
+				if ( ! isset($days[$weekday])) {
+					$days[$weekday] = [];
+				}
+
+				if ( ! in_array($co['example'], $days[$weekday], true)) {
+					$days[$weekday][] = $co['example'];
 				}
-				unset($timeStr, $k, $co, $weekday);
-			} else {
-				$cok                   = array_key_first($commonOccurrences);
-				$days["d" . $cok[0]][] = $commonOccurrences[$cok]['example'];
 			}
+			unset($timeStr, $k, $co, $weekday);
+		} elseif (count($commonOccurrences) > 0) {
+			$cok = array_key_first($commonOccurrences);
+			$days["d" . $cok[0]][] = $commonOccurrences[$cok]['example'];
+		} else {
+			$common = false;
+			$commonOccurrences = self::computeCommonOccurrences($this->meetings(), $this->schedules(), 0);
 
+			foreach ($commonOccurrences as $k => $co) {
+				$timeStr = substr($k, 2);
+				if (!in_array($timeStr, $uniqueTimeStrings, true)) {
+					$uniqueTimeStrings[] = $timeStr;
+				}
+
+				$weekday = "d" . $k[0];
+				if ( ! isset($days[$weekday])) {
+					$days[$weekday] = [];
+				}
+
+				if ( ! in_array($co['example'], $days[$weekday], true)) {
+					$days[$weekday][] = $co['example'];
+				}
+			}
+			unset($timeStr, $k, $co, $weekday);
+		}
+
+		if ($common) {
 			if (count($uniqueTimeStrings) > 1) {  // Multiple different times.  Sun at 9am & 11am, and Sat at 6pm
 				// multiple different times of day
 				$dayStr = [];
 				foreach ($days as $dk => $dta) {
 					$timeStr = [];
 					foreach ($dta as $dt) {
-						/** @var $dt DateTimeImmutable */
-						$ts        = $dt->format($timeFormat);
-						$ts        = apply_filters(TouchPointWP::HOOK_PREFIX . 'adjust_time_string', $ts, $dt);
-						$timeStr[] = $ts;
+						/** @var $dt DateTimeExtended */
+						if ($dt->isAllDay) {
+							continue; // skip all-days
+						}
+						$timeStr[] = DateFormats::TimeStringFormatted($dt);
 					}
-					$timeStr = Utilities::stringArrayToListString($timeStr);
 
 					if (count($days) > 1) {  // Mon at 7pm & Tue at 8pm
 						$day = Utilities::getDayOfWeekShortForNumber(intval($dk[1]));
 					} else {
 						$day = Utilities::getPluralDayOfWeekNameForNumber(intval($dk[1]));
 					}
-					// translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-					$dayStr[] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $day, $timeStr);
+					if (count($timeStr) > 0) {
+						$timeStr = Utilities::stringArrayToListString($timeStr);
+						// translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
+						$dayStr[] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $day, $timeStr);
+					} else {
+						// translators: "Mon All Day"  or  "Sundays All Day"
+						$dayStr[] = wp_sprintf(__('%1$s All Day', 'TouchPoint-WP'), $day);
+					}
 				}
 				$dayStr = Utilities::stringArrayToListString($dayStr);
 			} else {  // one time of day.  Tue & Thu at 7pm
@@ -738,64 +937,114 @@ protected function scheduleString_calc(): string
 					$dayStr = Utilities::getPluralDayOfWeekNameForNumber(intval($k[1]));
 				}
 				$dt = array_values($days)[0][0];
-				/** @var $dt DateTimeImmutable */
-				$timeStr = $dt->format($timeFormat);
-				$timeStr = apply_filters(TouchPointWP::HOOK_PREFIX . 'adjust_time_string', $timeStr, $dt);
-				$dayStr  = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $dayStr, $timeStr);
+				/** @var $dt DateTimeExtended */
+				if ($dt->isAllDay) {
+					// translators: "Mon All Day"  or  "Sundays All Day"
+					$dayStr = wp_sprintf(__('%1$s All Day', 'TouchPoint-WP'), $dayStr);
+				} else {
+					$timeStr = DateFormats::TimeStringFormatted($dt);
+
+					// translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
+					$dayStr  = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $dayStr, $timeStr);
+				}
 			}
-		}
 
-		// Convert start and end to string.
-		if ($this->firstMeeting !== null && $this->lastMeeting !== null) {
-			if ($dayStr === null) {
-				$dayStr = wp_sprintf(
-				// translators: {start date} through {end date}  e.g. February 14 through August 12
-					__('%1$s through %2$s', 'TouchPoint-WP'),
-					$this->firstMeeting->format($dateFormat),
-					$this->lastMeeting->format($dateFormat)
-				);
-			} else {
-				$dayStr = wp_sprintf(
-				// translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-					__('%1$s, %2$s through %3$s', 'TouchPoint-WP'),
-					$dayStr,
-					$this->firstMeeting->format($dateFormat),
-					$this->lastMeeting->format($dateFormat)
-				);
+			// Convert start and end to string.
+			if ($this->firstMeeting !== null && $this->lastMeeting !== null) {
+				if ($dayStr === null) {
+					$dayStr = wp_sprintf(
+					// translators: {start date} through {end date}  e.g. February 14 through August 12
+						__('%1$s through %2$s', 'TouchPoint-WP'),
+						$this->firstMeeting->format($dateFormat),
+						$this->lastMeeting->format($dateFormat)
+					);
+				} else {
+					$dayStr = wp_sprintf(
+					// translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
+						__('%1$s, %2$s through %3$s', 'TouchPoint-WP'),
+						$dayStr,
+						$this->firstMeeting->format($dateFormat),
+						$this->lastMeeting->format($dateFormat)
+					);
+				}
+			} elseif ($this->firstMeeting !== null) {
+				if ($dayStr === null) {
+					$dayStr = wp_sprintf(
+					// translators: Starts {start date}  e.g. Starts September 15
+						__('Starts %1$s', 'TouchPoint-WP'),
+						$this->firstMeeting->format($dateFormat)
+					);
+				} else {
+					$dayStr = wp_sprintf(
+					// translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
+						__('%1$s, starting %2$s', 'TouchPoint-WP'),
+						$dayStr,
+						$this->firstMeeting->format($dateFormat)
+					);
+				}
+			} elseif ($this->lastMeeting !== null) {
+				if ($dayStr === null) {
+					$dayStr = wp_sprintf(
+					// translators: Through {end date}  e.g. Through September 15
+						__('Through %1$s', 'TouchPoint-WP'),
+						$this->lastMeeting->format($dateFormat)
+					);
+				} else {
+					$dayStr = wp_sprintf(
+					// translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
+						__('%1$s, through %2$s', 'TouchPoint-WP'),
+						$dayStr,
+						$this->lastMeeting->format($dateFormat)
+					);
+				}
 			}
-		} elseif ($this->firstMeeting !== null) {
-			if ($dayStr === null) {
-				$dayStr = wp_sprintf(
-				// translators: Starts {start date}  e.g. Starts September 15
-					__('Starts %1$s', 'TouchPoint-WP'),
-					$this->firstMeeting->format($dateFormat)
-				);
-			} else {
-				$dayStr = wp_sprintf(
-				// translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-					__('%1$s, starting %2$s', 'TouchPoint-WP'),
-					$dayStr,
-					$this->firstMeeting->format($dateFormat)
-				);
+			return $dayStr;
+
+
+		} else { // Uncommon schedules
+
+			if (count($commonOccurrences) === 0) {
+				return "";
 			}
-		} elseif ($this->lastMeeting !== null) {
-			if ($dayStr === null) {
-				$dayStr = wp_sprintf(
-				// translators: Through {end date}  e.g. Through September 15
-					__('Through %1$s', 'TouchPoint-WP'),
-					$this->lastMeeting->format($dateFormat)
-				);
-			} else {
-				$dayStr = wp_sprintf(
-				// translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-					__('%1$s, through %2$s', 'TouchPoint-WP'),
-					$dayStr,
-					$this->lastMeeting->format($dateFormat)
-				);
+
+			$forceDateTime = false;
+			$dateTimeArr = new StringableArray();
+			$dateArr = new StringableArray();
+			$timeArr = [];
+			foreach ($commonOccurrences as $co) {
+				$r = DateFormats::DurationToStringArray($co['example'], $co['exampleEnd'], null, $co['example']->isAllDay);
+
+				if (isset($r['datetime'])) {
+					$forceDateTime = true;
+					$dateTimeArr[] = $r['datetime'];
+				} else {
+					$dateTimeArr[] = wp_sprintf(
+						// translators: {date} at {time}  e.g. February 14 at 7pm
+						__('%1$s at %2$s', 'TouchPoint-WP'), $r['date'], $r['time']
+					);
+					if ( !$dateArr->contains(['date'])) {
+						$dateArr[] = $r['date'];
+					}
+					if (!in_array($r['time'], $timeArr)) {
+						$timeArr[] = $r['time'];
+					}
+				}
+			}
+			if (count($timeArr) > 1) {
+				$forceDateTime = true;
+			}
+
+			if ($forceDateTime) {
+				return $dateTimeArr->__toString();
 			}
-		}
 
-		return $dayStr;
+			$dateStr = $dateArr->toListString();
+
+			return wp_sprintf(
+				// translators: {date} at {time}  e.g. February 14 at 7pm
+				__('%1$s at %2$s', 'TouchPoint-WP'), $dateStr, $timeArr[0]
+			);
+		}
 	}
 
 
@@ -1176,11 +1425,11 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 	 * Get a WP_Post by the Involvement ID if it exists.  Return null if it does not.
 	 *
 	 * @param string|string[] $postType
-	 * @param                 $involvementId
+	 * @param mixed           $involvementId
 	 *
 	 * @return int|WP_Post|null
 	 */
-	private static function getWpPostByInvolvementId($postType, $involvementId)
+	private static function getWpPostByInvolvementId($postType, $involvementId): WP_Post|null
 	{
 		$involvementId = (string)$involvementId;
 
@@ -1191,13 +1440,14 @@ private static function getWpPostByInvolvementId($postType, $involvementId)
 								   'numberposts' => 2
 								   // only need one, but if there's two, there should be an error condition.
 							   ]);
+		/** @var $posts WP_Post[] */
 		$posts  = $q->get_posts();
 		$counts = count($posts);
 		if ($counts > 1) {  // multiple posts match, which isn't great.
 			new TouchPointWP_Exception("Multiple Posts Exist", 170006);
 		}
 		if ($counts > 0) { // post exists already.
-			return $posts[0];
+			return reset($posts);
 		} else {
 			return null;
 		}
@@ -1468,7 +1718,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 		// Campuses
 		if (in_array('campus', $filters) && TouchPointWP::instance()->settings->enable_campuses === "on") {
 			$cName = TouchPointWP::instance()->settings->camp_name_singular;
-			if (strtolower($cName) == "language") {
+			if (Translation::useCampusAsLanguage()) {
 				$cName = __("Language", 'TouchPoint-WP');
 			}
 			$cList = get_terms(
@@ -1574,19 +1824,19 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 
 		if ($params['includeMapWarnings']) {
 			$content .= "<p class=\"TouchPointWP-map-warnings\">";
-			$content .= sprintf(
+			$content .= wp_sprintf(
 				"<span class=\"TouchPointWP-map-warning-visibleOnly\" style=\"display:none;\">%s  </span>",
-				sprintf(
+				wp_sprintf(
 					__("The %s listed are only those shown on the map.", 'TouchPoint-WP'),
 					$settings->namePlural
 				)
 			);
-			$content .= sprintf(
+			$content .= wp_sprintf(
 				"<span class=\"TouchPointWP-map-warning-zoomOrReset\" style=\"display:none;\">%s  </span>",
-				sprintf(
+				wp_sprintf(
 				// translators: %s is the link to "reset the map"
 					__("Zoom out or %s to see more.", 'TouchPoint-WP'),
-					sprintf(
+					wp_sprintf(
 						"<a href=\"#\" class=\"TouchPointWP-map-resetLink\">%s</a>",
 						_x("reset the map", "Zoom out or reset the map to see more.", 'TouchPoint-WP')
 					)
@@ -1614,7 +1864,7 @@ public static function fromPost(WP_Post $post): ?Involvement
 		$iid = intval($post->{TouchPointWP::INVOLVEMENT_META_KEY});
 
 		if ($iid === 0) {
-			return null;
+			throw new TouchPointWP_Exception("Invalid Involvement ID provided.", 171002);
 		}
 
 		if ( ! isset(self::$_instances[$iid])) {
@@ -1650,7 +1900,6 @@ public static function api(array $uri): bool
 			case "nearby":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE);
 				self::ajaxNearby();
-				/** @noinspection PhpUnreachableStatementInspection */
 				exit;
 
 			case "force-sync":
@@ -1740,8 +1989,8 @@ public static function ajaxNearby(): void
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
 								 "invList"    => [],
-								 "error"      => sprintf("No %s Found.", $settings->namePlural),
-								 "error_i18n" => sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural)
+								 "error"      => wp_sprintf("No %s Found.", $settings->namePlural),
+								 "error_i18n" => wp_sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural)
 							 ]);
 			exit;
 		}
@@ -1781,7 +2030,7 @@ public static function ajaxNearby(): void
 	private static function getInvsNear(float $lat, float $lng, string $postType, int $limit = 3): ?array
 	{
 		if ($lat > 90 || $lat < -90 ||
-			$lng > 180 || $lng < -180
+		    $lng > 180 || $lng < -180
 		) {
 			return null;
 		}
@@ -1790,6 +2039,7 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in
 
 		global $wpdb;
 		$settingsPrefix = TouchPointWP::SETTINGS_PREFIX;
+		$metaInvId = TouchPointWP::INVOLVEMENT_META_KEY;
 		/** @noinspection SqlResolve */
 		$q = $wpdb->prepare(
 			"
@@ -1817,7 +2067,7 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in
                        $wpdb->postmeta as pmClosed ON p.ID = pmClosed.post_id AND pmClosed.meta_key = '{$settingsPrefix}groupClosed'
                 WHERE p.post_type = %s AND pmClosed.meta_value != 1 AND pmFull.meta_value != 1
                  ) as l
-                    JOIN $wpdb->postmeta as pmInv ON l.ID = pmInv.post_id AND pmInv.meta_key = '{$settingsPrefix}invId'
+                    JOIN $wpdb->postmeta as pmInv ON l.ID = pmInv.post_id AND pmInv.meta_key = '$metaInvId'
             ORDER BY distance LIMIT %d
             ",
 			$lat,
@@ -1830,24 +2080,6 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in
 		return $wpdb->get_results($q, 'OBJECT');
 	}
 
-	/**
-	 * Create a Involvement object from an object from a database query.
-	 *
-	 * @param object $obj A database object from which an Involvement object should be created.
-	 *
-	 * @return Involvement
-	 * @throws TouchPointWP_Exception
-	 */
-	private static function fromObj(object $obj): Involvement
-	{
-		$iid = intval($obj->invId);
-
-		if ( ! isset(self::$_instances[$iid])) {
-			self::$_instances[$iid] = new Involvement($obj);
-		}
-
-		return self::$_instances[$iid];
-	}
 
 	/**
 	 * Create an Involvement object from an Involvement ID.  Only Involvements that are already imported as Posts are
@@ -2089,7 +2321,6 @@ public static function mapShortcode($params = [], string $content = ""): string
 				$script
 			);
 
-			// TODO move the style to a css file... or something.
 			$content = "<div class=\"TouchPoint-Involvement-Map\" style=\"height: 100%; width: 100%; position: absolute; top: 0; left: 0; \" id=\"$mapDivId\"></div>";
 		} else {
 			$content = "<!-- Error: Involvement map can only be used once per page. -->";
@@ -2098,7 +2329,6 @@ public static function mapShortcode($params = [], string $content = ""): string
 		return $content;
 	}
 
-
 	/**
 	 * Indicates whether a map of a single Involvement can be displayed.
 	 *
@@ -2127,20 +2357,21 @@ public function asGeoIFace(string $type = "unknown"): ?Geo
 		return null;
 	}
 
-
 	/**
 	 * Update posts that are based on an involvement.
 	 *
 	 * @param Involvement_PostTypeSettings $typeSets
-	 * @param string|int                   $divs
 	 * @param bool                         $verbose
 	 *
 	 * @return false|int  False on failure.  Otherwise, the number of updates.
 	 */
-	final protected static function updateInvolvementPostsForType(Involvement_PostTypeSettings $typeSets, $divs, bool $verbose) {
+	final protected static function updateInvolvementPostsForType(Involvement_PostTypeSettings $typeSets, bool $verbose): bool|int
+	{
 		$siteTz = wp_timezone();
 
-		set_time_limit(180);
+		if (!set_time_limit(180) && $verbose) {
+			echo "<p>Time limit could not be extended.  May not be able to complete all updates.</p>";
+		}
 
 		$qOpts = [];
 
@@ -2153,13 +2384,26 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		}
 
 		try {
-			$qOpts['divs'] = $divs;
-			if ($typeSets->importMeetings) {
-				$qOpts['mtgHist']   = TouchPointWP::instance()->settings->mc_archive_days;
+			if ($typeSets->postType === Meeting::POST_TYPE) {
+				$qOpts['featMtgs'] = 1;
+				$qOpts['exDivs'] = Utilities::idArrayToIntArray(Involvement_PostTypeSettings::getAllDivs(), false);
+			} else {
+				$qOpts['divs'] = Utilities::idArrayToIntArray($typeSets->importDivs, false);
+			}
+
+			if (TouchPointWP::instance()->settings->enable_meeting_cal === 'on' || $typeSets->importMeetings) {
+				// Meetings to be imported
+				$qOpts['mtgHist']   = TouchPointWP::instance()->settings->mc_hist_days;
 				$qOpts['mtgFuture'] = TouchPointWP::instance()->settings->mc_future_days;
+			} else {
+				// Meetings for involvements that aren't imported.  For schedule strings only.
+				$qOpts['mtgHist']   = 0;
+				$qOpts['mtgFuture'] = 365;
 			}
-			$response = TouchPointWP::instance()->apiGet("Invs", $qOpts, 180);
-		} catch (TouchPointWP_Exception $e) {
+
+			$response = TouchPointWP::instance()->apiGet("Invs", $qOpts, 180, $verbose);
+
+		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 		unset($qOpts);
@@ -2174,9 +2418,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		$postsToKeep = [];
 
 		try {
-			$now       = new DateTimeImmutable(null, $siteTz);
-			$aYear     = new DateInterval('P1Y');
-			$nowPlus1Y = $now->add($aYear);
+			$now       = Utilities::dateTimeNow();
 			$histDays  = TouchPointWP::instance()->settings->mc_hist_days;
 			$histVal   = new DateInterval("P{$histDays}D");
 			$nowMinusH = $now->sub($histVal);
@@ -2188,66 +2430,11 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		foreach ($invData as $inv) {
 			set_time_limit(15);
 
-			if ($verbose) {
-				var_dump($inv);
-			}
-
-
 			////////////////////////
 			// Standardize Inputs //
 			////////////////////////
 
-			// Start and end dates
-			if ($inv->firstMeeting !== null) {
-				try {
-					$inv->firstMeeting = new DateTimeImmutable($inv->firstMeeting, $siteTz);
-				} catch (Exception $e) {
-					$inv->firstMeeting = null;
-				}
-			}
-			if ($inv->lastMeeting !== null) {
-				try {
-					$inv->lastMeeting = new DateTimeImmutable($inv->lastMeeting, $siteTz);
-				} catch (Exception $e) {
-					$inv->lastMeeting = null;
-				}
-			}
-
-			// Meeting and Schedule date/time strings as DateTimeImmutables
-			foreach ($inv->schedules as $i => $s) {
-				try {
-					$s->nextStartDt = new DateTimeImmutable($s->nextStartDt, $siteTz);
-				} catch (Exception $e) {
-					unset($inv->schedules[$i]);
-				}
-			}
-			foreach ($inv->meetings as $i => $m) {
-				try {
-					$m->mtgStartDt = new DateTimeImmutable($m->mtgStartDt, $siteTz);
-					$m->mtgEndDt = ($m->mtgEndDt == null ? null :
-						new DateTimeImmutable($m->mtgEndDt, $siteTz));
-				} catch (Exception $e) {
-					unset($inv->meetings[$i]);
-				}
-			}
-
-			// Registration start
-			if ($inv->regStart !== null) {
-				try {
-					$inv->regStart = new DateTimeImmutable($inv->regStart, $siteTz);
-				} catch (Exception $e) {
-					$inv->regStart = null;
-				}
-			}
-
-			// Registration end
-			if ($inv->regEnd !== null) {
-				try {
-					$inv->regEnd = new DateTimeImmutable($inv->regEnd, $siteTz);
-				} catch (Exception $e) {
-					$inv->regEnd = null;
-				}
-			}
+			self::standardizeApiData($inv, $siteTz, $verbose);
 
 
 			////////////////
@@ -2256,6 +2443,16 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 
 			// 'continue' causes involvement to be deleted (or not created).
 
+			// Exclude Meeting type if there are no meetings.
+			if ($typeSets->postType === Meeting::POST_TYPE && !$inv->isParent) {
+				if (count($inv->meetings) < 1) {
+					if ($verbose) {
+						echo "<p>Stopping processing because no meetings were returned.  Involvement will be deleted from WordPress.</p>";
+					}
+					continue;
+				}
+			}
+
 			// Filter by end dates to stay relevant
 			if ($inv->lastMeeting !== null && (
 				(!$typeSets->importMeetings && $inv->lastMeeting < $now) ||
@@ -2326,14 +2523,15 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 
 			$post = self::getWpPostByInvolvementId($typeSets->postType, $inv->involvementId);
 
-			$titleToUse = $inv->regTitle ?? $inv->name;
-			$titleToUse = trim($titleToUse);
+			$inv->titleToUse = $inv->regTitle ?? $inv->name;
+			$inv->titleToUse = trim($inv->titleToUse);
 
 			if ($post === null) {
 				$post = wp_insert_post(
 					[ // create new
 						'post_type'  => $typeSets->postType,
-						'post_name'  => $titleToUse,
+						'post_name'  => $inv->titleToUse,
+						'post_status' => 'publish',
 						'meta_input' => [
 							TouchPointWP::INVOLVEMENT_META_KEY => $inv->involvementId
 						]
@@ -2342,290 +2540,666 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 				$post = get_post($post);
 			}
 
-			if ($post instanceof WP_Error) {
-				new TouchPointWP_WPError($post);
-				continue;
-			}
+			$postsToKeep =  [...$postsToKeep, ...Involvement::doPostUpdate($post, $inv, $typeSets, $verbose)];
+			$postsToKeep[] = $post->ID;
+		}
+		unset($inv);
 
-			if ($post === null) {
-				new TouchPointWP_Exception("Post could not be found or created.", 171001);
-				continue;
-			}
+		//////////////////
+		//// Removals ////
+		//////////////////
+		
 
-			/** @var $post WP_Post */
-			if ($inv->description == null || trim($inv->description) === "") {
-				$post->post_content = null;
-			} else {
-				$post->post_content = Utilities::standardizeHtml($inv->description, "involvement-import");
-			}
+		if ($verbose) {
+			$tsn = $typeSets->namePlural;
+			echo "<h3>Deletions for $tsn</h3>";
+		}
 
-			// Title & Slug -- slugs should only be updated if there's a reason, like a title change.  Otherwise, they increment.
-			if ($post->post_title != $titleToUse || str_contains($post->post_name, "__trashed")) {
-				$post->post_title = $titleToUse;
-				$post->post_name  = ''; // Slug will regenerate;
-			}
 
-			// Parent Post
-			if ($typeSets->hierarchical) {
-				$parent = 0;
-				if ($inv->parentInvId > 0) {
-					$parent = self::getWpPostByInvolvementId($typeSets->postType, $inv->parentInvId);
-					$parent = $parent->ID;
+		// Delete posts that are no longer current
+		$q        = new WP_Query([
+									 'post_type'    => $typeSets->postType,
+									 'nopaging'     => true,
+									 'post__not_in' => $postsToKeep
+								 ]);
+		$removals = 0;
+		foreach ($q->get_posts() as $post) {
+			set_time_limit(10);
+			wp_delete_post($post->ID, true);
+			$removals++;
+		}
 
-					if ($verbose) {
-						echo "<p>Parent Post: $parent</p>";
-					}
-				}
+		if ($verbose) {
+			echo "<p>Deleted $removals posts.";
+		}
 
-				$post->post_parent = $parent;
-			}
+		return $removals + count($invData);
+	}
 
-			// Status & Submit
-			$post->post_status = 'publish';
-			wp_update_post($post);
+	/**
+	 * Does the heavy-lifting of updating a given post, with the given information.
+	 *
+	 * @param mixed                        $post TODO give a firm type
+	 * @param object                       $inv
+	 * @param Involvement_PostTypeSettings $typeSets
+	 * @param bool                         $verbose
+	 *
+	 * @return int[] A list of Post IDs that should be kept.
+	 */
+	protected static function doPostUpdate($post, object $inv, Involvement_PostTypeSettings $typeSets, bool $verbose = false): array
+	{
+		if ($post instanceof WP_Error) {
+			new TouchPointWP_WPError($post);
+			return [];
+		}
 
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "locationName", $inv->location);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "memberCount", $inv->memberCount);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "genderId", $inv->genderId);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupFull", ! ! $inv->groupFull);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupClosed", ! ! $inv->closed);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", ! ! $inv->hasRegQuestions);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regTypeId", intval($inv->regTypeId));
+		if ($post === null) {
+			new TouchPointWP_Exception("Post could not be found or created.", 171001);
+			return [];
+		}
 
+		/** @var $post WP_Post */
+		if ($inv->description == null || trim($inv->description) === "") {
+			$post->post_content = "";
+		} else {
+			$post->post_content = Utilities::standardizeHtml($inv->description, "involvement-import");
+		}
 
-			// Registration start
-			if ($inv->regStart === null) {
-				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart");
-			} else {
-				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart", $inv->regStart);
-			}
+		// Title & Slug -- slugs should only be updated if there's a reason, like a title change.  Otherwise, they increment.
+		if ($post->post_title != $inv->titleToUse || str_contains($post->post_name, "__trashed")) {
+			$post->post_title = $inv->titleToUse;
+			$post->post_name  = ''; // Slug will regenerate;
+		}
 
-			// Registration end
-			if ($inv->regEnd === null) {
-				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd");
-			} else {
-				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd", $inv->regEnd);
-			}
+		if ($verbose) {
+			$link = get_permalink($post);
+			echo "<p><a href=\"$link\">Updating Post $post->ID</a> based on Involvement $inv->involvementId ($inv->titleToUse).</p>";
+		}
 
-			// Update image, if appropriate.
-			$imageUrl = "";
-			if (!!$typeSets->useImages) {
-				$imageUrl = $inv->imageUrl;
+		// Parent Post
+		if ($typeSets->hierarchical) {
+			$parent = 0;
+			if ($inv->parentInvId > 0) {
+				$parent = self::getWpPostByInvolvementId($typeSets->postType, $inv->parentInvId);
+				$parent = $parent->ID;
+
+				if ($verbose) {
+					echo "<p>Parent Post: $parent</p>";
+				}
 			}
-			Utilities::updatePostImageFromUrl($post->ID, $imageUrl, $post->post_title);
 
+			$post->post_parent = $parent;
+		}
 
-			////////////////////
-			//// SCHEDULING ////
-			////////////////////
+		// Status & Submit
+		$post->post_status = 'publish';
+		wp_update_post($post);
 
-			// Establish a container
-			if ( ! is_array($inv->meetings)) {
-				$inv->meetings = [];
-			}
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "locationName", $inv->location);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "memberCount", $inv->memberCount);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "genderId", $inv->genderId);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupFull", !!$inv->groupFull);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupClosed", !!$inv->closed);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", !!$inv->hasRegQuestions);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regUrl", $inv->redirectUrl);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regTypeId", intval($inv->regTypeId));
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", intval($inv->siteRegTypeId));
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", !!$inv->hasRegQuestions);
+		
+
+		// Registration start
+		if ($inv->regStart === null) {
+			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart");
+		} else {
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart", $inv->regStart);
+		}
+
+		// Registration end
+		if ($inv->regEnd === null) {
+			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd");
+		} else {
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd", $inv->regEnd);
+		}
 
-			// Determine schedule characteristics for terms
-			$upcomingDateTimes = self::computeCommonOccurrences($inv->meetings, $inv->schedules);
-			$uniqueTimeStrings = [];
-			$timeTerms         = [];
-			$days              = [];
+		// Update image, if appropriate.
+		$imageUrl = "";
+		if (!!$typeSets->useImages) {
+			$imageUrl = $inv->imageUrl;
+		}
 
-			foreach ($upcomingDateTimes as $dtString => $dt) {
-				$weekday = "d" . $dtString[0];
+		$imageId = Utilities::updatePostImageFromUrl($post->ID, $imageUrl, $post->post_title);
 
-				// days
-				if ( ! isset($days[$weekday])) {
-					$days[$weekday] = [];
-				}
-				$days[$weekday][] = $dt['example'];
+		////////////////////
+		//// SCHEDULING ////
+		////////////////////
 
-				// times
-				$timeStr = substr($dtString, 2);
-				if ( ! in_array($timeStr, $uniqueTimeStrings)) {
-					$uniqueTimeStrings[] = $timeStr;
-					$timeTerm            = Utilities::getTimeOfDayTermForTime_noI18n($dt['example']);
-					if ( ! in_array($timeTerm, $timeTerms)) {
-						$timeTerms[] = $timeTerm;
-					}
+		// Establish a container
+		if ( ! is_array($inv->meetings)) {
+			$inv->meetings = [];
+		}
+
+		// Determine schedule characteristics for terms
+		$upcomingDateTimes = self::computeCommonOccurrences($inv->meetings, $inv->schedules);
+		$uniqueTimeStrings = [];
+		$timeTerms         = [];
+		$days              = [];
+
+		foreach ($upcomingDateTimes as $dtString => $dt) {
+			$weekday = "d" . $dtString[0];
+
+			// days
+			if ( ! isset($days[$weekday])) {
+				$days[$weekday] = [];
+			}
+			$days[$weekday][] = $dt['example'];
+
+			// times
+			$timeStr = substr($dtString, 2);
+			if ( ! in_array($timeStr, $uniqueTimeStrings)) {
+				$uniqueTimeStrings[] = $timeStr;
+				if ($timeStr === "9999") {
+					// All day; doesn't need to be categorized.  TODO see #184
+					continue;
+				}
+				$timeTerm            = Utilities::getTimeOfDayTermForTime_noI18n($dt['example']);
+				if ( ! in_array($timeTerm, $timeTerms)) {
+					$timeTerms[] = $timeTerm;
 				}
-				unset($timeStr, $weekday);
 			}
+			unset($timeStr, $weekday);
+		}
+
+		// Start and end dates
+		$tense = Taxonomies::TAX_TENSE_PRESENT;
+		if ($inv->firstMeeting !== null && $inv->firstMeeting < Utilities::dateTimeNow()) { // First meeting already happened.
+			$inv->firstMeeting = null; // We don't need to list info from the past.
+		}
+		if ($inv->firstMeeting === null) {
+			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting");
+		} else {
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting", $inv->firstMeeting);
+		}
 
-			// Start and end dates
-			$tense = Taxonomies::TAX_TENSE_PRESENT;
-			if ($inv->firstMeeting !== null && $inv->firstMeeting < $now) { // First meeting already happened.
-				$inv->firstMeeting = null; // We don't need to list info from the past.
+		// Determine if there are meetings beyond the end date, and if so, nullify the end date
+		if ($inv->lastMeeting !== null) {
+			foreach ($inv->meetings as $m) {
+				if ($m->mtgStartDt > $inv->lastMeeting) {
+					$inv->lastMeeting = null;
+					break;
+				}
 			}
-			if ($inv->firstMeeting === null) {
-				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting");
+		}
+		if ($inv->lastMeeting !== null && $inv->lastMeeting > Utilities::dateTimeNowPlus1Y()) { // Last mtg is > 1yr away
+			$inv->lastMeeting = null; // For all practical purposes: it's not ending.
+		}
+		if ($inv->lastMeeting === null) {
+			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting");
+		} else {
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting", $inv->lastMeeting);
+		}
+
+		// Clear Cached Schedule String
+		$cacheKey = $inv->involvementId . "_" . get_locale();
+		wp_cache_delete($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP);
+
+		// Tense
+		if ($inv->firstMeeting !== null) {
+			$tense = Taxonomies::TAX_TENSE_FUTURE;
+		}
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
+		wp_set_post_terms($post->ID, [$tense], Taxonomies::TAX_TENSE, false);
+
+		// Update meetings and schedules
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "meetings", $inv->meetings);
+		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "schedules", $inv->schedules);
+
+		// Day of week taxonomy
+		$dayTerms = [];
+		foreach ($days as $k => $d) {
+			$dayTerms[] = Utilities::getDayOfWeekShortForNumber_noI18n(intval($k[1]));
+		}
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
+		wp_set_post_terms($post->ID, $dayTerms, Taxonomies::TAX_WEEKDAY, false);
+
+		// Time of day taxonomy
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
+		wp_set_post_terms($post->ID, $timeTerms, Taxonomies::TAX_DAYTIME, false);
+
+
+		////////////////
+		//// People ////
+		////////////////
+
+		// Leaders & Members are now imported through the Person sync.
+
+		////////////////////
+		//// Geographic ////
+		////////////////////
+
+		// Handle locations for involvement types that are geo-enabled
+		if ($typeSets->useGeo) {
+			// Handle locations
+			if (property_exists($inv, "lat") && $inv->lat !== null &&
+				property_exists($inv, "lng") && $inv->lng !== null) {
+				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat);
+				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng);
 			} else {
-				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting", $inv->firstMeeting);
+				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat");
+				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng");
 			}
 
-			if ($inv->lastMeeting !== null && $inv->lastMeeting > $nowPlus1Y) { // Last mtg is > 1yr away
-				$inv->lastMeeting = null; // For all practical purposes: it's not ending.
-			}
-			if ($inv->lastMeeting === null) {
-				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting");
+			// Handle Resident Code
+			if (property_exists($inv, "resCodeName") && $inv->resCodeName !== null) {
+				/** @noinspection PhpRedundantOptionalArgumentInspection */
+				wp_set_post_terms($post->ID, [$inv->resCodeName], Taxonomies::TAX_RESCODE, false);
 			} else {
-				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting", $inv->lastMeeting);
+				/** @noinspection PhpRedundantOptionalArgumentInspection */
+				wp_set_post_terms($post->ID, [], Taxonomies::TAX_RESCODE, false);
 			}
+		}
+
 
-			// Clear Cached Schedule String
-			$cacheKey = $inv->involvementId . "_" . get_locale();
-			wp_cache_delete($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP);
+		////////////////
+		//// Campus ////
+		////////////////
 
-			// Tense
-			if ($inv->firstMeeting !== null) {
-				$tense = Taxonomies::TAX_TENSE_FUTURE;
+		if (TouchPointWP::instance()->settings->enable_campuses === "on") {
+			if (property_exists($inv, "campusName") && $inv->campusName !== null) {
+				/** @noinspection PhpRedundantOptionalArgumentInspection */
+				wp_set_post_terms($post->ID, [$inv->campusName], Taxonomies::TAX_CAMPUS, false);
+			} else {
+				/** @noinspection PhpRedundantOptionalArgumentInspection */
+				wp_set_post_terms($post->ID, [], Taxonomies::TAX_CAMPUS, false);
 			}
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, [$tense], Taxonomies::TAX_TENSE, false);
 
-			// Update meetings and schedules
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "meetings", $inv->meetings);
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "schedules", $inv->schedules);
+			if (Translation::useCampusAsLanguage() && $inv->campusName !== null) {
 
-			// Day of week taxonomy
-			$dayTerms = [];
-			foreach ($days as $k => $d) {
-				$dayTerms[] = Utilities::getDayOfWeekShortForNumber_noI18n(intval($k[1]));
+				// Set content's original language based on Campus.
+				$langCode = Translation::getWpmlLangCodeForString($inv->campusName);
+				if ($langCode !== null) {
+					$args = [
+						'element_id'           => $post->ID,
+						'element_type'         => apply_filters('wpml_element_type', $typeSets->postTypeWithPrefix()),
+						'language_code'        => $langCode,
+						'source_language_code' => $langCode,
+						'trid'                 => $post->ID
+					];
+					do_action( 'wpml_set_element_language_details', $args);
+					if ($verbose) {
+						echo "<p>Language Set to: $langCode</p>";
+					}
+				}
 			}
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $dayTerms, Taxonomies::TAX_WEEKDAY, false);
+		}
 
-			// Time of day taxonomy
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $timeTerms, Taxonomies::TAX_DAYTIME, false);
 
+		/////////////////////
+		//// Demographic ////
+		/////////////////////
 
-			////////////////
-			//// People ////
-			////////////////
+		// Handle Marital Status
+		$maritalTax = [];
+		if ($inv->marital_denom > 4) { // only include involvements with at least 4 people with known marital statuses.
+			$marriedProportion = (float)$inv->marital_married / $inv->marital_denom;
+			if ($marriedProportion > 0.7) {
+				$maritalTax[] = "mostly_married";
+			} elseif ($marriedProportion < 0.3) {
+				$maritalTax[] = "mostly_single";
+			}
+		}
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
+		wp_set_post_terms($post->ID, $maritalTax, Taxonomies::TAX_INV_MARITAL, false);
 
-			// Leaders & Members are now imported through the Person sync.
+		// Handle Age Groups
+		if ($inv->age_groups === null) {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, [], Taxonomies::TAX_AGEGROUP, false);
+		} else {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, $inv->age_groups, Taxonomies::TAX_AGEGROUP, false);
+		}
 
-			////////////////////
-			//// Geographic ////
-			////////////////////
 
-			// Handle locations for involvement types that are geo-enabled
-			if ($typeSets->useGeo) {
-				// Handle locations
-				if (property_exists($inv, "lat") && $inv->lat !== null &&
-					property_exists($inv, "lng") && $inv->lng !== null) {
-					update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat);
-					update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng);
-				} else {
-					delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat");
-					delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng");
-				}
+		///////////////////
+		//// Divisions ////
+		///////////////////
 
-				// Handle Resident Code
-				if (property_exists($inv, "resCodeName") && $inv->resCodeName !== null) {
-					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [$inv->resCodeName], Taxonomies::TAX_RESCODE, false);
-				} else {
-					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [], Taxonomies::TAX_RESCODE, false);
+		// Handle divisions
+		$divs = [];
+		if ($inv->divs !== null) {
+			foreach ($inv->divs as $d) {
+				$tid = TouchPointWP::getDivisionTermIdByDivId($d);
+				if ( ! ! $tid) {
+					$divs[] = $tid;
 				}
 			}
+		}
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
+		wp_set_post_terms($post->ID, $divs, Taxonomies::TAX_DIV, false);
 
+		if ($verbose) {
+			echo "<p>Division Terms:</p>";
+			Utilities::var_dump_expandable($divs);
+		}
 
-			////////////////
-			//// Campus ////
-			////////////////
 
-			if (TouchPointWP::instance()->settings->enable_campuses === "on") {
-				if (property_exists($inv, "campusName") && $inv->campusName !== null) {
-					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [$inv->campusName], Taxonomies::TAX_CAMPUS, false);
-				} else {
-					/** @noinspection PhpRedundantOptionalArgumentInspection */
-					wp_set_post_terms($post->ID, [], Taxonomies::TAX_CAMPUS, false);
+		//////////////////
+		//// Meetings ////
+		//////////////////
+
+		$postsToKeep = self::updateMeetingsForInvolvement($post, $inv, $typeSets, $imageId, $verbose);
+
+		if ($verbose) {
+			echo "<hr />";
+		}
+
+		unset($post);
+
+		return $postsToKeep;
+	}
+
+	/**
+	 * @param object                       $post  The parent post, which could be a group or Meeting.
+	 * @param object                       $inv   The involvement object from the API.
+	 * @param Involvement_PostTypeSettings $typeSets
+	 * @param int                          $imagePostId
+	 * @param bool                         $verbose
+	 *
+	 * @return int[] An array of Post IDs that have been updated, and which should be retained.
+	 */
+	protected static function updateMeetingsForInvolvement(
+		object $post, object $inv, Involvement_PostTypeSettings $typeSets,
+		int $imagePostId, bool $verbose = false): array
+	{
+
+		// Return if meetings shouldn't be imported at all.
+		if (!$typeSets->importMeetings && !$inv->showInSites) {
+			self::doMeetingMetaUpdates($post, null, false, $imagePostId, $verbose);
+			return [$post->ID];
+		}
+
+		////////////////////////
+		// Determine Strategy //
+		////////////////////////
+
+		switch (count($inv->meetings)) {
+			case 0:
+				$strategy = self::MEETING_STRATEGY_NONE;
+				break;
+
+			case 1:
+				$strategy = self::MEETING_STRATEGY_SINGLE;
+				break;
+
+			default:
+				$strategy = self::MEETING_STRATEGY_MULTIPLE;
+				break;
+		}
+
+		////////////////////
+		// Title and Slug //
+		////////////////////
+
+		$slugStrategy = [];
+		$slugFormats = [ // Define possible slugs, in increasing specificity.
+			//'Y',  Causes issues with Core. https://wordpress.stackexchange.com/a/367757/185189
+			'Y-m',
+			'Y-m-d',
+			'Y-m-d-g',
+			'Y-m-d-ga',
+			'Y-m-d-gia',
+			'Y-m-d-His',
+		];
+		if ($strategy === self::MEETING_STRATEGY_SINGLE) {
+			$inv->titleToUse = $inv->meetings[0]->name ?? $inv->titleToUse;
+		} elseif ($strategy === self::MEETING_STRATEGY_MULTIPLE) {
+			foreach ($inv->meetings as $mtgO) {
+				foreach ($slugFormats as $f) {
+					$s = $mtgO->mtgStartDt->format($f);
+					if (!isset($slugStrategy[$s])) {
+						$slugStrategy[$s] = 1;
+					} else {
+						$slugStrategy[$s]++;
+					}
 				}
 			}
+		}
+
+		$postsToKeep = [];
 
+		if ($strategy === self::MEETING_STRATEGY_MULTIPLE) {
 
-			/////////////////////
-			//// Demographic ////
-			/////////////////////
+			// If the main post was previously a single, it needs to have the meeting info removed.
+			self::doMeetingMetaUpdates($post, null, false, $imagePostId, $verbose);
 
-			// Handle Marital Status
-			$maritalTax = [];
-			if ($inv->marital_denom > 4) { // only include involvements with at least 4 people with known marital statuses.
-				$marriedProportion = (float)$inv->marital_married / $inv->marital_denom;
-				if ($marriedProportion > 0.7) {
-					$maritalTax[] = "mostly_married";
-				} elseif ($marriedProportion < 0.3) {
-					$maritalTax[] = "mostly_single";
+			foreach ($inv->meetings as $mtgO) {
+
+				////////////////////
+				// Title and Slug //
+				////////////////////
+
+				$title = $mtgO->name ?? $inv->titleToUse;
+				$slug = $mtgO->mtgId; // Default slug of the meeting ID -- collision-safe.
+				foreach ($slugFormats as $f) {
+					$s = $mtgO->mtgStartDt->format($f);
+					if ($slugStrategy[$s] == 1) {
+						$slug = $s;
+						break;
+					}
 				}
-			}
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $maritalTax, Taxonomies::TAX_INV_MARITAL, false);
 
-			// Handle Age Groups
-			if ($inv->age_groups === null) {
-				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, [], Taxonomies::TAX_AGEGROUP, false);
-			} else {
-				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, $inv->age_groups, Taxonomies::TAX_AGEGROUP, false);
-			}
 
+				/////////////////////////
+				// Find or Create Post //
+				/////////////////////////
+
+				$loops = 1;
+				do {
+					$mtgP = new WP_Query([
+						                     'post_type'      => $typeSets->postTypeWithPrefix(),
+						                     'post_name'      => $slug,
+						                     'post_parent'    => $post->ID,
+						                     'posts_per_page' => 10,
+						                     'numberposts'    => 10,
+						                     'meta_key'       => Meeting::MEETING_META_KEY,
+						                     'meta_value'     => $mtgO->mtgId,
+						                     'meta_compare'   => '='
+					                     ]);
+
+					$counts = $mtgP->post_count;
+					$mtgP   = $mtgP->get_posts();
+
+					if ($counts > 1) {  // multiple posts match, which isn't great.
+						new TouchPointWP_Exception("Multiple Posts Exist, Attempting to Remedy Automatically", 170007);
+						if ($verbose) {
+							echo "<p><b>Multiple Posts Exist.  An attempt will be made to remove them.</b></p>";
+						}
 
-			///////////////////
-			//// Divisions ////
-			///////////////////
+						for ($i = 1; $i <= $counts; $i++) {
+							wp_delete_post($mtgP[$i]->ID, true);
+						}
+					}
+					$loops++;
+				} while ($counts > 1 && $loops < 3);
 
-			// Handle divisions
-			$divs = [];
-			if ($inv->divs !== null) {
-				foreach ($inv->divs as $d) {
-					$tid = TouchPointWP::getDivisionTermIdByDivId($d);
-					if ( ! ! $tid) {
-						$divs[] = $tid;
+				if ($counts > 0) { // post exists already.
+					$mtgP = reset($mtgP);
+				} else {
+					if ($verbose) {
+						echo "<p>Post not found for Meeting $mtgO->mtgId.  Creating.</p>";
 					}
+					// create new
+					$mtgP = wp_insert_post([
+						                       'post_type'   => $typeSets->postTypeWithPrefix(),
+						                       'post_title'  => $title,
+						                       'post_name'   => $slug,
+						                       'post_parent' => $post->ID,
+						                       'post_status' => 'publish',
+						                       'meta_input'  => [
+							                       Meeting::MEETING_META_KEY => $mtgO->mtgId
+						                       ]
+					                       ]);
+					$mtgP = get_post($mtgP);
+				}
+
+				$mtgP->post_title = $title;
+				$mtgP->post_content = Utilities::standardizeHtml($inv->description, "meeting-import");
+				$mtgP->post_parent = $post->ID;
+
+				self::doMeetingMetaUpdates($mtgP, $mtgO, !!$inv->showInSites, $imagePostId, $verbose);
+
+				wp_update_post($mtgP);
+
+				if ($mtgP->post_name !== $slug) {
+					Utilities::forceSlugUpdate($mtgP->ID, $slug);
 				}
+
+				$postsToKeep[] = $mtgP->ID;
 			}
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $divs, Taxonomies::TAX_DIV, false);
+		} else { // Single and None
+			$post->post_title = $inv->titleToUse;
 
-			if ($verbose) {
-				echo "<p>Division Terms:</p>";
-				var_dump($divs);
+			// TODO resolve $post declarations.
+			// TODO resolve Undefined array key 0 warning
+			// TODO make sure synced
+			if ($strategy === self::MEETING_STRATEGY_SINGLE) {
+				self::doMeetingMetaUpdates($post, $inv->meetings[0], !!$inv->showInSites, $imagePostId, $verbose);
+			} else { // MEETING_STRATEGY_NONE
+				self::doMeetingMetaUpdates($post, null, false, $imagePostId, $verbose);
 			}
 
+			wp_update_post($post);
+
 			$postsToKeep[] = $post->ID;
+		}
+
+		return $postsToKeep;
+	}
+
+	/**
+	 * Update meta fields specific to Meetings, such as start/end date/time.  
+	 * 
+	 * (This is included in this class and not in Meeting because it's a part of the Involvement import process and
+	 * the protected access is appropriate.)
+	 *
+	 * @param WP_Post $mtgP
+	 * @param ?object $mtgO
+	 * @param bool    $feature
+	 * @param int     $imagePostId
+	 * @param bool    $verbose
+	 *
+	 * @return void
+	 */
+	protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, bool $feature, int $imagePostId, bool $verbose = false): void
+	{
+		// If the main post was previously a single, it needs to have the meeting info removed.
+		if ($mtgO === null) {
+			delete_post_meta($mtgP->ID, Meeting::MEETING_META_KEY);
+			delete_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY);
+			delete_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY);
+			delete_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY);
+			delete_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY);
+			delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
+		} else {
+			update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId);
+			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, intval($mtgO->mtgStartDt?->format('U')));
+			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, intval($mtgO->mtgEndDt?->format('U')));
+			update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, !!$feature);
+			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
+			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
 
 			if ($verbose) {
-				echo "<hr />";
+				$link = get_permalink($mtgP);
+				echo "<p><a href=\"$link\">Updating Post $mtgP->ID</a> based on Meeting $mtgO->mtgId.</p>";
 			}
+		}
+	}
 
-			unset($post);
+	/**
+	 * @param object       $inv Involvement info from API
+	 * @param DateTimeZone $siteTz Timezone object
+	 * @param bool         $verbose Print details
+	 *
+	 * @return void
+	 */
+	protected static function standardizeApiData(object $inv, DateTimeZone $siteTz, bool $verbose): void
+	{
+		if ($verbose) {
+			Utilities::var_dump_expandable($inv);
 		}
-		unset($inv);
 
-		//////////////////
-		//// Removals ////
-		//////////////////
+		// Start and end dates
+		if ($inv->firstMeeting !== null) {
+			try {
+				$inv->firstMeeting = new DateTimeExtended($inv->firstMeeting, $siteTz);
+				$inv->firstMeeting->isAllDay = true;
+			} catch (Exception) {
+				$inv->firstMeeting = null;
+			}
+		}
+		if ($inv->lastMeeting !== null) {
+			try {
+				$inv->lastMeeting = new DateTimeExtended($inv->lastMeeting, $siteTz);
+				$inv->lastMeeting->isAllDay = true;
+			} catch (Exception) {
+				$inv->lastMeeting = null;
+			}
+		}
 
-		// Delete posts that are no longer current
-		$q        = new WP_Query([
-									 'post_type'    => $typeSets->postType,
-									 'nopaging'     => true,
-									 'post__not_in' => $postsToKeep
-								 ]);
-		$removals = 0;
-		foreach ($q->get_posts() as $post) {
-			set_time_limit(10);
-			wp_delete_post($post->ID, true);
-			$removals++;
+		// Meeting and Schedule date/time strings as DateTimeExtended
+		foreach ($inv->schedules as $i => $s) {
+			try {
+				if ($s->nextStartDt === $s->nextEndDt || $s->nextEndDt == null) {
+					$s->nextEndDt = null;
+				} else {
+					$s->nextEndDt = new DateTimeExtended($s->nextEndDt, $siteTz);
+				}
+				$s->nextStartDt = new DateTimeExtended($s->nextStartDt, $siteTz);
+				$s->nextStartDt->isAllDay = self::apiScheduleIsAllDay($s);
+			} catch (Exception) {
+				unset($inv->schedules[$i]);
+			}
 		}
+		foreach ($inv->meetings as $i => $m) {
+			try {
+				if ($m->mtgStartDt === $m->mtgEndDt || $m->mtgEndDt == null) {
+					$m->mtgEndDt = null;
+				} else {
+					$m->mtgEndDt = new DateTimeExtended($m->mtgEndDt, $siteTz);
+				}
+				$m->mtgStartDt = new DateTimeExtended($m->mtgStartDt, $siteTz);
+				$m->mtgStartDt->isAllDay = self::apiMeetingIsAllDay($m);
+			} catch (Exception) {
+				unset($inv->meetings[$i]);
+			}
 
-		return $removals + count($invData);
+			if ($m->name == null || trim($m->name) === "") {
+				$m->name = null;
+			}
+
+			$m->involvementId = $inv->involvementId;
+		}
+
+		// Registration start
+		if ($inv->regStart !== null) {
+			try {
+				$inv->regStart = new DateTimeImmutable($inv->regStart, $siteTz);
+			} catch (Exception) {
+				$inv->regStart = null;
+			}
+		}
+
+		// Registration end
+		if ($inv->regEnd !== null) {
+			try {
+				$inv->regEnd = new DateTimeImmutable($inv->regEnd, $siteTz);
+			} catch (Exception) {
+				$inv->regEnd = null;
+			}
+		}
 	}
 
+
 	/**
 	 * Replace the date with the schedule summary
 	 *
@@ -2732,15 +3306,20 @@ public function hosts(): ?PersonArray
 				return null;
 			}
 
-			$q = new PersonQuery(
-				[
-					'meta_key'     => Person::META_INV_MEMBER_PREFIX . $this->invId,
-					'meta_value'   => $s->hostTypes,
-					'meta_compare' => 'IN'
-				]
-			);
+			// If there aren't host types, there are no hosts.
+			if (count($s->hostTypes) == 0) {
+				$this->_hosts = new PersonArray();
+			} else {
+				$q = new PersonQuery(
+					[
+						'meta_key'     => Person::META_INV_MEMBER_PREFIX . $this->invId,
+						'meta_value'   => $s->hostTypes,
+						'meta_compare' => 'IN'
+					]
+				);
 
-			$this->_hosts = $q->get_results();
+				$this->_hosts = $q->get_results();
+			}
 		}
 
 		return $this->_hosts;
@@ -2750,7 +3329,7 @@ public function hosts(): ?PersonArray
 	 * Get the members of the involvement.  Note that not all members are necessarily synced to WordPress from
 	 * TouchPoint.
 	 *
-	 * @return PersonArray
+	 * @return ?PersonArray
 	 */
 	public function members(): ?PersonArray
 	{
@@ -2771,7 +3350,7 @@ public function members(): ?PersonArray
 	/**
 	 * Get the settings object that corresponds to the Involvement's Post Type
 	 *
-	 * @return Involvement_PostTypeSettings|null
+	 * @return ?Involvement_PostTypeSettings
 	 */
 	protected function settings(): ?Involvement_PostTypeSettings
 	{
@@ -2828,54 +3407,53 @@ public function notableAttributes(array $exclude = []): array
 	{
 		$attrs = [];
 
-		$schStr = self::scheduleString($this->invId, $this);
-		if ($schStr) {
-			$attrs[] = $schStr;
+		$asMeeting = $this->AsAMeeting();
+		if ($asMeeting !== null) {
+			$attrs = $asMeeting->notableAttributes(['involvement']);
+		} else {
+			$schStr = self::scheduleString($this->invId, $this);
+			if ($schStr) {
+				$attrs['schedule'] = $schStr;
+			}
 		}
 		unset($schStr);
 
 		if ($this->locationName) {
-			$attrs[] = $this->locationName;
+			$attrs['location'] = $this->locationName;
 		}
 
-		foreach ($this->getDivisionsStrings() as $a) {
-			$attrs[] = $a;
+		foreach ($this->getDivisionsLinks() as $a) {
+			$attrs['divisions'] = $a;
 		}
 
 		if ($this->leaders()->count() > 0) {
-			$attrs[] = $this->leaders()->__toString();
+			$attrs['leaders'] = $this->leaders()->toLinks();
 		}
 
 		if ($this->genderId != 0) {
 			switch ($this->genderId) {
 				case 1:
-					$attrs[] = __('Men Only', 'TouchPoint-WP');
+					$attrs['gender'] = __('Men Only', 'TouchPoint-WP');
 					break;
 				case 2:
-					$attrs[] = __('Women Only', 'TouchPoint-WP');
+					$attrs['gender'] = __('Women Only', 'TouchPoint-WP');
 					break;
 			}
 		}
 
 		$canJoin = $this->acceptingNewMembers();
 		if (is_string($canJoin)) {
-			$attrs[] = $canJoin;
+			$attrs['closed'] = $canJoin;
 		}
 
-		$attrs = array_filter($attrs, fn($i) => ! in_array($i, $exclude));
-
-		if ($this->hasGeo() &&
-			(
-				$exclude === [] ||
-				(
-					$this->locationName !== null &&
-					! in_array($this->locationName, $exclude)
-				)
+		if ($this->hasGeo() && (
+				$this->locationName !== null &&
+				! in_array($this->locationName, $exclude)
 			)
 		) {
 			$dist = $this->getDistance();
 			if ($dist !== false) {
-				$attrs[] = wp_sprintf(
+				$attrs['distance'] = wp_sprintf(
 					_x(
 						"%2.1fmi",
 						"miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'",
@@ -2886,6 +3464,8 @@ public function notableAttributes(array $exclude = []): array
 			}
 		}
 
+		$attrs = $this->processAttributeExclusions($attrs, $exclude);
+
 		/**
 		 * Allows for manipulation of the notable attributes strings for an Involvement.  An array of strings. 
 		 * Typically, these are the standardized strings that appear on the Involvement to give information about it,
@@ -3045,6 +3625,9 @@ public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?
 	 */
 	protected function AsAMeeting(): ?Meeting
 	{
+		if (!$this->post) {
+			$this->post = get_post($this->post_id);
+		}
 		if (Meeting::postIsType($this->post)) {
 			try {
 				return Meeting::fromPost($this->post);
@@ -3079,6 +3662,18 @@ public function getTouchPointId(): int
 		return $this->invId;
 	}
 
+	/**
+	 * Indicates if the given post can be instantiated as an Involvement. 
+	 *
+	 * @param \WP_Post $post
+	 *
+	 * @return bool
+	 */
+	public static function postIsType(\WP_Post $post): bool
+	{
+		return intval(get_post_meta($post->ID, TouchPointWP::INVOLVEMENT_META_KEY, true)) > 0;
+	}
+
 	/**
 	 * Handles the API call to join an involvement through a 'join' button.
 	 */
@@ -3099,9 +3694,9 @@ private static function ajaxInvJoin(): void
 		} else {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-								 'error'      => "Invalid Post Type.",
-								 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
-							 ]);
+				                 'error'      => "Invalid Post Type.",
+				                 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
+			                 ]);
 			exit;
 		}
 
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index ae8bcb17..8c3a9c6f 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -64,7 +64,7 @@ class Involvement_PostTypeSettings
 	 */
 	final public static function &instance(): array
 	{
-		if ( ! isset(self::$settings)) {
+		if (!isset(self::$settings)) {
 			$json        = json_decode(TouchPointWP::instance()->settings->inv_json);
 			$settingsArr = [];
 
@@ -72,7 +72,24 @@ final public static function &instance(): array
 				$settingsArr[] = new Involvement_PostTypeSettings($o);
 			}
 
-			self::$settings = $settingsArr;
+			if (TouchPointWP::instance()->settings->enable_meeting_cal === 'on') {
+				$settingsArr[] = Meeting::getTypeSettings();
+			}
+
+			/**
+			 * Adjust Involvement Post Type Settings.  These settings define virtually all attributes of how a set of 
+			 * Involvements is synced to WordPress.
+			 *
+			 * If you're using this filter, you will need to add your function VERY early (init with a low sequence
+			 * number or earlier) because post types are registered early.
+			 *
+			 * @see Involvement_PostTypeSettings
+			 *
+			 * @since 0.0.90
+			 *
+			 * @param Involvement_PostTypeSettings[] $settingsArr An array of the Post Type Settings objects.
+			 */
+			self::$settings = apply_filters("tp_get_involvement_type_settings", $settingsArr);
 		}
 
 		return self::$settings;
@@ -309,19 +326,6 @@ public static function validateNewSettings(string $new): string
 		return json_encode($new);
 	}
 
-	/**
-	 * @param string|string[]|int[] $memberTypes
-	 *
-	 * @return int[]
-	 */
-	protected static function memberTypesToInts($memberTypes): array
-	{
-		$memberTypes = str_replace('mt', '', $memberTypes);
-
-		/** @noinspection SpellCheckingInspection */
-		return array_map('intval', $memberTypes);
-	}
-
 	/**
 	 * Get the leader member types, as an array of ints
 	 *
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 08d422dc..84d90a58 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -231,7 +231,7 @@ private static function ajaxSubmitRsvps(): void
 	}
 
 	/**
-	 * @param $btnClass
+	 * @param string $btnClass
 	 *
 	 * @return string
 	 */
diff --git a/src/TouchPoint-WP/Rsvp.php b/src/TouchPoint-WP/Rsvp.php
index 0ff7a04e..1b1fe9f8 100644
--- a/src/TouchPoint-WP/Rsvp.php
+++ b/src/TouchPoint-WP/Rsvp.php
@@ -11,12 +11,10 @@
 	exit(1);
 }
 
-if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once 'Meeting.php';
-}
-
 /**
  * This class provides the RSVP functionality for Meetings.
+ *
+ * @deprecated  0.0.90
  */
 abstract class Rsvp implements module
 {
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index 4c2a784c..2a766224 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -6,6 +6,7 @@
 namespace tp\TouchPointWP\Utilities;
 
 use ArrayObject;
+use tp\TouchPointWP\Utilities;
 
 /**
  * A collection of things that can be cast to a string by gluing them together with a simple implode().
@@ -50,6 +51,18 @@ public function prepend($value): void
 		$this->exchangeArray($array);
 	}
 
+	/**
+	 * Determine if the stringable array (haystack) contains the given needle
+	 *
+	 * @param $needle
+	 *
+	 * @return bool
+	 */
+	public function contains($needle): bool
+	{
+		return in_array($needle, $this->getArrayCopy());
+	}
+
 	/**
 	 * Standard method to stringify.
 	 *
@@ -59,4 +72,14 @@ public function __toString()
 	{
 		return implode($this->separator, $this->getArrayCopy());
 	}
+
+	/**
+	 * Convert the array to a list string with ampersands and such.
+	 *
+	 * @return string
+	 */
+	public function toListString(): string
+	{
+		return Utilities::stringArrayToListString($this->getArrayCopy());
+	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/module.php b/src/TouchPoint-WP/module.php
index 8c34d20c..42835cfe 100644
--- a/src/TouchPoint-WP/module.php
+++ b/src/TouchPoint-WP/module.php
@@ -19,8 +19,11 @@ public static function load(): bool;
 
 	public const TEMPLATES_TO_OVERWRITE = [
 		'archive.php',
+		'archive.html',
 		'singular.php',
+		'singular.html',
 		'single.php',
+		'single.html',
 		'index.php',
 		'template-canvas.php'
 	];
diff --git a/src/templates/involvement-archive.php b/src/templates/involvement-archive.php
index ea769f96..553c00f3 100644
--- a/src/templates/involvement-archive.php
+++ b/src/templates/involvement-archive.php
@@ -46,6 +46,8 @@
         </div>
     </header>
 
+    <main class="TouchPointWP-main">
+
     <?php
 
     Involvement::doInvolvementList($wp_query);
@@ -62,4 +64,7 @@
     }
 }
 
+?>
+    </main><!-- .TouchPointWP-main -->
+<?php
 get_footer();
\ No newline at end of file
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 22168cce..97f86685 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -1,6 +1,8 @@
 <?php
 
 use tp\TouchPointWP\Involvement;
+use tp\TouchPointWP\Meeting;
+use tp\TouchPointWP\PostTypeCapable;
 use tp\TouchPointWP\TouchPointWP;
 
 $postType = get_post_type();
@@ -10,7 +12,8 @@
 
 the_post();
 $p   = get_post();
-$inv = Involvement::fromPost($p);
+$tps = TouchPointWP::instance()->settings;
+$obj = PostTypeCapable::fromPost($p);
 
 TouchPointWP::enqueuePartialsStyle();
 
@@ -22,7 +25,7 @@
     </div>
 </header>
 
-<article <?php post_class(); ?> id="post-<?php the_ID(); ?>" data-tp-involvement="<?php echo $inv->post_id ?>">
+<article <?php post_class(); ?> id="post-<?php the_ID(); ?>" data-tp-involvement="<?php echo $p->ID ?>">
     <div class="post-inner involvement-inner">
         <div class="entry-content">
             <?php
@@ -33,10 +36,10 @@
 
     <div class="section-inner TouchPointWP-detail">
         <div class="TouchPointWP-detail-cell">
-            <div class="TouchPointWP-detail-cell-section involvement-logistics" >
+            <div class="TouchPointWP-detail-cell-section involvement-logistics">
                 <?php
                 $metaStrings = [];
-                foreach ($inv->notableAttributes() as $a)
+                foreach ($obj->notableAttributes() as $a)
                 {
                     $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
                 }
@@ -44,7 +47,7 @@
                 ?>
             </div>
             <div class="TouchPointWP-detail-cell-section involvement-actions">
-                <?php echo $inv->getActionButtons('single-template', "btn button") ?>
+                <?php echo $obj->getActionButtons('single-template', "btn button") ?>
             </div>
         </div>
         <?php if ($settings->useGeo && $inv->geo !== null) { ?>
@@ -57,10 +60,12 @@
 
 <?php if ($settings->hierarchical) {
     $children = get_children([
-                                 'post_parent' => $inv->post_id,
+                                 'post_parent' => $p->ID,
                                  'orderby' => 'title',
                                  'order' => 'ASC',
-                                 'post_type' => $postType
+                                 'meta_key'     => TouchPointWP::INVOLVEMENT_META_KEY,
+                                 'meta_value'   => 0,
+                                 'meta_compare' => '>'
                              ]);
     if (count($children) > 0) {
         echo "<div class='involvement-list child-involvements'>";
@@ -76,6 +81,31 @@
     if (count($children) > 0) {
         echo "</div>";
     }
+}
+
+if ($settings->importMeetings && $tps->enable_meeting_cal === "on") {
+	$meetings = get_children([
+		                         'post_parent'  => $p->ID,
+		                         'order'        => 'ASC',
+		                         'orderby'      => 'meta_value_num',
+		                         'meta_key'     => Meeting::MEETING_START_META_KEY,
+		                         'meta_value'   => time(),
+		                         'meta_compare' => '>'
+	                         ]);
+	if (count($meetings) > 0) {
+		echo "<div class='event-list'>";
+	}
+	foreach ($meetings as $post) {
+		/** @var WP_Post $post */
+		$loadedPart = get_template_part('list-item', 'event-list-item');
+		if ($loadedPart === false) {
+			TouchPointWP::enqueuePartialsStyle();
+			require TouchPointWP::$dir . "/src/templates/parts/meeting-list-item.php";
+		}
+	}
+	if (count($meetings) > 0) {
+		echo "</div>";
+	}
 } ?>
 
 <?php get_footer();
\ No newline at end of file
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
index 71721111..68eb3377 100644
--- a/src/templates/meeting-archive.php
+++ b/src/templates/meeting-archive.php
@@ -8,7 +8,7 @@
  * Template Name: TouchPoint Meeting List
  */
 
-use tp\TouchPointWP\Meeting;
+use tp\TouchPointWP\CalendarGrid;
 use tp\TouchPointWP\TouchPointWP;
 
 $postType = is_archive() ? get_queried_object()->name : false;
@@ -32,20 +32,30 @@
         </div>
     </header>
 
+    <main class="TouchPointWP-main">
+
     <?php
 
-    Meeting::doMeetingList($wp_query);
+    if (!isset($_GET['page']) || !preg_match('/^(?P<mo>[0-9]{2})-(?P<yr>[0-9]{4})$/', $_GET['page'], $matches)) {
+	    $matches = [
+		    'mo' => null,
+		    'yr' => null
+	    ];
+    }
+
+    $grid = new CalendarGrid($wp_query, $matches['mo'], $matches['yr']);
+
+	echo $grid->navBar(true);
+    echo $grid;
 
     wp_reset_query();
     $taxQuery = [[]];
     $wp_query->tax_query->queries = $taxQuery;
     $wp_query->query_vars['tax_query'] = $taxQuery;
     $wp_query->is_tax = false;  // prevents templates from thinking this is a taxonomy archive
-} else {
-    $loadedPart = get_template_part('list-none', 'meeting-list-none');
-    if ($loadedPart === false) {
-        require TouchPointWP::$dir . "/src/templates/parts/meeting-list-none.php";
-    }
 }
+    ?>
+</main><!-- .TouchPointWP-main -->
+<?php
 
 get_footer();
\ No newline at end of file
diff --git a/src/templates/partner-archive.php b/src/templates/partner-archive.php
index 077b02d0..3571d493 100644
--- a/src/templates/partner-archive.php
+++ b/src/templates/partner-archive.php
@@ -42,6 +42,8 @@
             <?php } ?>
         </div>
     </header>
+
+    <main class="TouchPointWP-main">
     <div class="partner-list">
     <?php
 
@@ -54,6 +56,7 @@
     }
     ?>
     </div>
+    </main>
     <?php
 } else {
     $loadedPart = get_template_part('list-none', 'involvement-list-none');
diff --git a/src/templates/partner-single.php b/src/templates/partner-single.php
index a495a597..efda5cd3 100644
--- a/src/templates/partner-single.php
+++ b/src/templates/partner-single.php
@@ -21,7 +21,7 @@
     </div>
 </header>
 
-<article <?php post_class(); ?> id="post-<?php the_ID(); ?>" data-tp-partner="<?php echo $prtnr->post_id ?>">
+<article <?php post_class(); ?> id="post-<?php the_ID(); ?>" data-tp-partner="<?php echo $prtnr->post_id() ?>">
     <div class="post-inner partner-inner">
         <div class="entry-content">
             <?php
diff --git a/src/templates/parts/involvement-list-item.php b/src/templates/parts/involvement-list-item.php
index b5efbdce..80b94498 100644
--- a/src/templates/parts/involvement-list-item.php
+++ b/src/templates/parts/involvement-list-item.php
@@ -2,6 +2,7 @@
 
 use tp\TouchPointWP\Involvement;
 use tp\TouchPointWP\Involvement_PostTypeSettings;
+use tp\TouchPointWP\PostTypeCapable;
 use tp\TouchPointWP\TouchPointWP;
 
 global $post;
@@ -9,7 +10,7 @@
 /** @var $post WP_Post */
 /** @var $settings Involvement_PostTypeSettings */
 
-$inv = Involvement::fromPost($post);
+$inv = PostTypeCapable::fromPost($post);
 
 if (!isset($settings)) {
     $settings = Involvement::getSettingsForPostType($inv->invType);
@@ -21,7 +22,7 @@
 
 ?>
 
-<article id="<?php echo $postTypeClass; ?>-<?php the_ID(); ?>" <?php post_class($postItemClass); ?> data-tp-involvement="<?php echo $inv->post_id ?>">
+<article id="<?php echo $postTypeClass; ?>-<?php the_ID(); ?>" <?php post_class($postItemClass); ?> data-tp-involvement="<?php echo $post->ID ?>">
     <header class="entry-header">
         <div class="entry-header-inner">
         <?php
@@ -67,7 +68,7 @@
             $link = get_permalink($child);
             echo "<h3 class='inline'><a href=\"$link\" class='small'>$child->post_title</a></h3>";
 
-	        $childInv = Involvement::fromPost($child);
+	        $childInv = PostTypeCapable::fromPost($child);
 
 	        $metaStrings = [];
 	        foreach ($childInv->notableAttributes($notableAttributes) as $a)

From ad9b498c6f892b1937a11602508ed264e733fa10 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 May 2024 21:00:21 -0400
Subject: [PATCH 117/423] Docs typo

---
 docs                                        | 2 +-
 src/TouchPoint-WP/Utilities/DateFormats.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs b/docs
index e3bc0ab2..0825550d 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit e3bc0ab26aa58ae0e378cfb3f75f95cfaa3becc4
+Subproject commit 0825550d5c2b840783878236156093c6318a53d0
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 5126507f..b151f0ee 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -56,7 +56,7 @@ public static function TimeRangeStringFormatted(DateTimeInterface $startDt, Date
 
 		/**
 		 * Allows for manipulation of a time range string.  For example, combined with `tp_adjust_time_string`, you
-		 * can change a range of 1:00pm - 2:00pm to 1pm - 2pm.
+		 * can change a range of 1:00pm - 2:00pm to 1-2pm.
 		 *
 		 * @since 0.0.90
 		 *

From f1a1c6c7d44e8d4422e9eac53bc9fab41a11d665 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 15 May 2024 11:42:02 -0400
Subject: [PATCH 118/423] Improving image import process to make sure timeouts
 aren't causing huge issues. Closes #165

---
 src/TouchPoint-WP/Utilities.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 50eaf2a6..07656926 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -495,6 +495,14 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 		require_once(ABSPATH . 'wp-admin/includes/file.php');
 		require_once(ABSPATH . 'wp-admin/includes/image.php');
 
+		// If an image sideload was started but not finished within the last hour, something has gone wrong.
+		if (intval(get_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload")) > (time() - 60*60)) {
+			new TouchPointWP_Exception("Image import appears to have gotten stuck.", 170008);
+			return 0;
+		}
+
+		update_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload", time(), false);
+
 		// Post image
 		global $wpdb;
 		$oldAttId = get_post_thumbnail_id($postId);
@@ -529,9 +537,13 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 			}
 		} catch (Exception $e) {
 			echo "Exception occurred: " . $e->getMessage();
+			update_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload", 0, false);
 			wp_delete_attachment($attId, true);
 			return 0;
 		}
+
+		update_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload", 0, false);
+
 		if (is_wp_error($attId)) {
 			echo "Exception occurred: " . $attId->get_error_message();
 			return 0;

From 632c28595317fd7995625520719097f7543bf136 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 15 May 2024 11:48:27 -0400
Subject: [PATCH 119/423] Separating two filters that aren't quite the same.

---
 src/TouchPoint-WP/Utilities/DateFormats.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index b151f0ee..5fdd06e1 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -202,14 +202,14 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 		}
 
 		/**
-		 * Allows for manipulation of the string returned as a formatted date.
+		 * Allows for manipulation of the string returned as a (short) formatted date.
 		 *
 		 * @since 0.0.90
 		 *
 		 * @param string $r The string, as formatted so far.
 		 * @param DateTimeInterface $dt The DateTimeInterface object for the date being formatted.
 		 */
-		return apply_filters('tp_adjust_date_string', $r, $dt);
+		return apply_filters('tp_adjust_date_string_short', $r, $dt);
 	}
 
 

From efa6a37651734ae3a274d4f9f939baf2fc4a4b1b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 15 May 2024 11:53:46 -0400
Subject: [PATCH 120/423] Adding LocationName() to hasGeo interface

---
 src/TouchPoint-WP/Involvement.php     | 22 ++++++++--
 src/TouchPoint-WP/Location.php        | 25 +++++++++++
 src/TouchPoint-WP/Meeting.php         | 62 ++++++++++++++++++++++++++-
 src/TouchPoint-WP/Partner.php         | 23 ++++++++--
 src/TouchPoint-WP/PostTypeCapable.php |  3 +-
 src/TouchPoint-WP/hasGeo.php          |  7 +++
 src/templates/involvement-single.php  |  3 +-
 7 files changed, 136 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index f4c516dc..439b220d 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -69,7 +69,7 @@ class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo
 	public static string $itemClass = 'inv-list-item';
 
 	private static bool $filterJsAdded = false;
-	public ?object $geo = null;
+	protected ?object $geo = null;
 	static protected object $compareGeo;
 
 	protected ?string $locationName = null;
@@ -3108,6 +3108,10 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
 			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
 
+			if ($mtgO->location !== null) {
+				update_post_meta($mtgP->ID, Meeting::MEETING_LOCATION_META_KEY, $mtgO->location);
+			}
+
 			if ($verbose) {
 				$link = get_permalink($mtgP);
 				echo "<p><a href=\"$link\">Updating Post $mtgP->ID</a> based on Meeting $mtgO->mtgId.</p>";
@@ -3418,9 +3422,11 @@ public function notableAttributes(array $exclude = []): array
 		}
 		unset($schStr);
 
-		if ($this->locationName) {
-			$attrs['location'] = $this->locationName;
+		$l = $this->locationName();
+		if ($l) {
+			$attrs['location'] = $l;
 		}
+		unset($l);
 
 		foreach ($this->getDivisionsLinks() as $a) {
 			$attrs['divisions'] = $a;
@@ -3809,4 +3815,14 @@ private static function ajaxContact(): void
 		echo json_encode(['success' => $data->success]);
 		exit;
 	}
+
+	/**
+	 * Get the name of the location.
+	 *
+	 * @return ?string
+	 */
+	public function locationName(): ?string
+	{
+		return $this->locationName;
+	}
 }
diff --git a/src/TouchPoint-WP/Location.php b/src/TouchPoint-WP/Location.php
index ffb27c1b..d0ba0ec6 100644
--- a/src/TouchPoint-WP/Location.php
+++ b/src/TouchPoint-WP/Location.php
@@ -93,6 +93,14 @@ public function asGeoIFace(string $type = "unknown"): ?Geo
 		return null;
 	}
 
+	/**
+	 * Get a location that corresponds to a given lat/lng, or null if none match.
+	 *
+	 * @param float $lat
+	 * @param float $lng
+	 *
+	 * @return Location|null
+	 */
 	public static function getLocationForLatLng(float $lat, float $lng): ?Location
 	{
 		$locs = self::getLocations();
@@ -106,6 +114,13 @@ public static function getLocationForLatLng(float $lat, float $lng): ?Location
 		return null;
 	}
 
+	/**
+	 * Validates and corrects the Locations settings value.
+	 *
+	 * @param string $settings
+	 *
+	 * @return false|string
+	 */
 	public static function validateSetting(string $settings)
 	{
 		$d = json_decode($settings);
@@ -126,4 +141,14 @@ public static function validateSetting(string $settings)
 
 		return json_encode($d);
 	}
+
+	/**
+	 * Get the name of the location.
+	 *
+	 * @return ?string
+	 */
+	public function locationName(): ?string
+	{
+		return $this->name;
+	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 84d90a58..ef7196fd 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -25,7 +25,7 @@
 /**
  * Handle meeting content, particularly RSVPs.
  */
-class Meeting extends PostTypeCapable implements api, module
+class Meeting extends PostTypeCapable implements api, module, hasGeo
 {
 	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . "meeting";
 	
@@ -351,4 +351,64 @@ public function endTimeString(): ?string
 		}
 		return DateFormats::TimeStringFormatted($this->endDt);
 	}
+
+	/**
+	 * @inheritDoc
+	 *
+	 * @return bool
+	 */
+	public function hasGeo(): bool
+	{
+		try {
+			$i = $this->involvement();
+			if ($i->locationName() !== $this->locationName()) {
+				// Meetings can't have geographical references yet.  TODO Add Meeting Geographical ref when possible. #187
+				return false;
+			}
+
+			return $this->involvement()->hasGeo();
+		} catch (TouchPointWP_Exception) {
+			return false;
+		}
+	}
+
+	/**
+	 * @inheritDoc
+	 *
+	 * @return bool
+	 */
+	public function asGeoIFace(string $type = "unknown"): ?Geo
+	{
+		// In case location on meeting doesn't match location on 
+		if (!$this->hasGeo()) {
+			return null;
+		}
+
+		try {
+			return $this->involvement()->asGeoIFace($type);
+		} catch (TouchPointWP_Exception) {
+			return null;
+		}
+	}
+
+	/**
+	 * Get the name of the location.
+	 *
+	 * @inheritDoc
+	 *
+	 * @return ?string
+	 */
+	public function locationName(): ?string
+	{
+		$loc = get_post_meta($this->post_id, Meeting::MEETING_LOCATION_META_KEY, true);
+		if ($loc) {
+			return $loc;
+		}
+		try {
+			if ($this->post_id() !== $this->involvement()->post_id()) {
+				return $this->involvement()->locationName();
+			}
+		} catch (TouchPointWP_Exception) {}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index d43fd23e..60f8f3c2 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1216,11 +1216,13 @@ public function notableAttributes(array $exclude = []): array
 	{
 		$r = [];
 
+		$l = $this->locationName();
 		if ($this->decoupleLocation) {
-			$r['secure'] = TouchPointWP::instance()->settings->global_name_singular_decoupled;
-		} elseif ($this->location !== "" && $this->location !== null) {
-			$r['location'] = $this->location;
+			$r['secure'] = $l;
+		} elseif ($l) {
+			$r['location'] = $l;
 		}
+		unset($l);
 
 		foreach ($this->category as $c) {
 			$r['category'] = $c->name;
@@ -1471,4 +1473,19 @@ public function asGeoIFace(string $type = "unknown"): ?Geo
 
 		return null;
 	}
+
+	/**
+	 * Get the name of the location.
+	 *
+	 * @return ?string
+	 */
+	public function locationName(): ?string
+	{
+		if ($this->decoupleLocation) {
+			return TouchPointWP::instance()->settings->global_name_singular_decoupled;
+		} elseif ($this->location !== "" && $this->location !== null) {
+			return $this->location;
+		}
+		return null;
+	}
 }
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 3d2a2008..eea8612d 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -12,7 +12,8 @@
 /**
  * This is a base class for those objects that can be derived from a Post.
  */
-abstract class PostTypeCapable implements module {
+abstract class PostTypeCapable implements module
+{
 
 	protected int $post_id;
 	protected ?WP_Post $post = null;
diff --git a/src/TouchPoint-WP/hasGeo.php b/src/TouchPoint-WP/hasGeo.php
index d70f2cc3..7f43b542 100644
--- a/src/TouchPoint-WP/hasGeo.php
+++ b/src/TouchPoint-WP/hasGeo.php
@@ -32,4 +32,11 @@ public function hasGeo(): bool;
 	 * @return object|null
 	 */
 	public function asGeoIFace(string $type = "unknown"): ?Geo;
+
+	/**
+	 * Get the name of the location.
+	 *
+	 * @return ?string
+	 */
+	public function locationName(): ?string;
 }
\ No newline at end of file
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 97f86685..8bc81564 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -50,8 +50,9 @@
                 <?php echo $obj->getActionButtons('single-template', "btn button") ?>
             </div>
         </div>
-        <?php if ($settings->useGeo && $inv->geo !== null) { ?>
+        <?php if ($settings->useGeo && $obj->hasGeo() !== null) { ?>
         <div class="TouchPointWP-detail-cell TouchPointWP-map-container">
+            <!-- TODO this doesn't work for meetings. -->
             <?php echo Involvement::mapShortcode() ?>
         </div>
         <?php } ?>

From d8892a136176b3013b6a293ee2f46c28ede54e77 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 15 May 2024 13:05:37 -0400
Subject: [PATCH 121/423] i18n updates

---
 i18n/TouchPoint-WP-es_ES.po | 168 ++++++++++++++++----------------
 i18n/TouchPoint-WP.pot      | 184 +++++++++++++++++-------------------
 2 files changed, 168 insertions(+), 184 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index c7067c59..1878ee9d 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:545
+#: src/TouchPoint-WP/Meeting.php:555
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1696
+#: src/TouchPoint-WP/Involvement.php:1747
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1722
+#: src/TouchPoint-WP/Involvement.php:1773
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,14 +173,12 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1942
+#: src/TouchPoint-WP/Involvement.php:1993
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:20
-#: src/templates/parts/meeting-list-none.php:19
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
@@ -209,90 +207,90 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:469
+#: src/TouchPoint-WP/Involvement.php:483
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:474
+#: src/TouchPoint-WP/Involvement.php:488
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:481
+#: src/TouchPoint-WP/Involvement.php:495
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:487
+#: src/TouchPoint-WP/Involvement.php:501
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1571
-#: src/TouchPoint-WP/Partner.php:787
+#: src/TouchPoint-WP/Involvement.php:1622
+#: src/TouchPoint-WP/Partner.php:795
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1779
-#: src/TouchPoint-WP/Partner.php:809
+#: src/TouchPoint-WP/Involvement.php:1830
+#: src/TouchPoint-WP/Partner.php:817
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3344
+#: src/TouchPoint-WP/Involvement.php:3442
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3347
+#: src/TouchPoint-WP/Involvement.php:3445
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3418
+#: src/TouchPoint-WP/Involvement.php:3516
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3425
-#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3575
+#: src/TouchPoint-WP/Involvement.php:3611
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3430
+#: src/TouchPoint-WP/Involvement.php:3580
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3434
+#: src/TouchPoint-WP/Involvement.php:3584
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3439
+#: src/TouchPoint-WP/Involvement.php:3589
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3442
+#: src/TouchPoint-WP/Involvement.php:3592
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3445
+#: src/TouchPoint-WP/Involvement.php:3595
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3448
+#: src/TouchPoint-WP/Involvement.php:3598
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3457
+#: src/TouchPoint-WP/Involvement.php:3606
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3475
-#: src/TouchPoint-WP/Partner.php:1282
+#: src/TouchPoint-WP/Involvement.php:3528
+#: src/TouchPoint-WP/Partner.php:1292
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:816
+#: src/TouchPoint-WP/Partner.php:824
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1223
+#: src/TouchPoint-WP/Partner.php:1233
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -308,7 +306,7 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:544
+#: src/TouchPoint-WP/Meeting.php:554
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
@@ -1038,16 +1036,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1744
+#: src/TouchPoint-WP/Involvement.php:1795
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1757
+#: src/TouchPoint-WP/Involvement.php:1808
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1628
+#: src/TouchPoint-WP/Involvement.php:1679
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1209,68 +1207,72 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1745
+#: src/TouchPoint-WP/Involvement.php:1796
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1746
+#: src/TouchPoint-WP/Involvement.php:1797
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1787
-#: src/TouchPoint-WP/Partner.php:825
+#: src/TouchPoint-WP/Involvement.php:1838
+#: src/TouchPoint-WP/Partner.php:833
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1790
-#: src/TouchPoint-WP/Partner.php:828
+#: src/TouchPoint-WP/Involvement.php:1841
+#: src/TouchPoint-WP/Partner.php:836
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:929
-#: src/TouchPoint-WP/Involvement.php:958
-#: src/TouchPoint-WP/Utilities/DateFormats.php:317
+#. translators: %1$s is the date, %2$s is the time.
+#: src/TouchPoint-WP/Involvement.php:919
+#: src/TouchPoint-WP/Involvement.php:948
+#: src/TouchPoint-WP/Involvement.php:1023
+#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Utilities/DateFormats.php:249
+#: src/TouchPoint-WP/Utilities/DateFormats.php:312
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:967
+#: src/TouchPoint-WP/Involvement.php:957
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:974
+#: src/TouchPoint-WP/Involvement.php:964
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:984
+#: src/TouchPoint-WP/Involvement.php:974
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:990
+#: src/TouchPoint-WP/Involvement.php:980
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:999
+#: src/TouchPoint-WP/Involvement.php:989
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1005
+#: src/TouchPoint-WP/Involvement.php:995
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3365
+#: src/TouchPoint-WP/Involvement.php:3463
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1287,35 +1289,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1883
+#: src/TouchPoint-WP/Involvement.php:1934
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1893
+#: src/TouchPoint-WP/Involvement.php:1944
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1912
+#: src/TouchPoint-WP/Involvement.php:1963
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:477
+#: src/TouchPoint-WP/Meeting.php:487
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:505
+#: src/TouchPoint-WP/Meeting.php:515
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:515
+#: src/TouchPoint-WP/Meeting.php:525
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3562
-#: src/TouchPoint-WP/Involvement.php:3659
+#: src/TouchPoint-WP/Involvement.php:3704
+#: src/TouchPoint-WP/Involvement.php:3801
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1435,7 +1437,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1671
+#: src/TouchPoint-WP/Involvement.php:1722
 msgid "Language"
 msgstr "Idioma"
 
@@ -1488,8 +1490,8 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3646
-#: src/TouchPoint-WP/Person.php:1798
+#: src/TouchPoint-WP/Involvement.php:3788
+#: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1509,27 +1511,26 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1653
+#: src/TouchPoint-WP/Person.php:1670
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3636
-#: src/TouchPoint-WP/Person.php:1815
+#: src/TouchPoint-WP/Involvement.php:3778
+#: src/TouchPoint-WP/Person.php:1832
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1585
+#: src/TouchPoint-WP/Person.php:1602
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/templates/parts/meeting-list-none.php:13
-#: src/TouchPoint-WP/Meeting.php:204
+#: src/TouchPoint-WP/Meeting.php:207
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:205
+#: src/TouchPoint-WP/Meeting.php:208
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1602,11 +1603,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:393
+#: src/TouchPoint-WP/Meeting.php:403
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:394
+#: src/TouchPoint-WP/Meeting.php:404
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1640,16 +1641,16 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3487
+#: src/TouchPoint-WP/Involvement.php:3540
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:283
+#: src/TouchPoint-WP/Meeting.php:288
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:338
+#: src/TouchPoint-WP/Meeting.php:348
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1714,7 +1715,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:395
+#: src/TouchPoint-WP/Meeting.php:405
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
@@ -1724,19 +1725,17 @@ msgid "Creating an Involvement object from an object without a post_id is not ye
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:932
-#: src/TouchPoint-WP/Involvement.php:953
+#: src/TouchPoint-WP/Involvement.php:922
+#: src/TouchPoint-WP/Involvement.php:943
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:84
+#: src/TouchPoint-WP/Meeting.php:87
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
-#. translators: %1$s is the start time, %2$s is the end time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:55
-#: src/TouchPoint-WP/Utilities/DateFormats.php:258
-#: src/TouchPoint-WP/Utilities/DateFormats.php:296
+#: src/TouchPoint-WP/Utilities/DateFormats.php:291
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
@@ -1760,14 +1759,7 @@ msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
-#. Translators: %1$s is the start date, %2$s is the end date.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:250
-msgid "%1$s &ndash; %1$s"
-msgstr "%1$s &ndash; %1$s"
-
-#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:265
-#: src/TouchPoint-WP/Utilities/DateFormats.php:330
+#: src/TouchPoint-WP/Utilities/DateFormats.php:325
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 1b699caf..9dc26d79 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-05-07T23:13:28+00:00\n"
+"POT-Creation-Date: 2024-05-15T17:04:06+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:545
+#: src/TouchPoint-WP/Meeting.php:555
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -158,13 +158,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1696
+#: src/TouchPoint-WP/Involvement.php:1747
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1722
+#: src/TouchPoint-WP/Involvement.php:1773
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -243,28 +243,25 @@ msgid "The Campus"
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/templates/parts/meeting-list-none.php:13
-#: src/TouchPoint-WP/Meeting.php:204
+#: src/TouchPoint-WP/Meeting.php:207
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/templates/parts/meeting-list-none.php:15
-#: src/TouchPoint-WP/Involvement.php:1942
+#: src/TouchPoint-WP/Involvement.php:1993
 msgid "No %s Found."
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:20
-#: src/templates/parts/meeting-list-none.php:19
 msgid "%s will be imported overnight for the first time."
 msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3365
+#: src/TouchPoint-WP/Involvement.php:3463
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -308,255 +305,259 @@ msgstr ""
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:469
+#: src/TouchPoint-WP/Involvement.php:483
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:474
+#: src/TouchPoint-WP/Involvement.php:488
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:481
+#: src/TouchPoint-WP/Involvement.php:495
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:487
+#: src/TouchPoint-WP/Involvement.php:501
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#: src/TouchPoint-WP/Involvement.php:929
-#: src/TouchPoint-WP/Involvement.php:958
-#: src/TouchPoint-WP/Utilities/DateFormats.php:317
+#. translators: %1$s is the date, %2$s is the time.
+#: src/TouchPoint-WP/Involvement.php:919
+#: src/TouchPoint-WP/Involvement.php:948
+#: src/TouchPoint-WP/Involvement.php:1023
+#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Utilities/DateFormats.php:249
+#: src/TouchPoint-WP/Utilities/DateFormats.php:312
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:932
-#: src/TouchPoint-WP/Involvement.php:953
+#: src/TouchPoint-WP/Involvement.php:922
+#: src/TouchPoint-WP/Involvement.php:943
 msgid "%1$s All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:967
+#: src/TouchPoint-WP/Involvement.php:957
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:974
+#: src/TouchPoint-WP/Involvement.php:964
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:984
+#: src/TouchPoint-WP/Involvement.php:974
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:990
+#: src/TouchPoint-WP/Involvement.php:980
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:999
+#: src/TouchPoint-WP/Involvement.php:989
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1005
+#: src/TouchPoint-WP/Involvement.php:995
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1571
-#: src/TouchPoint-WP/Partner.php:787
+#: src/TouchPoint-WP/Involvement.php:1622
+#: src/TouchPoint-WP/Partner.php:795
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1628
+#: src/TouchPoint-WP/Involvement.php:1679
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1671
+#: src/TouchPoint-WP/Involvement.php:1722
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1744
+#: src/TouchPoint-WP/Involvement.php:1795
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1745
+#: src/TouchPoint-WP/Involvement.php:1796
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1746
+#: src/TouchPoint-WP/Involvement.php:1797
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1757
+#: src/TouchPoint-WP/Involvement.php:1808
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1779
-#: src/TouchPoint-WP/Partner.php:809
+#: src/TouchPoint-WP/Involvement.php:1830
+#: src/TouchPoint-WP/Partner.php:817
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1787
-#: src/TouchPoint-WP/Partner.php:825
+#: src/TouchPoint-WP/Involvement.php:1838
+#: src/TouchPoint-WP/Partner.php:833
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1790
-#: src/TouchPoint-WP/Partner.php:828
+#: src/TouchPoint-WP/Involvement.php:1841
+#: src/TouchPoint-WP/Partner.php:836
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1883
+#: src/TouchPoint-WP/Involvement.php:1934
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1893
+#: src/TouchPoint-WP/Involvement.php:1944
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1912
+#: src/TouchPoint-WP/Involvement.php:1963
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3344
+#: src/TouchPoint-WP/Involvement.php:3442
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3347
+#: src/TouchPoint-WP/Involvement.php:3445
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3418
+#: src/TouchPoint-WP/Involvement.php:3516
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3425
-#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3528
+#: src/TouchPoint-WP/Partner.php:1292
+msgid "Show on Map"
+msgstr ""
+
+#. Translators: %s is the system name.  "TouchPoint" by default.
+#: src/TouchPoint-WP/Involvement.php:3540
+msgid "Involvement in %s"
+msgstr ""
+
+#: src/TouchPoint-WP/Involvement.php:3575
+#: src/TouchPoint-WP/Involvement.php:3611
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3430
+#: src/TouchPoint-WP/Involvement.php:3580
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3434
+#: src/TouchPoint-WP/Involvement.php:3584
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3439
+#: src/TouchPoint-WP/Involvement.php:3589
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3442
+#: src/TouchPoint-WP/Involvement.php:3592
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3445
+#: src/TouchPoint-WP/Involvement.php:3595
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3448
+#: src/TouchPoint-WP/Involvement.php:3598
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3457
+#: src/TouchPoint-WP/Involvement.php:3606
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3475
-#: src/TouchPoint-WP/Partner.php:1282
-msgid "Show on Map"
-msgstr ""
-
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3487
-msgid "Involvement in %s"
-msgstr ""
-
-#: src/TouchPoint-WP/Involvement.php:3562
-#: src/TouchPoint-WP/Involvement.php:3659
+#: src/TouchPoint-WP/Involvement.php:3704
+#: src/TouchPoint-WP/Involvement.php:3801
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3636
-#: src/TouchPoint-WP/Person.php:1815
+#: src/TouchPoint-WP/Involvement.php:3778
+#: src/TouchPoint-WP/Person.php:1832
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3646
-#: src/TouchPoint-WP/Person.php:1798
+#: src/TouchPoint-WP/Involvement.php:3788
+#: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:84
+#: src/TouchPoint-WP/Meeting.php:87
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:205
+#: src/TouchPoint-WP/Meeting.php:208
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:283
+#: src/TouchPoint-WP/Meeting.php:288
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:338
+#: src/TouchPoint-WP/Meeting.php:348
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:393
+#: src/TouchPoint-WP/Meeting.php:403
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:394
+#: src/TouchPoint-WP/Meeting.php:404
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:395
+#: src/TouchPoint-WP/Meeting.php:405
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:477
+#: src/TouchPoint-WP/Meeting.php:487
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:505
+#: src/TouchPoint-WP/Meeting.php:515
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:515
+#: src/TouchPoint-WP/Meeting.php:525
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:544
+#: src/TouchPoint-WP/Meeting.php:554
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:816
+#: src/TouchPoint-WP/Partner.php:824
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1223
+#: src/TouchPoint-WP/Partner.php:1233
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -588,11 +589,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1585
+#: src/TouchPoint-WP/Person.php:1602
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1653
+#: src/TouchPoint-WP/Person.php:1670
 msgid "You may need to sign in."
 msgstr ""
 
@@ -1469,10 +1470,8 @@ msgstr ""
 msgid "Expand"
 msgstr ""
 
-#. translators: %1$s is the start time, %2$s is the end time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:55
-#: src/TouchPoint-WP/Utilities/DateFormats.php:258
-#: src/TouchPoint-WP/Utilities/DateFormats.php:296
+#: src/TouchPoint-WP/Utilities/DateFormats.php:291
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
@@ -1579,14 +1578,7 @@ msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#. Translators: %1$s is the start date, %2$s is the end date.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:250
-msgid "%1$s &ndash; %1$s"
-msgstr ""
-
-#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:265
-#: src/TouchPoint-WP/Utilities/DateFormats.php:330
+#: src/TouchPoint-WP/Utilities/DateFormats.php:325
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 

From 05819fecee594ed67d1cc2c78bc41db7bb835040 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 15 May 2024 13:10:07 -0400
Subject: [PATCH 122/423] Updates for meeting calendar support

---
 src/TouchPoint-WP/Involvement.php |   4 +-
 src/TouchPoint-WP/Meeting.php     | 459 ++++++++++++++++++++++++------
 2 files changed, 380 insertions(+), 83 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 439b220d..5a038a33 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1019,7 +1019,7 @@ protected function scheduleString_calc(): string
 					$dateTimeArr[] = $r['datetime'];
 				} else {
 					$dateTimeArr[] = wp_sprintf(
-						// translators: {date} at {time}  e.g. February 14 at 7pm
+						// translators: %1$s is the date, %2$s is the time.
 						__('%1$s at %2$s', 'TouchPoint-WP'), $r['date'], $r['time']
 					);
 					if ( !$dateArr->contains(['date'])) {
@@ -1041,7 +1041,7 @@ protected function scheduleString_calc(): string
 			$dateStr = $dateArr->toListString();
 
 			return wp_sprintf(
-				// translators: {date} at {time}  e.g. February 14 at 7pm
+				// translators: %1$s is the date, %2$s is the time.
 				__('%1$s at %2$s', 'TouchPoint-WP'), $dateStr, $timeArr[0]
 			);
 		}
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index ef7196fd..931cc395 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -27,7 +27,152 @@
  */
 class Meeting extends PostTypeCapable implements api, module, hasGeo
 {
-	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . "meeting";
+	use jsInstantiation;
+//	use jsonLd; TODO
+
+	public const POST_TYPE_WO_PRE = "meeting";
+	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . self::POST_TYPE_WO_PRE;
+
+	public const MEETING_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgId";
+	public const MEETING_START_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgStartDt";
+	public const MEETING_END_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgEndDt";
+	public const MEETING_FEAT_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgFeatured";
+	public const MEETING_STATUS_META_KEY = TouchPointWP::SETTINGS_PREFIX . "status";
+	public const MEETING_INV_ID_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgInvId";
+
+	// This is the same as the meta key for involvement locations.
+	public const MEETING_LOCATION_META_KEY = TouchPointWP::SETTINGS_PREFIX . "locationName";
+
+	private static bool $_isLoaded = false;  // TODO why is this here?
+	private static array $_instances = [];
+	private static ?Involvement_PostTypeSettings $_typeSet = null;
+
+	public ?DateTimeImmutable $startDt = null;
+	public ?DateTimeImmutable $endDt = null;
+
+	protected object $attributes;
+	protected string $name;
+	protected int $mtgId;
+
+
+	/**
+	 * Meeting constructor.
+	 *
+	 * @param $object WP_Post|object an object representing the meeting's post.
+	 *				  Must have post_id AND mtg id attributes.
+	 *
+	 * @throws TouchPointWP_Exception
+	 */
+	protected function __construct(object $object)
+	{
+		$this->attributes = (object)[];
+
+		if (gettype($object) === "object" && get_class($object) == WP_Post::class) {
+			// WP_Post Object
+			$this->post    = $object;
+			$this->name    = $object->post_title;
+			$this->mtgId   = intval($object->{Meeting::MEETING_META_KEY});
+			$this->post_id = $object->ID;
+
+			if ($this->mtgId === 0) {
+				throw new TouchPointWP_Exception("No Meeting ID provided in the post.", 171003);
+			}
+		} elseif (gettype($object) === "object") {
+			// Sql Object, probably.
+
+			if ( ! property_exists($object, 'post_id')) {
+				_doing_it_wrong(
+					__FUNCTION__,
+					esc_html(
+						__('Creating a Meeting object from an object without a post_id is not yet supported.', 'TouchPoint-WP')
+					),
+					esc_attr(TouchPointWP::VERSION)
+				);
+			}
+
+			$this->post    = get_post($object, "OBJECT");
+			$this->post_id = $this->post->ID;
+
+			foreach ($object as $property => $value) {
+				if (property_exists(self::class, $property)) {
+					$this->$property = $value;
+				}
+				// TODO add an else for nonstandard/optional metadata fields
+			}
+		} else {
+			throw new TouchPointWP_Exception("Could not construct a Meeting with the information provided.");
+		}
+
+		$postTerms = [
+			Taxonomies::TAX_RESCODE,
+			Taxonomies::TAX_AGEGROUP,
+			Taxonomies::TAX_WEEKDAY,
+			Taxonomies::TAX_TENSE,
+			Taxonomies::TAX_DAYTIME,
+			Taxonomies::TAX_INV_MARITAL,
+			Taxonomies::TAX_DIV
+		];
+		if (TouchPointWP::instance()->settings->enable_campuses === "on") {
+			$postTerms[] = Taxonomies::TAX_CAMPUS;
+		}
+
+		$terms = wp_get_post_terms(
+			$this->post_id,
+			$postTerms
+		);
+
+		if (is_array($terms) && count($terms) > 0) {
+			$hookLength = strlen(TouchPointWP::HOOK_PREFIX);
+			foreach ($terms as $t) {
+				/** @var WP_Term $t */
+				$to = (object)[
+					'name' => $t->name,
+					'slug' => $t->slug
+				];
+				$ta = $t->taxonomy;
+				if (str_starts_with($ta, TouchPointWP::HOOK_PREFIX)) {
+					$ta = substr_replace($ta, "", 0, $hookLength);
+				}
+				if ( ! isset($this->attributes->$ta)) {
+					$this->attributes->$ta = $to;
+				} elseif ( ! is_array($this->attributes->$ta)) {
+					$this->attributes->$ta = [$this->attributes->$ta, $to];
+				} else {
+					$this->attributes->$ta[] = $to;
+				}
+			}
+		}
+
+		$meta         = get_post_meta($this->post_id);
+		$prefixLength = strlen(TouchPointWP::SETTINGS_PREFIX);
+
+		foreach ($meta as $k_tp => $v) {
+			if (substr($k_tp, 0, $prefixLength) !== TouchPointWP::SETTINGS_PREFIX) {
+				continue; // not ours.
+			}
+
+			$k = substr($k_tp, $prefixLength);
+			if ($k === "mtgId") {
+				continue;
+			}
+			if (property_exists(self::class, $k)) {  // properties
+				$this->$k = maybe_unserialize($v[0]);
+			}
+		}
+
+		// JS attributes, for filtering mostly.
+//		$this->attributes->genderId = (string)$this->genderId;  TODO restore if needed (may be able to just inherit from parent).
+
+		// Start and End
+		$start = intval(get_post_meta($this->post_id, self::MEETING_START_META_KEY, true));
+		$end = intval(get_post_meta($this->post_id, self::MEETING_END_META_KEY, true));
+		$tz = wp_timezone();
+		$this->startDt = ($start === 0 ? null : DateTimeImmutable::createFromMutable(DateTime::createFromFormat("U", $start, $tz)));
+		$this->endDt   = ($end   === 0 ? null : DateTimeImmutable::createFromMutable(DateTime::createFromFormat("U", $end, $tz)));
+
+		$this->registerConstruction();
+	}
+
 	
 	/**
 	 * Register scripts and styles to be used on display pages.
@@ -49,6 +194,218 @@ public static function registerScriptsAndStyles(): void
 		);
 	}
 
+
+	/**
+	 * Get the PostTypeSettings object for Meeting Involvements.
+	 *
+	 * @return Involvement_PostTypeSettings
+	 */
+	public static function getTypeSettings(): Involvement_PostTypeSettings
+	{
+		if (self::$_typeSet == null) {
+			self::$_typeSet = new Involvement_PostTypeSettings((object)[
+				'namePlural'      => _x("Events", "What Meetings should be called, plural.", 'TouchPoint-WP'),
+				'nameSingular'    => _x("Event", "What Meetings should be called, singular.", 'TouchPoint-WP'),
+				'slug'            => TouchPointWP::instance()->settings->mc_slug,
+				'importMeetings'  => true,
+				'useImages'       => true,
+				'useGeo'          => false,
+				'hierarchical'    => true,
+				'postType'        => self::POST_TYPE_WO_PRE
+			]);
+		}
+		return self::$_typeSet;
+	}
+
+
+	/**
+	 * Create a Meeting object from an object from a WP_Post object.
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return Meeting
+	 *
+	 * @throws TouchPointWP_Exception If the meeting can't be created from the post, an exception is thrown.
+	 */
+	public static function fromPost(WP_Post $post): Meeting
+	{
+		$mid = intval($post->{Meeting::MEETING_META_KEY});
+
+		if ($mid === 0) {
+			throw new TouchPointWP_Exception("Invalid Meeting ID provided.", 171003);
+		}
+
+		if ( ! isset(self::$_instances[$mid])) {
+			self::$_instances[$mid] = new Meeting($post);
+		}
+
+		return self::$_instances[$mid];
+	}
+
+	/**
+	 * Get the Involvement object associated with this Meeting.
+	 *
+	 * @throws TouchPointWP_Exception
+	 */
+	public function involvement(): Involvement
+	{
+		if (Involvement::postIsType($this->post)) {
+			return Involvement::fromPost($this->post);
+		}
+		$parent = get_post_parent($this->post_id);
+		if (Involvement::postIsType($parent)) {
+			return Involvement::fromPost(get_post($parent));
+		}
+		throw new TouchPointWP_Exception("Meeting is not associated with an Involvement.", 171002);
+	}
+
+
+	/**
+	 * Get notable attributes, such as gender restrictions, as strings.
+	 *
+	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 *
+	 * @return string[]
+	 */
+	public function notableAttributes(array $exclude = []): array
+	{
+		if (in_array('involvement', $exclude)) {
+			$attrs = [];
+		} else {
+			try {
+				$attrs = $this->involvement()->notableAttributes(['schedule', 'date', 'datetime', 'time']);
+			} catch (TouchPointWP_Exception) {
+				$attrs = [];
+			}
+		}
+
+		$d = DateFormats::DurationToStringArray($this->startDt, $this->endDt, $this->isMultiDay(), $this->isAllDay());
+
+		$attrs = [...$d, ...$attrs];
+
+		// Add an "in the past" label if the thing is already past. (end may be null)
+		if (($this->endDt ?? $this->startDt) < Utilities::dateTimeNow()) {
+			$attrs['past'] = __("In the Past", "TouchPoint-WP");
+		}
+
+		$loc = $this->locationName();
+		if ($loc) {
+			$attrs['location'] = $loc;
+		}
+
+		$attrs = $this->processAttributeExclusions($attrs, $exclude);
+
+		/**
+		 * Allows for manipulation of the notable attributes strings for a Meeting.  An array of strings.
+		 * Typically, these are the standardized strings that appear on the Involvement to give information about it,
+		 * such as the schedule, leaders, and location.
+		 *
+		 * @see Meeting::notableAttributes()
+		 * @see PostTypeCapable::notableAttributes()
+		 *
+		 * @since 0.0.90
+		 *
+		 * @param string[] $attrs The list of notable attributes.
+		 * @param Meeting $this The Meeting object.
+		 */
+		return apply_filters("tp_meeting_attributes", $attrs, $this);
+	}
+
+	/**
+	 * @param ?string $context
+	 * @param string  $btnClass
+	 * @param bool    $withTouchPointLink
+	 *
+	 * @return StringableArray
+	 */
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true): StringableArray
+	{
+		TouchPointWP::requireScript('swal2-defer');
+		TouchPointWP::requireScript('base-defer');
+		$this->enqueueForJsInstantiation();
+//		$this->enqueueForJsonLdInstantiation();
+		Person::enqueueUsersForJsInstantiation();
+
+		try {
+			$inv = $this->involvement();
+		} catch (TouchPointWP_Exception) {
+			return new StringableArray();
+		}
+
+		$ret = $inv->getActionButtons($context . "_meeting", $btnClass, false, false);
+
+		if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
+			$ret[] = $inv->getRegisterButton($btnClass);
+		}
+
+		if ($inv->getRegistrationType() === RegistrationType::RSVP) {
+			$ret[] = $this->getRsvpButton($btnClass);
+		}
+
+		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
+			$tpHost = TouchPointWP::instance()->host();
+			// Translators: %s is the system name.  "TouchPoint" by default.
+			$title  = wp_sprintf(__("Meeting in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
+			$logo = TouchPointWP::TouchPointIcon();
+			$ret[]  = "<a href=\"$tpHost/Meeting/$this->mtgId\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
+		}
+
+		/**
+		 * Allows for manipulation of the action buttons for a Meeting.  This is the list of buttons that appear
+		 * on the Meeting to allow the user to interact with it.
+		 *
+		 * @since 0.0.90
+		 *
+		 * @see Meeting::getActionButtons()
+		 * @see PostTypeCapable::getActionButtons()
+		 *
+		 * @param StringableArray $ret The list of action buttons.
+		 * @param Meeting $this The Meeting object.
+		 * @param ?string $context A reference to where the action buttons are meant to be used.
+		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
+		 *     elements.
+		 */
+		return apply_filters("tp_meeting_actions", $ret, $this, $context, $btnClass);
+	}
+	
+	public function isFeatured(): bool
+	{
+		return !!get_post_meta($this->post_id, Meeting::MEETING_FEAT_META_KEY, true);
+	}
+
+	/**
+	 * Get the status of the meeting, in a code-oriented name (for css, etc.)
+	 *
+	 * @return string
+	 */
+	public function status(): string
+	{
+		$status = intval(get_post_meta($this->post_id, self::MEETING_STATUS_META_KEY, true));
+
+		return match ($status) {
+			0 => "cancelled",
+			1 => "scheduled",
+			default => "unknown",
+		};
+	}
+
+	/**
+	 * @param bool $excludeScheduled "Scheduled" is the default (and correct) status for most events.  Set this to true
+	 * to return null instead of "Scheduled".
+	 *
+	 * @return string|null
+	 */
+	public function status_i18n(bool $excludeScheduled = false): ?string
+	{
+		$status = intval(get_post_meta($this->post_id, self::MEETING_STATUS_META_KEY, true));
+
+		return match ($status) {
+			0 => __("Cancelled", "TouchPoint-WP"),
+			1 => $excludeScheduled ? null : __("Scheduled", "TouchPoint-WP"),
+			default => _x("Unknown", "Event Status is not a recognized value.", "TouchPoint-WP"),
+		};
+	}
+
 	/**
 	 * Handle API requests
 	 *
@@ -73,82 +430,32 @@ public static function api(array $uri): bool
 	}
 
 	/**
-	 * Print a calendar grid for a given month and year.
-	 *
-	 * @param WP_Query $q
-	 * @param int|null $month
-	 * @param int|null $year
-	 *
-	 * @return void
+	 * @inheritDoc
 	 */
-	public static function printCalendarGrid(WP_Query $q, int $month = null, int $year = null)
+	public static function getJsInstantiationString(): string
 	{
-		try {
-			// Validate month & year; create $d as a day within the month
-			$tz = wp_timezone();
-			if ($month < 1 || $month > 12 || $year < 2020 || $year > 2100) {
-				$d = new DateTime('now', $tz);
-				$d = new DateTime($d->format('Y-m-01'), $tz);
-			} else {
-				$d = new DateTime("$year-$month-01", $tz);
-			}
-		} catch (Exception $e) {
-			echo "<!-- Could not create calendar grid because an exception occurred. -->";
-			return;
-		}
-
-		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
-		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
-		$d->modify("-$offsetDays days");
-
-		// Create a table to display the calendar
-		echo '<table>'; // TODO 1i18n
-		echo '<tr><th>Sun</th><th>Mon</th><th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>';
-
-		$isMonthBefore = ($offsetDays !== 0);
-		$isMonthAfter = false;
-		$aDay = new DateInterval("P1D");
-
-		// Loop through the days of the month
-		do {
-			$cellClass = "";
-			if ($isMonthBefore) {
-				$cellClass = "before";
-			} elseif ($isMonthAfter) {
-				$cellClass = "after";
-			}
-
-			$day = $d->format("j");
-			$wd =  $d->format("w");
+		$queue = static::getQueueForJsInstantiation();
 
-			if ($wd === '0') {
-				echo "<tr>";
-			}
+		if (count($queue) < 1) {
+			return "\t// No Meetings to instantiate.\n";
+		}
 
-			// Print the cell
-			echo "<td class=\"$cellClass\">";
-			echo "<span class=\"calDay\">$day</span>";
-			// TODO print items
-			echo "</td>";
+		$listStr = json_encode($queue);
 
-			if ($wd === '6') {
-				echo "</tr>";
-			}
+		return "";  // TODO someday, probably.
 
-			// Increment days
-			$mo1 = $d->format('n');
-			$d->add($aDay);
-			$mo2 = $d->format('n');
+//		return "\ttpvm.addEventListener('Involvement_class_loaded', function() {
+//		TP_Involvement.fromObjArray($listStr);\n\t});\n";
+	}
 
-			if ($mo1 !== $mo2) {
-				if ($isMonthBefore) {
-					$isMonthBefore = false;
-				} else {
-					$isMonthAfter = true;
-				}
-			}
-		} while (!$isMonthAfter || $d->format('w') !== '0');
-		echo '</table>';
+	/**
+	 * Gets a TouchPoint item ID number, regardless of what type of object this is.
+	 *
+	 * @return int
+	 */
+	public function getTouchPointId(): int
+	{
+		return $this->mtgId;
 	}
 
 	/**
@@ -159,8 +466,6 @@ public static function printCalendarGrid(WP_Query $q, int $month = null, int $ye
 	 */
 	private static function getMeetingInfoForRsvp($opts): object
 	{
-		// TODO caching
-
 		return TouchPointWP::instance()->apiPost('mtg', $opts);
 	}
 
@@ -246,7 +551,7 @@ public function getRsvpButton(string $btnClass = ""): string
 		$preloadMsg = __("Loading...", "TouchPoint-WP");
 		
 		$btnClass = trim($btnClass);
-		if ($btnClass !== '') {
+		if ($btnClass !== '' && !str_starts_with($btnClass, "class=")) {
 			$btnClass = "class=\"$btnClass\"";
 		}
 
@@ -354,8 +659,6 @@ public function endTimeString(): ?string
 
 	/**
 	 * @inheritDoc
-	 *
-	 * @return bool
 	 */
 	public function hasGeo(): bool
 	{
@@ -374,8 +677,6 @@ public function hasGeo(): bool
 
 	/**
 	 * @inheritDoc
-	 *
-	 * @return bool
 	 */
 	public function asGeoIFace(string $type = "unknown"): ?Geo
 	{
@@ -392,11 +693,7 @@ public function asGeoIFace(string $type = "unknown"): ?Geo
 	}
 
 	/**
-	 * Get the name of the location.
-	 *
 	 * @inheritDoc
-	 *
-	 * @return ?string
 	 */
 	public function locationName(): ?string
 	{

From 86f44b262a017e4846fbfc603778b5fd264d8936 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 22 May 2024 17:25:52 -0400
Subject: [PATCH 123/423] Limiting excessive API calls caused by various errors

---
 src/TouchPoint-WP/Involvement.php           | 13 ++++-
 src/TouchPoint-WP/Partner.php               | 38 ++++++++++---
 src/TouchPoint-WP/Taxonomies.php            |  1 +
 src/TouchPoint-WP/TouchPointWP.php          | 61 ++++++++++++++++++---
 src/TouchPoint-WP/TouchPointWP_Settings.php |  2 +-
 5 files changed, 97 insertions(+), 18 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 5a038a33..2a0e1e3a 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -31,6 +31,7 @@
 use tp\TouchPointWP\Utilities\PersonQuery;
 use tp\TouchPointWP\Utilities\StringableArray;
 use tp\TouchPointWP\Utilities\Translation;
+use TypeError;
 use WP_Error;
 use WP_Post;
 use WP_Query;
@@ -207,7 +208,11 @@ protected function __construct(object $object)
 				continue;
 			}
 			if (property_exists(self::class, $k)) {  // properties
-				$this->$k = maybe_unserialize($v[0]);
+				try {
+					$this->$k = maybe_unserialize($v[0]);
+				} catch (TypeError $e) {
+					new TouchPointWP_Exception($e);
+				}
 			}
 		}
 
@@ -723,6 +728,9 @@ public function nextMeeting(): ?DateTimeExtended
 			// schedules
 			foreach ($this->schedules() as $s) {
 				$mdt = $s->nextStartDt;
+				if ($mdt === null) {
+					continue;
+				}
 				if ($mdt <= $now) { // If "next meeting" is past, add a week and re-check.
 					$mdt = $mdt->modify("+1 week");
 				}
@@ -788,6 +796,9 @@ protected static function computeCommonOccurrences(array $meetings = [], array $
 
 			/** @var DateTimeExtended $start */
 			$start = $s->nextStartDt;
+			if ($start === null) {
+				continue;
+			}
 			if ($start->isAllDay) {
 				$coInx = $start->format('w-9999');
 			} else {
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 60f8f3c2..d59e4137 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -292,6 +292,13 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
 
+		if (TouchPointWP::instance()->settings->enable_global !== 'on') {
+			if ($verbose) {
+				echo "Global is not enabled.";
+			}
+			return 0;
+		}
+
 		$customFev = TouchPointWP::instance()->settings->global_fev_custom;
 		$fevFields = $customFev;
 
@@ -387,7 +394,9 @@ public static function updateFromTouchPoint(bool $verbose = false)
 			/** @var $post WP_Post */
 
 			// Apply Types
-			$f->familyEV = ExtraValueHandler::jsonToDataTyped($f->familyEV);
+			if ($f->familyEV !== null) {
+				$f->familyEV = ExtraValueHandler::jsonToDataTyped($f->familyEV);
+			}
 
 			// Post Content
 			$post->post_content = self::getFamEvAsContent($descriptionEv, $f, '');
@@ -400,7 +409,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
 				$category = $f->familyEV->$categoryEv->value ?? null;
 				// Insert Term if new
 				$term = Taxonomies::termExists($category, Taxonomies::TAX_GP_CATEGORY);
-				if ($category !== null && ! $term) {
+				if ($category !== null && !$term) {
 					$term = Taxonomies::insertTerm(
 						$category,
 						Taxonomies::TAX_GP_CATEGORY,
@@ -411,11 +420,15 @@ public static function updateFromTouchPoint(bool $verbose = false)
 					);
 					TouchPointWP::queueFlushRewriteRules();
 				}
-				if ( !!$term && !!$term['term_id']) {
-					$term['term_id'] = intval($term['term_id']);
-					$termsToKeep[] = $term['term_id'];
-					// Apply term to post
-					wp_set_post_terms($post->ID, [$term['term_id']], Taxonomies::TAX_GP_CATEGORY, false);
+				if (is_wp_error($term)) {
+					new TouchPointWP_WPError($term);
+				} else {
+					if ( !!$term && !!$term['term_id']) {
+						$term['term_id'] = intval($term['term_id']);
+						$termsToKeep[]   = $term['term_id'];
+						// Apply term to post
+						wp_set_post_terms($post->ID, [$term['term_id']], Taxonomies::TAX_GP_CATEGORY, false);
+					}
 				}
 			}
 
@@ -467,7 +480,9 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
 			// Positioning.
 			if ($latEv !== "" && $lngEv !== "" &&   // Has EV Lat/Lng
-					property_exists($f->familyEV, $latEv) && property_exists($f->familyEV, $lngEv) &&
+					is_object($f->familyEV) &&
+					property_exists($f->familyEV, $latEv) &&
+					property_exists($f->familyEV, $lngEv) &&
 					$f->familyEV->$latEv !== null && $f->familyEV->$latEv->value !== null &&
 					$f->familyEV->$lngEv !== null && $f->familyEV->$lngEv->value !== null) {
 				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", Utilities::toFloatOrNull($f->familyEV->$latEv->value));
@@ -1196,7 +1211,12 @@ public static function filterAuthor($author): string
 	public static function getFamEvAsContent(string $ev, object $famObj, ?string $default): ?string
 	{
 		$newContent = $default;
-		if ($ev !== "" && property_exists($famObj->familyEV, $ev) && $famObj->familyEV->$ev !== null && $famObj->familyEV->$ev->value !== null) {
+		if ($ev !== "" &&
+			isset($famObj->familyEV) &&
+			property_exists($famObj->familyEV, $ev) &&
+			$famObj->familyEV->$ev !== null &&
+			$famObj->familyEV->$ev->value !== null) {
+
 			$newContent = $famObj->familyEV->$ev->value;
 			$newContent = Utilities::standardizeHtml($newContent, "partner-import");
 		}
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 2a1dc25e..bbbbae30 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -883,6 +883,7 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 		if ($types > 0) {
 			$tax = $instance->settings->global_primary_tax;
 			if ($tax !== "" &&
+			    is_object($tax) &&
 			    $instance->settings->enable_global === "on" &&
 			    count($instance->getFamilyEvFields([$tax])) > 0) {
 				$tax    = $instance->getFamilyEvFields([$tax])[0];
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 3cd2d193..7a9bc19c 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1863,13 +1863,17 @@ public function getFamilyEvFields(?array $matches = null): array
 
 		// Get update if needed.
 		if ($needsUpdate) {
-			$update = $this->updateFamilyEvFields();
+			try {
+				$update = $this->updateFamilyEvFields();
+			} catch (TouchPointWP_Exception) {
+				$update = false;
+			}
 			if ($update !== false) {
 				$fevObj = $update;
 			}
 		}
 
-		// If update failed, show a notice on the admin interface.
+		// If there's no update and no existing data, return empty array.
 		if ($fevObj === false) {
 			return [];
 		}
@@ -2104,6 +2108,31 @@ public function updateFamilyEvFields()
 		return $obj;
 	}
 
+	/**
+	 * @throws TouchPointWP_Exception
+	 */
+	protected function checkApiValidity(): void
+	{
+		if ( ! $this->settings->hasValidApiSettings()) {
+			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
+		}
+
+		if (!self::$allowApiCalls) {
+			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+		}
+
+		$mostCommon = "";
+		if (count(self::$apiCallLog) > self::MAX_API_CALLS) {
+			if ($this->debug) {
+				$counts = array_count_values(self::$apiCallLog);
+				arsort($counts);
+				$mostCommon = "  Most Common: " . key($counts);
+			}
+
+			throw new TouchPointWP_Exception("Too many API calls have been attempted in this session.$mostCommon", 170009);
+		}
+	}
+
 	/**
 	 * @param string $command The thing to get
 	 * @param ?array $parameters URL parameters to be added.
@@ -2124,6 +2153,12 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
 		}
 
+		if (!self::$allowApiCalls) {
+			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+		}
+
+		$this->checkApiValidity();
+
 		$parameters['a'] = $command;
 
 		$host = $this->host();
@@ -2134,6 +2169,8 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 
 		$url = $host . "/PythonApi/" .
 		       $this->settings->api_script_name . "?" . http_build_query($parameters);
+
+		self::$apiCallLog[] = $url;
 		
 		if ($verbose) {
 			echo "<p>Request to $url</p>";
@@ -2165,9 +2202,7 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 	 */
 	public function apiPost(string $command, mixed $data = null, int $timeout = 5): array|stdClass
 	{
-		if ( ! $this->settings->hasValidApiSettings()) {
-			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
-		}
+		$this->checkApiValidity();
 
 		$host = $this->host();
 
@@ -2179,9 +2214,12 @@ public function apiPost(string $command, mixed $data = null, int $timeout = 5):
 
 		$data = json_encode(['inputData' => $data]);
 
+		$url = $host . "/PythonApi/" . $this->settings->api_script_name . "?" . http_build_query(['a' => $command]);
+
+		self::$apiCallLog[] = $url;
+
 		$r = $this->getHttpClient()->request(
-			$host . "/PythonApi/" .
-			$this->settings->api_script_name . "?" . http_build_query(['a' => $command]),
+			$url,
 			[
 				'method'  => 'POST',
 				'headers' => [
@@ -2195,6 +2233,10 @@ public function apiPost(string $command, mixed $data = null, int $timeout = 5):
 		return self::parseApiResponse($r);
 	}
 
+	protected static bool $allowApiCalls = true;
+	protected static array $apiCallLog = [];
+	const MAX_API_CALLS = 20;
+
 	/**
 	 * @param $response
 	 *
@@ -2208,6 +2250,11 @@ private static function parseApiResponse($response): array|stdClass
 			throw new TouchPointWP_WPError($response);
 		}
 
+		if ($response['response']['code'] === 429) {
+			self::$allowApiCalls = false;
+			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+		}
+
 		$respDecoded = json_decode($response['body']);
 
 		if ($respDecoded === null) {
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 613492a9..d550a14b 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1381,7 +1381,7 @@ public function get(string $what): mixed
 	{
 		$v = $this->getWithoutDefault($what);
 
-		$meta = $this->getFieldMeta($what);
+		$meta = $this->getFieldMeta($what); // $meta can be null if option isn't in settings (e.g. cached meta fields)
 
 		if ($v === self::UNDEFINED_PLACEHOLDER) {
 			$v = $this->getDefaultValueForSetting($what, $meta);

From 36c48fc962228add867919e3abff026b71b58a37 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 22 May 2024 17:25:52 -0400
Subject: [PATCH 124/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po                 | 62 +++++++++++----------
 i18n/TouchPoint-WP.pot                      | 62 +++++++++++----------
 src/TouchPoint-WP/Involvement.php           |  8 +--
 src/TouchPoint-WP/Utilities/DateFormats.php |  5 +-
 src/templates/involvement-single.php        | 10 +++-
 5 files changed, 80 insertions(+), 67 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 1878ee9d..90954562 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:555
+#: src/TouchPoint-WP/Meeting.php:551
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -306,7 +306,7 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:554
+#: src/TouchPoint-WP/Meeting.php:550
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
@@ -1301,17 +1301,17 @@ msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográ
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:487
+#: src/TouchPoint-WP/Meeting.php:483
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:515
+#: src/TouchPoint-WP/Meeting.php:511
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:525
+#: src/TouchPoint-WP/Meeting.php:521
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
@@ -1580,18 +1580,18 @@ msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones dis
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:85
-#: src/TouchPoint-WP/Utilities/DateFormats.php:157
+#: src/TouchPoint-WP/Utilities/DateFormats.php:86
+#: src/TouchPoint-WP/Utilities/DateFormats.php:158
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:87
-#: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+#: src/TouchPoint-WP/Utilities/DateFormats.php:160
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:93
-#: src/TouchPoint-WP/Utilities/DateFormats.php:165
+#: src/TouchPoint-WP/Utilities/DateFormats.php:94
+#: src/TouchPoint-WP/Utilities/DateFormats.php:166
 msgid "Tomorrow"
 msgstr "mañana"
 
@@ -1612,25 +1612,25 @@ msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:110
+#: src/TouchPoint-WP/Utilities/DateFormats.php:111
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:116
+#: src/TouchPoint-WP/Utilities/DateFormats.php:117
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:122
+#: src/TouchPoint-WP/Utilities/DateFormats.php:123
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:127
+#: src/TouchPoint-WP/Utilities/DateFormats.php:128
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -1695,22 +1695,22 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:100
+#: src/TouchPoint-WP/Utilities/DateFormats.php:101
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:101
+#: src/TouchPoint-WP/Utilities/DateFormats.php:102
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:103
+#: src/TouchPoint-WP/Utilities/DateFormats.php:104
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:104
+#: src/TouchPoint-WP/Utilities/DateFormats.php:105
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
@@ -1734,55 +1734,57 @@ msgstr "todo el dia los %1$s"
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:55
-#: src/TouchPoint-WP/Utilities/DateFormats.php:291
+#. translators: %1$s is the start time, %2$s is the end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:56
+#: src/TouchPoint-WP/Utilities/DateFormats.php:292
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:172
+#: src/TouchPoint-WP/Utilities/DateFormats.php:173
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+#: src/TouchPoint-WP/Utilities/DateFormats.php:174
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr "j M"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:175
+#: src/TouchPoint-WP/Utilities/DateFormats.php:176
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:176
+#: src/TouchPoint-WP/Utilities/DateFormats.php:177
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:325
+#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:326
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:182
+#: src/TouchPoint-WP/Utilities/DateFormats.php:183
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:188
+#: src/TouchPoint-WP/Utilities/DateFormats.php:189
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+#: src/TouchPoint-WP/Utilities/DateFormats.php:195
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:199
+#: src/TouchPoint-WP/Utilities/DateFormats.php:200
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 9dc26d79..0e56b072 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:555
+#: src/TouchPoint-WP/Meeting.php:551
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -532,22 +532,22 @@ msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:487
+#: src/TouchPoint-WP/Meeting.php:483
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:515
+#: src/TouchPoint-WP/Meeting.php:511
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:525
+#: src/TouchPoint-WP/Meeting.php:521
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:554
+#: src/TouchPoint-WP/Meeting.php:550
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
@@ -1470,115 +1470,117 @@ msgstr ""
 msgid "Expand"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:55
-#: src/TouchPoint-WP/Utilities/DateFormats.php:291
+#. translators: %1$s is the start time, %2$s is the end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:56
+#: src/TouchPoint-WP/Utilities/DateFormats.php:292
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:85
-#: src/TouchPoint-WP/Utilities/DateFormats.php:157
+#: src/TouchPoint-WP/Utilities/DateFormats.php:86
+#: src/TouchPoint-WP/Utilities/DateFormats.php:158
 msgid "Tonight"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:87
-#: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+#: src/TouchPoint-WP/Utilities/DateFormats.php:160
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:93
-#: src/TouchPoint-WP/Utilities/DateFormats.php:165
+#: src/TouchPoint-WP/Utilities/DateFormats.php:94
+#: src/TouchPoint-WP/Utilities/DateFormats.php:166
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:100
+#: src/TouchPoint-WP/Utilities/DateFormats.php:101
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:101
+#: src/TouchPoint-WP/Utilities/DateFormats.php:102
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:103
+#: src/TouchPoint-WP/Utilities/DateFormats.php:104
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:104
+#: src/TouchPoint-WP/Utilities/DateFormats.php:105
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:110
+#: src/TouchPoint-WP/Utilities/DateFormats.php:111
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:116
+#: src/TouchPoint-WP/Utilities/DateFormats.php:117
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:122
+#: src/TouchPoint-WP/Utilities/DateFormats.php:123
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:127
+#: src/TouchPoint-WP/Utilities/DateFormats.php:128
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:172
+#: src/TouchPoint-WP/Utilities/DateFormats.php:173
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+#: src/TouchPoint-WP/Utilities/DateFormats.php:174
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:175
+#: src/TouchPoint-WP/Utilities/DateFormats.php:176
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:176
+#: src/TouchPoint-WP/Utilities/DateFormats.php:177
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:182
+#: src/TouchPoint-WP/Utilities/DateFormats.php:183
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:188
+#: src/TouchPoint-WP/Utilities/DateFormats.php:189
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+#: src/TouchPoint-WP/Utilities/DateFormats.php:195
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:199
+#: src/TouchPoint-WP/Utilities/DateFormats.php:200
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:325
+#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:326
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 2a0e1e3a..4ded52e0 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -926,7 +926,7 @@ protected function scheduleString_calc(): string
 					}
 					if (count($timeStr) > 0) {
 						$timeStr = Utilities::stringArrayToListString($timeStr);
-						// translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
+						// translators: %1$s is the date(s), %2$s is the time(s).
 						$dayStr[] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $day, $timeStr);
 					} else {
 						// translators: "Mon All Day"  or  "Sundays All Day"
@@ -955,7 +955,7 @@ protected function scheduleString_calc(): string
 				} else {
 					$timeStr = DateFormats::TimeStringFormatted($dt);
 
-					// translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
+					// translators: %1$s is the date(s), %2$s is the time(s).
 					$dayStr  = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $dayStr, $timeStr);
 				}
 			}
@@ -1030,7 +1030,7 @@ protected function scheduleString_calc(): string
 					$dateTimeArr[] = $r['datetime'];
 				} else {
 					$dateTimeArr[] = wp_sprintf(
-						// translators: %1$s is the date, %2$s is the time.
+						// translators: %1$s is the date(s), %2$s is the time(s).
 						__('%1$s at %2$s', 'TouchPoint-WP'), $r['date'], $r['time']
 					);
 					if ( !$dateArr->contains(['date'])) {
@@ -1052,7 +1052,7 @@ protected function scheduleString_calc(): string
 			$dateStr = $dateArr->toListString();
 
 			return wp_sprintf(
-				// translators: %1$s is the date, %2$s is the time.
+				// translators: %1$s is the date(s), %2$s is the time(s).
 				__('%1$s at %2$s', 'TouchPoint-WP'), $dateStr, $timeArr[0]
 			);
 		}
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 5fdd06e1..c7802c82 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -52,6 +52,7 @@ public static function TimeRangeStringFormatted(DateTimeInterface $startDt, Date
 		$startStr = self::TimeStringFormatted($startDt);
 		$endStr = self::TimeStringFormatted($endDt);
 
+		// translators: %1$s is the start time, %2$s is the end time.
 		$ts = wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $startStr, $endStr);
 
 		/**
@@ -245,7 +246,7 @@ public static function DurationToString(?DateTimeExtended $start, ?DateTimeExten
 		}
 
 		if (isset($r['date']) && isset($r['time'])) {
-			// translators: %1$s is the date, %2$s is the time.
+			// translators: %1$s is the date(s), %2$s is the time(s).
 			return wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $r['date'], $r['time']);
 		}
 
@@ -320,8 +321,8 @@ public static function DurationToStringArray(?DateTimeInterface $start, ?DateTim
 				$time1 = self::TimeStringFormatted($start);
 				$time2 = self::TimeStringFormatted($end);
 
-				// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
 				return [
+					// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
 					'datetime' => wp_sprintf(__('%1$s at %2$s &ndash; %3$s at %4$s', 'TouchPoint-WP'), $date1, $time1, $date2, $time2)
 				];
 			}
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 8bc81564..0060a45c 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -93,8 +93,16 @@
 		                         'meta_value'   => time(),
 		                         'meta_compare' => '>'
 	                         ]);
-	if (count($meetings) > 0) {
+    $count = count($meetings);
+	if ($count > 0) {
 		echo "<div class='event-list'>";
+        $heading = sprintf(
+                // translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
+                _n('Upcoming %1$s', 'Upcoming %2$s', 'TouchPoint-WP'),
+                TouchPointWP::instance()->settings->mc_name_singular,
+                TouchPointWP::instance()->settings->mc_name_plural
+        );
+        echo "<h3>$heading</h3>";
 	}
 	foreach ($meetings as $post) {
 		/** @var WP_Post $post */

From 046aaa565cd6267ce22611dd323f961f845a02a3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 22 May 2024 17:38:50 -0400
Subject: [PATCH 125/423] i18n updates

---
 i18n/TouchPoint-WP-es_ES.po | 151 ++++++++++++++++++-----------------
 i18n/TouchPoint-WP.pot      | 153 ++++++++++++++++++------------------
 2 files changed, 151 insertions(+), 153 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 90954562..82bb358b 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1747
+#: src/TouchPoint-WP/Involvement.php:1758
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1773
+#: src/TouchPoint-WP/Involvement.php:1784
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +173,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:1993
+#: src/TouchPoint-WP/Involvement.php:2004
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -207,90 +207,90 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:483
+#: src/TouchPoint-WP/Involvement.php:488
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:488
+#: src/TouchPoint-WP/Involvement.php:493
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:495
+#: src/TouchPoint-WP/Involvement.php:500
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:501
+#: src/TouchPoint-WP/Involvement.php:506
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1622
-#: src/TouchPoint-WP/Partner.php:795
+#: src/TouchPoint-WP/Involvement.php:1633
+#: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1830
-#: src/TouchPoint-WP/Partner.php:817
+#: src/TouchPoint-WP/Involvement.php:1841
+#: src/TouchPoint-WP/Partner.php:832
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3442
+#: src/TouchPoint-WP/Involvement.php:3453
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3445
+#: src/TouchPoint-WP/Involvement.php:3456
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3516
+#: src/TouchPoint-WP/Involvement.php:3527
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3575
-#: src/TouchPoint-WP/Involvement.php:3611
+#: src/TouchPoint-WP/Involvement.php:3586
+#: src/TouchPoint-WP/Involvement.php:3622
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3580
+#: src/TouchPoint-WP/Involvement.php:3591
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3584
+#: src/TouchPoint-WP/Involvement.php:3595
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3589
+#: src/TouchPoint-WP/Involvement.php:3600
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3592
+#: src/TouchPoint-WP/Involvement.php:3603
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3595
+#: src/TouchPoint-WP/Involvement.php:3606
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3598
+#: src/TouchPoint-WP/Involvement.php:3609
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3617
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3528
-#: src/TouchPoint-WP/Partner.php:1292
+#: src/TouchPoint-WP/Involvement.php:3539
+#: src/TouchPoint-WP/Partner.php:1312
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:824
+#: src/TouchPoint-WP/Partner.php:839
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1233
+#: src/TouchPoint-WP/Partner.php:1253
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -311,38 +311,38 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1924
+#: src/TouchPoint-WP/TouchPointWP.php:1928
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1981
+#: src/TouchPoint-WP/TouchPointWP.php:1985
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1984
+#: src/TouchPoint-WP/TouchPointWP.php:1988
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1987
+#: src/TouchPoint-WP/TouchPointWP.php:1991
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1992
-#: src/TouchPoint-WP/TouchPointWP.php:1993
+#: src/TouchPoint-WP/TouchPointWP.php:1996
+#: src/TouchPoint-WP/TouchPointWP.php:1997
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2121
-#: src/TouchPoint-WP/TouchPointWP.php:2166
+#: src/TouchPoint-WP/TouchPointWP.php:2114
+#: src/TouchPoint-WP/TouchPointWP.php:2150
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2129
-#: src/TouchPoint-WP/TouchPointWP.php:2173
+#: src/TouchPoint-WP/TouchPointWP.php:2164
+#: src/TouchPoint-WP/TouchPointWP.php:2208
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2293
+#: src/TouchPoint-WP/TouchPointWP.php:2340
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -981,7 +981,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2234
+#: src/TouchPoint-WP/TouchPointWP.php:2281
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1036,16 +1036,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1795
+#: src/TouchPoint-WP/Involvement.php:1806
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1808
+#: src/TouchPoint-WP/Involvement.php:1819
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1679
+#: src/TouchPoint-WP/Involvement.php:1690
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1207,72 +1207,71 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1796
+#: src/TouchPoint-WP/Involvement.php:1807
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1797
+#: src/TouchPoint-WP/Involvement.php:1808
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1838
-#: src/TouchPoint-WP/Partner.php:833
+#: src/TouchPoint-WP/Involvement.php:1849
+#: src/TouchPoint-WP/Partner.php:848
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1841
-#: src/TouchPoint-WP/Partner.php:836
+#: src/TouchPoint-WP/Involvement.php:1852
+#: src/TouchPoint-WP/Partner.php:851
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
-#. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#. translators: %1$s is the date, %2$s is the time.
-#: src/TouchPoint-WP/Involvement.php:919
-#: src/TouchPoint-WP/Involvement.php:948
-#: src/TouchPoint-WP/Involvement.php:1023
-#: src/TouchPoint-WP/Involvement.php:1045
-#: src/TouchPoint-WP/Utilities/DateFormats.php:249
-#: src/TouchPoint-WP/Utilities/DateFormats.php:312
+#. translators: %1$s is the date(s), %2$s is the time(s).
+#: src/TouchPoint-WP/Involvement.php:930
+#: src/TouchPoint-WP/Involvement.php:959
+#: src/TouchPoint-WP/Involvement.php:1034
+#: src/TouchPoint-WP/Involvement.php:1056
+#: src/TouchPoint-WP/Utilities/DateFormats.php:250
+#: src/TouchPoint-WP/Utilities/DateFormats.php:313
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:957
+#: src/TouchPoint-WP/Involvement.php:968
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:964
+#: src/TouchPoint-WP/Involvement.php:975
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:974
+#: src/TouchPoint-WP/Involvement.php:985
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:980
+#: src/TouchPoint-WP/Involvement.php:991
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:989
+#: src/TouchPoint-WP/Involvement.php:1000
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:995
+#: src/TouchPoint-WP/Involvement.php:1006
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3474
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1289,15 +1288,15 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1934
+#: src/TouchPoint-WP/Involvement.php:1945
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1944
+#: src/TouchPoint-WP/Involvement.php:1955
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1963
+#: src/TouchPoint-WP/Involvement.php:1974
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
@@ -1316,8 +1315,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3704
-#: src/TouchPoint-WP/Involvement.php:3801
+#: src/TouchPoint-WP/Involvement.php:3715
+#: src/TouchPoint-WP/Involvement.php:3812
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1382,7 +1381,7 @@ msgstr "Clasifique las participaciones según si los participantes son en su may
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:896
+#: src/TouchPoint-WP/Taxonomies.php:897
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1437,7 +1436,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1722
+#: src/TouchPoint-WP/Involvement.php:1733
 msgid "Language"
 msgstr "Idioma"
 
@@ -1490,7 +1489,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3788
+#: src/TouchPoint-WP/Involvement.php:3799
 #: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1515,7 +1514,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3778
+#: src/TouchPoint-WP/Involvement.php:3789
 #: src/TouchPoint-WP/Person.php:1832
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1641,7 +1640,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3540
+#: src/TouchPoint-WP/Involvement.php:3551
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1720,13 +1719,13 @@ msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:132
+#: src/TouchPoint-WP/Involvement.php:133
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:922
-#: src/TouchPoint-WP/Involvement.php:943
+#: src/TouchPoint-WP/Involvement.php:933
+#: src/TouchPoint-WP/Involvement.php:954
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 0e56b072..c8bba2dd 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-05-15T17:04:06+00:00\n"
+"POT-Creation-Date: 2024-05-22T21:37:34+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -158,13 +158,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1747
+#: src/TouchPoint-WP/Involvement.php:1758
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1773
+#: src/TouchPoint-WP/Involvement.php:1784
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:1993
+#: src/TouchPoint-WP/Involvement.php:2004
 msgid "No %s Found."
 msgstr ""
 
@@ -261,7 +261,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3474
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -301,202 +301,201 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:132
+#: src/TouchPoint-WP/Involvement.php:133
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:483
+#: src/TouchPoint-WP/Involvement.php:488
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:488
+#: src/TouchPoint-WP/Involvement.php:493
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:495
+#: src/TouchPoint-WP/Involvement.php:500
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:501
+#: src/TouchPoint-WP/Involvement.php:506
 msgid "Registration Closed"
 msgstr ""
 
-#. translators: "Mon at 7pm"  or  "Sundays at 9am & 11am"
-#. translators: %1$s is the date, %2$s is the time.
-#: src/TouchPoint-WP/Involvement.php:919
-#: src/TouchPoint-WP/Involvement.php:948
-#: src/TouchPoint-WP/Involvement.php:1023
-#: src/TouchPoint-WP/Involvement.php:1045
-#: src/TouchPoint-WP/Utilities/DateFormats.php:249
-#: src/TouchPoint-WP/Utilities/DateFormats.php:312
+#. translators: %1$s is the date(s), %2$s is the time(s).
+#: src/TouchPoint-WP/Involvement.php:930
+#: src/TouchPoint-WP/Involvement.php:959
+#: src/TouchPoint-WP/Involvement.php:1034
+#: src/TouchPoint-WP/Involvement.php:1056
+#: src/TouchPoint-WP/Utilities/DateFormats.php:250
+#: src/TouchPoint-WP/Utilities/DateFormats.php:313
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:922
-#: src/TouchPoint-WP/Involvement.php:943
+#: src/TouchPoint-WP/Involvement.php:933
+#: src/TouchPoint-WP/Involvement.php:954
 msgid "%1$s All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:957
+#: src/TouchPoint-WP/Involvement.php:968
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:964
+#: src/TouchPoint-WP/Involvement.php:975
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:974
+#: src/TouchPoint-WP/Involvement.php:985
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:980
+#: src/TouchPoint-WP/Involvement.php:991
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:989
+#: src/TouchPoint-WP/Involvement.php:1000
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:995
+#: src/TouchPoint-WP/Involvement.php:1006
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1622
-#: src/TouchPoint-WP/Partner.php:795
+#: src/TouchPoint-WP/Involvement.php:1633
+#: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1679
+#: src/TouchPoint-WP/Involvement.php:1690
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1722
+#: src/TouchPoint-WP/Involvement.php:1733
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1795
+#: src/TouchPoint-WP/Involvement.php:1806
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1796
+#: src/TouchPoint-WP/Involvement.php:1807
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1797
+#: src/TouchPoint-WP/Involvement.php:1808
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1808
+#: src/TouchPoint-WP/Involvement.php:1819
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1830
-#: src/TouchPoint-WP/Partner.php:817
+#: src/TouchPoint-WP/Involvement.php:1841
+#: src/TouchPoint-WP/Partner.php:832
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1838
-#: src/TouchPoint-WP/Partner.php:833
+#: src/TouchPoint-WP/Involvement.php:1849
+#: src/TouchPoint-WP/Partner.php:848
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1841
-#: src/TouchPoint-WP/Partner.php:836
+#: src/TouchPoint-WP/Involvement.php:1852
+#: src/TouchPoint-WP/Partner.php:851
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1934
+#: src/TouchPoint-WP/Involvement.php:1945
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1944
+#: src/TouchPoint-WP/Involvement.php:1955
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1963
+#: src/TouchPoint-WP/Involvement.php:1974
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3442
+#: src/TouchPoint-WP/Involvement.php:3453
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3445
+#: src/TouchPoint-WP/Involvement.php:3456
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3516
+#: src/TouchPoint-WP/Involvement.php:3527
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3528
-#: src/TouchPoint-WP/Partner.php:1292
+#: src/TouchPoint-WP/Involvement.php:3539
+#: src/TouchPoint-WP/Partner.php:1312
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3540
+#: src/TouchPoint-WP/Involvement.php:3551
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3575
-#: src/TouchPoint-WP/Involvement.php:3611
+#: src/TouchPoint-WP/Involvement.php:3586
+#: src/TouchPoint-WP/Involvement.php:3622
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3580
+#: src/TouchPoint-WP/Involvement.php:3591
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3584
+#: src/TouchPoint-WP/Involvement.php:3595
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3589
+#: src/TouchPoint-WP/Involvement.php:3600
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3592
+#: src/TouchPoint-WP/Involvement.php:3603
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3595
+#: src/TouchPoint-WP/Involvement.php:3606
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3598
+#: src/TouchPoint-WP/Involvement.php:3609
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3617
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3704
-#: src/TouchPoint-WP/Involvement.php:3801
+#: src/TouchPoint-WP/Involvement.php:3715
+#: src/TouchPoint-WP/Involvement.php:3812
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3778
+#: src/TouchPoint-WP/Involvement.php:3789
 #: src/TouchPoint-WP/Person.php:1832
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3788
+#: src/TouchPoint-WP/Involvement.php:3799
 #: src/TouchPoint-WP/Person.php:1815
 msgid "Contact Prohibited."
 msgstr ""
@@ -553,11 +552,11 @@ msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:824
+#: src/TouchPoint-WP/Partner.php:839
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1233
+#: src/TouchPoint-WP/Partner.php:1253
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -697,7 +696,7 @@ msgstr ""
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:896
+#: src/TouchPoint-WP/Taxonomies.php:897
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
@@ -705,42 +704,42 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1924
+#: src/TouchPoint-WP/TouchPointWP.php:1928
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1981
+#: src/TouchPoint-WP/TouchPointWP.php:1985
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1984
+#: src/TouchPoint-WP/TouchPointWP.php:1988
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1987
+#: src/TouchPoint-WP/TouchPointWP.php:1991
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1992
-#: src/TouchPoint-WP/TouchPointWP.php:1993
+#: src/TouchPoint-WP/TouchPointWP.php:1996
+#: src/TouchPoint-WP/TouchPointWP.php:1997
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2121
-#: src/TouchPoint-WP/TouchPointWP.php:2166
+#: src/TouchPoint-WP/TouchPointWP.php:2114
+#: src/TouchPoint-WP/TouchPointWP.php:2150
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2129
-#: src/TouchPoint-WP/TouchPointWP.php:2173
+#: src/TouchPoint-WP/TouchPointWP.php:2164
+#: src/TouchPoint-WP/TouchPointWP.php:2208
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2234
+#: src/TouchPoint-WP/TouchPointWP.php:2281
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2293
+#: src/TouchPoint-WP/TouchPointWP.php:2340
 msgid "People Query Failed"
 msgstr ""
 

From c4712bcdeee4b2e76177aa01bf0c09adb1d0c0b2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 23 May 2024 04:26:45 +0000
Subject: [PATCH 126/423] bugs

---
 src/TouchPoint-WP/Involvement.php           | 48 +++++++++++----------
 src/TouchPoint-WP/Taxonomies.php            |  6 +--
 src/TouchPoint-WP/TouchPointWP_Settings.php |  4 +-
 src/TouchPoint-WP/jsInstantiation.php       |  4 ++
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 4ded52e0..83398d52 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -222,8 +222,8 @@ protected function __construct(object $object)
 		// Geo
 		if (self::getSettingsForPostType($this->invType)->useGeo) {
 			if (property_exists($object, 'geo_lat') &&
-				$object->geo_lat !== null &&
-				$object->geo_lat !== '') {
+			    $object->geo_lat !== null &&
+			    $object->geo_lat !== '') {
 				// Probably a database query result
 				$this->geo = (object)[
 					'lat' => Utilities::toFloatOrNull($object->geo_lat),
@@ -579,12 +579,12 @@ public function getRegistrationType(): int
 					}
 					break; // Registration isn't possible at a link, therefore, assume there was a mistake and continue.
 
-					
+
 				case 7:
 					$this->_registrationType = RegistrationType::CLOSED;
 					return $this->_registrationType;
 			}
-			
+
 			// If the involvement has a redirection link, assume it's an external form
 			if ($regUrl !== null) {
 				$this->_registrationType = RegistrationType::EXTERNAL;
@@ -622,7 +622,7 @@ public function useRegistrationForm(): bool
 	{
 		if (!isset($this->_useRegistrationForm)) {
 			$this->_useRegistrationForm = (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true) === '1' ||
-					intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1);
+			                               intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1);
 		}
 		return $this->_useRegistrationForm;
 	}
@@ -633,7 +633,7 @@ public function useRegistrationForm(): bool
 	 * Get an array of objects that correspond to key details of meetings.  Does NOT return the actual Meeting objects.
 	 * Since this is used for involvements regardless of whether their meetings are imported, this pulls from the object
 	 * array that's imported directly from the API.  It does not take into account Meeting objects, or meetings that
-	 * belong to child involvements. 
+	 * belong to child involvements.
 	 *
 	 * @return stdClass[]
 	 */
@@ -1067,7 +1067,7 @@ protected function scheduleString_calc(): string
 	protected function getDivisions(): array
 	{
 		$exclude = $this->settings()->importDivs;
-		
+
 		if ( ! isset($this->divisions)) {
 			if (count($exclude) > 1) {
 				$mq = ['relation' => "AND"];
@@ -1085,7 +1085,7 @@ protected function getDivisions(): array
 
 			$this->divisions = wp_get_post_terms($this->post_id, Taxonomies::TAX_DIV, ['meta_query' => $mq]);
 		}
-		
+
 		return $this->divisions;
 	}
 
@@ -1498,7 +1498,7 @@ public static function listShortcode($params = [], string $content = ""): string
 				 * @since 0.0.15
 				 *
 				 * @param bool $useCss Whether or not to include the default CSS.  True = include
-				 * @param string $className The name of the current calling class. 
+				 * @param string $className The name of the current calling class.
 				 */
 				'includecss' => apply_filters('tp_use_css', true, self::class),
 				'itemclass'  => self::$itemClass,
@@ -2430,11 +2430,15 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 
 		try {
 			$now       = Utilities::dateTimeNow();
-			$histDays  = TouchPointWP::instance()->settings->mc_hist_days;
+			$histDays  = intval(TouchPointWP::instance()->settings->mc_hist_days);
 			$histVal   = new DateInterval("P{$histDays}D");
 			$nowMinusH = $now->sub($histVal);
 			unset($aYear);
-		} catch (Exception) {
+		} catch (Exception $e) {
+			if ($verbose) {
+				$m = $e->getMessage();
+				echo "<p>Could not calculate date values.  Original Exception: $m</p>";
+			}
 			return false;
 		}
 
@@ -2466,8 +2470,8 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 
 			// Filter by end dates to stay relevant
 			if ($inv->lastMeeting !== null && (
-				(!$typeSets->importMeetings && $inv->lastMeeting < $now) ||
-				($typeSets->importMeetings && $inv->lastMeeting < $nowMinusH))
+					(!$typeSets->importMeetings && $inv->lastMeeting < $now) ||
+					($typeSets->importMeetings && $inv->lastMeeting < $nowMinusH))
 			) { // last meeting was long enough ago to no longer be relevant.
 				if ($verbose) {
 					echo "<p>Stopping processing because all meetings are in the past.  Involvement will be deleted from WordPress.</p>";
@@ -2559,7 +2563,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		//////////////////
 		//// Removals ////
 		//////////////////
-		
+
 
 		if ($verbose) {
 			$tsn = $typeSets->namePlural;
@@ -2656,7 +2660,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regTypeId", intval($inv->regTypeId));
 		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", intval($inv->siteRegTypeId));
 		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", !!$inv->hasRegQuestions);
-		
+
 
 		// Registration start
 		if ($inv->regStart === null) {
@@ -2791,7 +2795,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 		if ($typeSets->useGeo) {
 			// Handle locations
 			if (property_exists($inv, "lat") && $inv->lat !== null &&
-				property_exists($inv, "lng") && $inv->lng !== null) {
+			    property_exists($inv, "lng") && $inv->lng !== null) {
 				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat);
 				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng);
 			} else {
@@ -3088,8 +3092,8 @@ protected static function updateMeetingsForInvolvement(
 	}
 
 	/**
-	 * Update meta fields specific to Meetings, such as start/end date/time.  
-	 * 
+	 * Update meta fields specific to Meetings, such as start/end date/time.
+	 *
 	 * (This is included in this class and not in Meeting because it's a part of the Involvement import process and
 	 * the protected access is appropriate.)
 	 *
@@ -3484,7 +3488,7 @@ public function notableAttributes(array $exclude = []): array
 		$attrs = $this->processAttributeExclusions($attrs, $exclude);
 
 		/**
-		 * Allows for manipulation of the notable attributes strings for an Involvement.  An array of strings. 
+		 * Allows for manipulation of the notable attributes strings for an Involvement.  An array of strings.
 		 * Typically, these are the standardized strings that appear on the Involvement to give information about it,
 		 * such as the schedule, leaders, and location.
 		 *
@@ -3637,7 +3641,7 @@ public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?
 
 	/**
 	 * If the post for this involvement is also a single Meeting post, return that object.  Otherwise, null.
-	 * 
+	 *
 	 * @return ?Meeting
 	 */
 	protected function AsAMeeting(): ?Meeting
@@ -3680,7 +3684,7 @@ public function getTouchPointId(): int
 	}
 
 	/**
-	 * Indicates if the given post can be instantiated as an Involvement. 
+	 * Indicates if the given post can be instantiated as an Involvement.
 	 *
 	 * @param \WP_Post $post
 	 *
@@ -3751,7 +3755,7 @@ protected static function allowContact(string $invType): bool
 
 		/**
 		 * Determines whether contact is allowed for any Involvements.  This is called *after* tp_allow_contact, and
-		 * that will set the default. 
+		 * that will set the default.
 		 *
 		 * @since 0.0.35
 		 *
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index bbbbae30..fdba6804 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -258,13 +258,13 @@ public static function getTermsClauses($clauses, $taxonomy, $args): array
 	 * Insert the terms for the registered taxonomies.  (This is supposed to happen a while after the taxonomies are
 	 * loaded.)
 	 *
-	 * @param ?TouchPointWP $instance
+	 * @param ?TouchPointWP|string $instance  Default value for init call may be null or ''.
 	 *
 	 * @return void
 	 */
-	public static function insertTerms(TouchPointWP $instance = null)
+	public static function insertTerms($instance = null): void
 	{
-		if ($instance === null) {
+		if (!isset($instance) || $instance === '') {
 			$instance = TouchPointWP::instance();
 		}
 
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index d550a14b..0aeafe61 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -73,7 +73,7 @@
  * @property-read string       mc_slug            Slug for meetings in the meeting calendar (e.g. "events" for church.org/events)
  * @property-read int          mc_future_days     Number of days into the future to import.
  * @property-read int          mc_archive_days    Number of days to wait to move something to history.
- * @property-read int          mc_hist_days       Number of days of history to keep.
+ * @property-read int|string   mc_hist_days       Number of days of history to keep.  (Can be '' if module isn't enabled.)
  * @property-read string       mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
  *
  * @property-read string       rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
@@ -1383,7 +1383,7 @@ public function get(string $what): mixed
 
 		$meta = $this->getFieldMeta($what); // $meta can be null if option isn't in settings (e.g. cached meta fields)
 
-		if ($v === self::UNDEFINED_PLACEHOLDER) {
+		if ($v === self::UNDEFINED_PLACEHOLDER && $meta !== null) {
 			$v = $this->getDefaultValueForSetting($what, $meta);
 		}
 		if ($v === self::UNDEFINED_PLACEHOLDER) {
diff --git a/src/TouchPoint-WP/jsInstantiation.php b/src/TouchPoint-WP/jsInstantiation.php
index 2644c204..38191132 100644
--- a/src/TouchPoint-WP/jsInstantiation.php
+++ b/src/TouchPoint-WP/jsInstantiation.php
@@ -95,6 +95,10 @@ public function jsonSerialize(): object
 		$item = Closure::fromCallable("get_object_vars")->__invoke($this);
 		$item['post_id'] = $this->post_id();
 
+		if (method_exists($this, 'asGeoIFace')) {
+			$item['geo'] = $this->asGeoIFace('known');
+		}
+
 		return (object)$item;
 	}
 

From bf2c51809ef5f30312584f333e977e5f1d2aa98a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 23 May 2024 04:44:05 +0000
Subject: [PATCH 127/423] Timezone bug

---
 src/TouchPoint-WP/CalendarGrid.php          | 10 ++++++----
 src/TouchPoint-WP/Utilities/DateFormats.php | 22 ++++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index f6367afd..e97b21c8 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -101,9 +101,10 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 		// Loop through the days of the month
 		do {
-			$day = date_i18n("j", $d->getTimestamp());
+			$ts = DateFormats::timestampAndOffset($d);
+			$day = date_i18n("j", $ts);
 			$fullDay = DateFormats::DateStringFormatted($d);
-			$wd =  date_i18n("w", $d->getTimestamp());
+			$wd =  date_i18n("w", $ts);
 
 			try {
 				$newQ = self::adjustQueryForDay($q, $d, $tz);
@@ -387,10 +388,11 @@ protected static function getLinkForDate(DateTimeInterface $date): string
 	 */
 	protected static function getMonthNameForDate(DateTimeInterface $date): string
 	{
+		$ts = DateFormats::timestampAndOffset($date);
 		if ($date->format('Y') === Utilities::dateTimeNow()->format('Y')) {
-			$label = date_i18n('F', $date->getTimestamp());
+			$label = date_i18n('F', $ts);
 		} else {
-			$label = date_i18n('F Y', $date->getTimestamp());
+			$label = date_i18n('F Y', $ts);
 		}
 		return $label;
 	}
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index c7802c82..86fafbf8 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -22,7 +22,7 @@ abstract class DateFormats
 	 */
 	public static function TimeStringFormatted(DateTimeInterface $dt): string
 	{
-		$ts = date_i18n(get_option('time_format'), $dt->getTimestamp());
+		$ts = date_i18n(get_option('time_format'), self::timestampAndOffset($dt));
 
 		/**
 		 * Allows for manipulation of the string returned as a formatted time.
@@ -35,6 +35,18 @@ public static function TimeStringFormatted(DateTimeInterface $dt): string
 		return apply_filters('tp_adjust_time_string', $ts, $dt);
 	}
 
+	/**
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return int
+	 *
+	 * @since 0.0.90
+	 */
+	public static function timestampAndOffset(DateTimeInterface $dt): int
+	{
+		return $dt->getTimestamp() + $dt->getOffset();
+	}
+
 	/**
 	 * Get a time string for a given pair of DateTimesInterfaces.  This should generally only be used when all of these
 	 * are true:
@@ -93,8 +105,8 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
 				$r = __("Tomorrow", "TouchPoint-WP");
 			} else {
-				$ts    = $dt->getTimestamp();
-				$nowTs = $now->getTimestamp();
+				$ts    = DateFormats::timestampAndOffset($dt);
+				$nowTs = DateFormats::timestampAndOffset($now);
 
 
 				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
@@ -165,8 +177,8 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
 				$r = __("Tomorrow", "TouchPoint-WP");
 			} else {
-				$ts    = $dt->getTimestamp();
-				$nowTs = $now->getTimestamp();
+				$ts    = DateFormats::timestampAndOffset($dt);
+				$nowTs = DateFormats::timestampAndOffset($now);
 
 
 				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year

From 3e1c380e91c77efc30e6d27142e31e3cb2d1a839 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 23 May 2024 11:24:22 -0400
Subject: [PATCH 128/423] Auth bug

---
 src/TouchPoint-WP/Auth.php   | 10 +++++-----
 src/TouchPoint-WP/Person.php | 28 +++++++++++++++-------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 97978553..9ba3167c 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -84,7 +84,7 @@ public static function load(): bool
 		if (is_admin()) {
 			try {
 				self::createApiKeyIfNeeded();
-			} catch (TouchPointWP_Exception $e) {
+			} catch (TouchPointWP_Exception) {
 			}
 		}
 
@@ -155,7 +155,7 @@ public static function getLoginUrl(): string
 	{
 		try {
 			self::createApiKeyIfNeeded();
-		} catch (TouchPointWP_Exception $e) {
+		} catch (TouchPointWP_Exception) {
 		}
 
 		$antiforgeryId = self::generateAntiForgeryId();
@@ -310,7 +310,7 @@ public static function removeAdminBarMaybe()
 	 */
 	private static function wantsToLogin(): bool
 	{
-		$wants_to_login = false;
+		$wantsToLogin = false;
 		// redirect back from TouchPoint after a successful login
 		if (isset($_GET['loginToken'])) {
 			return false;
@@ -322,10 +322,10 @@ private static function wantsToLogin(): bool
 		// Exceptions
 		$action = isset($_GET['loggedout']) ? 'loggedout' : $action;
 		if ('login' == $action) {
-			$wants_to_login = true;
+			$wantsToLogin = true;
 		}
 
-		return $wants_to_login;
+		return $wantsToLogin;
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 6bf45780..e92eb190 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1577,6 +1577,19 @@ private static function ajaxIdent(): void
 			unset($inputData->pid);
 		}
 
+		// user validation.
+		$comment = "";
+		$valid = Utilities::validateRegistrantEmailAddress("", $inputData->email, $comment);
+		if (!$valid) {
+			http_response_code(Http::BAD_REQUEST);
+			echo json_encode([
+				                 'error'      => $comment,
+				                 'error_i18n' => __("Registration Blocked for Spam.", 'TouchPoint-WP')
+			                 ]);
+			exit;
+		}
+		unset($valid, $comment);
+
 		$r = self::ident($inputData);
 
 		echo json_encode($r);
@@ -1586,25 +1599,14 @@ private static function ajaxIdent(): void
 	/**
 	 * Make the API call to get family members, store the results to the Session, and return them.
 	 *
+	 * This is used for both formal and informal auth.  Email addresses should be checked for spam likelihood before this point.
+	 *
 	 * @param $inputData
 	 *
 	 * @return array
 	 */
 	public static function ident($inputData): array
 	{
-		// user validation.
-		$comment = "";
-		$valid = Utilities::validateRegistrantEmailAddress("", $inputData->email, $comment);
-		if (!$valid) {
-			http_response_code(Http::BAD_REQUEST);
-			echo json_encode([
-								 'error'      => $comment,
-								 'error_i18n' => __("Registration Blocked for Spam.", 'TouchPoint-WP')
-							 ]);
-			exit;
-		}
-		unset($valid, $comment);
-
 		try {
 			$inputData->context = "ident";
 			$data               = TouchPointWP::instance()->apiPost('ident', $inputData, 30);

From 43b30942f6a4a73c58bb36ca7f37628d9dd5b26c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 23 May 2024 13:37:42 -0400
Subject: [PATCH 129/423] Timezone bug

---
 src/TouchPoint-WP/Involvement.php           | 18 +++++++++++-------
 src/TouchPoint-WP/Utilities/DateFormats.php |  7 +++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 83398d52..7180f6fb 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3117,8 +3117,8 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
 		} else {
 			update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId);
-			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, intval($mtgO->mtgStartDt?->format('U')));
-			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, intval($mtgO->mtgEndDt?->format('U')));
+			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, DateFormats::timestampAndOffset($mtgO->mtgStartDt));
+			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, DateFormats::timestampAndOffset($mtgO->mtgEndDt));
 			update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, !!$feature);
 			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
 			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
@@ -3535,7 +3535,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 
 		// Register Button
 		if ($includeRegister === true) {
-			$ret[] = $this->getRegisterButton($btnClass);
+			$ret[] = $this->getRegisterButton($classesOnly);
 		}
 
 		// Show on map button.  (Only works if map is called before this is.)
@@ -3578,13 +3578,17 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 	/**
 	 * Get the HTML for the register button.  Labels depend on several settings within TouchPoint.
 	 *
-	 * @param string $btnClass
+	 * @param string $btnClass  Class names
 	 * @param bool   $includeRsvp
 	 *
 	 * @return ?string HTML for the registration button, whatever that should be. Null if nothing to return.
 	 */
 	public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?string
 	{
+		if ($btnClass !== "") {
+			$btnClass = " class=\"$btnClass\"";
+		}
+
 		switch ($this->getRegistrationType()) {
 			case RegistrationType::FORM:
 				$text = __('Register', 'TouchPoint-WP');
@@ -3615,18 +3619,18 @@ public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?
 				}
 				$link  = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
 				TouchPointWP::enqueueActionsStyle('inv-register');
-				return "<a class=\"btn button\" href=\"$link\" $btnClass>$text</a>  ";
+				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::JOIN:
 				$text = __('Join', 'TouchPoint-WP');
 				TouchPointWP::enqueueActionsStyle('inv-join');
-				return "<button type=\"button\" data-tp-action=\"join\" $btnClass>$text</button>  ";
+				return "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"join\" $btnClass>$text</button>  ";
 
 			case RegistrationType::EXTERNAL:
 				$text = __('Register', 'TouchPoint-WP');
 				$link = $this->getRegistrationUrl();
 				TouchPointWP::enqueueActionsStyle('inv-register');
-				return "<a class=\"btn button\" href=\"$link\" $btnClass>$text</a>  ";
+				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::RSVP:
 				if ($includeRsvp) {
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 86fafbf8..3d256a65 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -36,14 +36,17 @@ public static function TimeStringFormatted(DateTimeInterface $dt): string
 	}
 
 	/**
-	 * @param DateTimeInterface $dt
+	 * @param ?DateTimeInterface $dt
 	 *
 	 * @return int
 	 *
 	 * @since 0.0.90
 	 */
-	public static function timestampAndOffset(DateTimeInterface $dt): int
+	public static function timestampAndOffset(?DateTimeInterface $dt): int
 	{
+		if ($dt === null) {
+			return 0;
+		}
 		return $dt->getTimestamp() + $dt->getOffset();
 	}
 

From 37bc4649d91531dbc3e6aafd4ca0f976f981d4d3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 11 Jun 2024 08:48:58 -0400
Subject: [PATCH 130/423] Array/null bug Closes #191

---
 src/TouchPoint-WP/TouchPointWP_Settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 0aeafe61..313c74d1 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1807,14 +1807,15 @@ protected function validation_slug(mixed $new, string $field): string
 	/**
 	 * Validate that selected post types are actually post types that exist.
 	 *
-	 * @param mixed  $new The new value.
+	 * @param ?array $new The new value.
 	 *
 	 * @return string[]
 	 */
-	protected function validation_postTypes(array $new): array
+	protected function validation_postTypes(?array $new): array
 	{
 		$types = array_keys(Utilities::getRegisteredPostTypesAsKVArray());
 		$r = [];
+		$new ??= [];
 		sort($new);
 		foreach ($new as $t) {
 			if (in_array($t, $types)) {

From 51f0925ae720e2760009e4d366984abfa67b7223 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 11 Jun 2024 08:54:28 -0400
Subject: [PATCH 131/423] Prevent creation of admin user Closes #188

---
 src/TouchPoint-WP/Person.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index e92eb190..de49c650 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1352,6 +1352,10 @@ protected static function generateUserName(object $pData): string
 	{
 		// Best.  Matches TouchPoint username.  However, it is possible users won't have usernames.
 		foreach ($pData->Usernames as $u) {
+			if (stripos($u, 'admin') !== false) {
+				continue;
+			}
+
 			if ( ! username_exists($u)) {
 				return $u;
 			}

From 48d61ca936f00b63393d830dad6481a8c30cf7d9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 11 Jun 2024 09:57:50 -0400
Subject: [PATCH 132/423] Adding radius parameter for locations. Default of 0.1
 miles is maintained. Closes #186

---
 i18n/TouchPoint-WP-es_ES.po             | 16 ++++++++++------
 i18n/TouchPoint-WP.pot                  | 12 ++++++++----
 src/TouchPoint-WP/Location.php          |  2 +-
 src/templates/admin/locationsKoForm.php |  9 +++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 82bb358b..d74f9de2 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -38,7 +38,7 @@ msgstr "https://github.com/jkrrv"
 
 #: src/templates/admin/invKoForm.php:17
 #: src/templates/admin/locationsKoForm.php:13
-#: src/templates/admin/locationsKoForm.php:50
+#: src/templates/admin/locationsKoForm.php:58
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1143,23 +1143,23 @@ msgstr "Latitud"
 msgid "Longitude"
 msgstr "Longitud"
 
-#: src/templates/admin/locationsKoForm.php:43
+#: src/templates/admin/locationsKoForm.php:51
 msgid "Static IP Addresses"
 msgstr "Direcciones IP estáticas"
 
-#: src/templates/admin/locationsKoForm.php:46
+#: src/templates/admin/locationsKoForm.php:54
 msgid "If this Location has an internet connection with Static IP Addresses, you can put those addresses here so users are automatically identified with this location."
 msgstr "Si esta ubicación tiene una conexión a Internet con direcciones IP estáticas, puede colocar esas direcciones aquí para que los usuarios se identifiquen automáticamente con esta ubicación."
 
-#: src/templates/admin/locationsKoForm.php:54
+#: src/templates/admin/locationsKoForm.php:62
 msgid "Add IP Address"
 msgstr "Agregar dirección IP"
 
-#: src/templates/admin/locationsKoForm.php:64
+#: src/templates/admin/locationsKoForm.php:72
 msgid "Add Location"
 msgstr "Añade una ubicación"
 
-#: src/templates/admin/locationsKoForm.php:71
+#: src/templates/admin/locationsKoForm.php:79
 msgid "The Campus"
 msgstr "El campus"
 
@@ -1792,3 +1792,7 @@ msgstr "%1$s %2$s"
 #: src/TouchPoint-WP/CalendarGrid.php:212
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
+
+#: src/templates/admin/locationsKoForm.php:43
+msgid "Radius (miles)"
+msgstr "Radio (millas)"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index c8bba2dd..9b8d2850 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -223,22 +223,26 @@ msgid "Longitude"
 msgstr ""
 
 #: src/templates/admin/locationsKoForm.php:43
+msgid "Radius (miles)"
+msgstr ""
+
+#: src/templates/admin/locationsKoForm.php:51
 msgid "Static IP Addresses"
 msgstr ""
 
-#: src/templates/admin/locationsKoForm.php:46
+#: src/templates/admin/locationsKoForm.php:54
 msgid "If this Location has an internet connection with Static IP Addresses, you can put those addresses here so users are automatically identified with this location."
 msgstr ""
 
-#: src/templates/admin/locationsKoForm.php:54
+#: src/templates/admin/locationsKoForm.php:62
 msgid "Add IP Address"
 msgstr ""
 
-#: src/templates/admin/locationsKoForm.php:64
+#: src/templates/admin/locationsKoForm.php:72
 msgid "Add Location"
 msgstr ""
 
-#: src/templates/admin/locationsKoForm.php:71
+#: src/templates/admin/locationsKoForm.php:79
 msgid "The Campus"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Location.php b/src/TouchPoint-WP/Location.php
index d0ba0ec6..393c198c 100644
--- a/src/TouchPoint-WP/Location.php
+++ b/src/TouchPoint-WP/Location.php
@@ -132,7 +132,7 @@ public static function validateSetting(string $settings)
 			}
 			$l->lat    = Utilities::toFloatOrNull($l->lat);
 			$l->lng    = Utilities::toFloatOrNull($l->lng);
-			$l->radius = Utilities::toFloatOrNull($l->radius, 1);
+			$l->radius = Utilities::toFloatOrNull($l->radius, 2);
 
 			$l->ipAddresses = array_values(
 				array_filter($l->ipAddresses, fn($ip) => filter_var($ip, FILTER_VALIDATE_IP))
diff --git a/src/templates/admin/locationsKoForm.php b/src/templates/admin/locationsKoForm.php
index 9ce280d3..b6ddc5f1 100644
--- a/src/templates/admin/locationsKoForm.php
+++ b/src/templates/admin/locationsKoForm.php
@@ -38,6 +38,14 @@
                 <input id="location-lng" type="text" data-bind="value: lng, attr: { id: 'location-' + $index() + '-lng'}" />
             </td>
         </tr>
+        <tr>
+            <th>
+                <label for="location-rad" data-bind="attr: { for: 'location-' + $index() + '-rad'}"><?php _e("Radius (miles)", "TouchPoint-WP"); ?></label>
+            </th>
+            <td colspan="2">
+                <input id="location-rad" type="text" data-bind="value: radius, attr: { id: 'location-' + $index() + '-rad'}" />
+            </td>
+        </tr>
         <tr>
             <th>
                 <label for="location-ips" data-bind="attr: { for: 'location-' + $index() + '-ips'}"><?php _e("Static IP Addresses", "TouchPoint-WP"); ?></label>
@@ -71,6 +79,7 @@ function Location(data) {
         this.name = ko.observable(data.name ?? "<?php _e("The Campus", "TouchPoint-WP"); ?>");
         this.lat = ko.observable(data.lat ?? "");
         this.lng = ko.observable(data.lng ?? "");
+        this.radius = ko.observable(data.radius ?? 0.1);
         this.ipAddresses = ko.observableArray(data.ipAddresses ?? []);
 
         this._visible = ko.observable(false);

From a69457cd7cdc7586aae0e40207977013adf6b275 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 10:47:49 -0400
Subject: [PATCH 133/423] Divisions need to be added to the array separately. 
 Closes #193

---
 src/TouchPoint-WP/Involvement.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 7180f6fb..09eed133 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2914,7 +2914,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 	}
 
 	/**
-	 * @param object                       $post  The parent post, which could be a group or Meeting.
+	 * @param \WP_Post|object              $post  The parent post, which could be a group or Meeting.
 	 * @param object                       $inv   The involvement object from the API.
 	 * @param Involvement_PostTypeSettings $typeSets
 	 * @param int                          $imagePostId
@@ -3443,8 +3443,10 @@ public function notableAttributes(array $exclude = []): array
 		}
 		unset($l);
 
-		foreach ($this->getDivisionsLinks() as $a) {
-			$attrs['divisions'] = $a;
+		if (!in_array('divisions', $exclude)) {
+			foreach ($this->getDivisionsLinks() as $k => $a) {
+				$attrs["divisions_$k"] = $a;
+			}
 		}
 
 		if ($this->leaders()->count() > 0) {

From a0dbd691e8bdbfd55a89a73d5e6af982e863f401 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 11:01:43 -0400
Subject: [PATCH 134/423] Raising version requirements.

---
 touchpoint-wp.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 2990212f..91e2d423 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -19,9 +19,9 @@
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+
 Text Domain:        TouchPoint-WP
-Requires at least:  5.5
-Tested up to:       6.2
-Requires PHP:       7.4
+Requires at least:  6.0
+Tested up to:       6.5
+Requires PHP:       8.0
 Release Asset:      true
 */
 

From dcfc884b9a10295d961654d12c1ab608efd43a77 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 11:04:43 -0400
Subject: [PATCH 135/423] i18n updates

---
 i18n/TouchPoint-WP-es_ES.po | 120 +++++++++++++++++-----------------
 i18n/TouchPoint-WP.pot      | 124 ++++++++++++++++++------------------
 2 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index d74f9de2..49ae4857 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -230,67 +230,67 @@ msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
 #: src/TouchPoint-WP/Involvement.php:1841
-#: src/TouchPoint-WP/Partner.php:832
+#: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3453
+#: src/TouchPoint-WP/Involvement.php:3459
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3456
+#: src/TouchPoint-WP/Involvement.php:3462
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3527
+#: src/TouchPoint-WP/Involvement.php:3533
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3586
-#: src/TouchPoint-WP/Involvement.php:3622
+#: src/TouchPoint-WP/Involvement.php:3596
+#: src/TouchPoint-WP/Involvement.php:3632
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3591
+#: src/TouchPoint-WP/Involvement.php:3601
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3595
+#: src/TouchPoint-WP/Involvement.php:3605
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3600
+#: src/TouchPoint-WP/Involvement.php:3610
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3603
+#: src/TouchPoint-WP/Involvement.php:3613
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3616
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3609
+#: src/TouchPoint-WP/Involvement.php:3619
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3617
+#: src/TouchPoint-WP/Involvement.php:3627
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3539
-#: src/TouchPoint-WP/Partner.php:1312
+#: src/TouchPoint-WP/Involvement.php:3545
+#: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:839
+#: src/TouchPoint-WP/Partner.php:841
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1253
+#: src/TouchPoint-WP/Partner.php:1255
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -817,7 +817,7 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1442
+#: src/TouchPoint-WP/Person.php:1446
 #: src/TouchPoint-WP/Utilities.php:251
 #: assets/js/base-defer.js:18
 msgid "and"
@@ -1219,12 +1219,12 @@ msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
 #: src/TouchPoint-WP/Involvement.php:1849
-#: src/TouchPoint-WP/Partner.php:848
+#: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
 #: src/TouchPoint-WP/Involvement.php:1852
-#: src/TouchPoint-WP/Partner.php:851
+#: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
@@ -1234,8 +1234,8 @@ msgstr "restablecer el mapa"
 #: src/TouchPoint-WP/Involvement.php:959
 #: src/TouchPoint-WP/Involvement.php:1034
 #: src/TouchPoint-WP/Involvement.php:1056
-#: src/TouchPoint-WP/Utilities/DateFormats.php:250
-#: src/TouchPoint-WP/Utilities/DateFormats.php:313
+#: src/TouchPoint-WP/Utilities/DateFormats.php:265
+#: src/TouchPoint-WP/Utilities/DateFormats.php:328
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
@@ -1271,7 +1271,7 @@ msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3474
+#: src/TouchPoint-WP/Involvement.php:3480
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1315,8 +1315,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3715
-#: src/TouchPoint-WP/Involvement.php:3812
+#: src/TouchPoint-WP/Involvement.php:3725
+#: src/TouchPoint-WP/Involvement.php:3822
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1448,7 +1448,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1448
+#: src/TouchPoint-WP/Person.php:1452
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1489,8 +1489,8 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3799
-#: src/TouchPoint-WP/Person.php:1815
+#: src/TouchPoint-WP/Involvement.php:3809
+#: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1510,16 +1510,16 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1670
+#: src/TouchPoint-WP/Person.php:1676
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3789
-#: src/TouchPoint-WP/Person.php:1832
+#: src/TouchPoint-WP/Involvement.php:3799
+#: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1602
+#: src/TouchPoint-WP/Person.php:1591
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
@@ -1579,18 +1579,18 @@ msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones dis
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:86
-#: src/TouchPoint-WP/Utilities/DateFormats.php:158
+#: src/TouchPoint-WP/Utilities/DateFormats.php:101
+#: src/TouchPoint-WP/Utilities/DateFormats.php:173
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:88
-#: src/TouchPoint-WP/Utilities/DateFormats.php:160
+#: src/TouchPoint-WP/Utilities/DateFormats.php:103
+#: src/TouchPoint-WP/Utilities/DateFormats.php:175
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:94
-#: src/TouchPoint-WP/Utilities/DateFormats.php:166
+#: src/TouchPoint-WP/Utilities/DateFormats.php:109
+#: src/TouchPoint-WP/Utilities/DateFormats.php:181
 msgid "Tomorrow"
 msgstr "mañana"
 
@@ -1611,36 +1611,36 @@ msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:111
+#: src/TouchPoint-WP/Utilities/DateFormats.php:126
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:117
+#: src/TouchPoint-WP/Utilities/DateFormats.php:132
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:123
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:128
+#: src/TouchPoint-WP/Utilities/DateFormats.php:143
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:149
+#: src/TouchPoint-WP/CalendarGrid.php:150
 msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3551
+#: src/TouchPoint-WP/Involvement.php:3557
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1694,22 +1694,22 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:101
+#: src/TouchPoint-WP/Utilities/DateFormats.php:116
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:102
+#: src/TouchPoint-WP/Utilities/DateFormats.php:117
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:104
+#: src/TouchPoint-WP/Utilities/DateFormats.php:119
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:105
+#: src/TouchPoint-WP/Utilities/DateFormats.php:120
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
@@ -1734,62 +1734,62 @@ msgid "Creating a Meeting object from an object without a post_id is not yet sup
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
 #. translators: %1$s is the start time, %2$s is the end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:56
-#: src/TouchPoint-WP/Utilities/DateFormats.php:292
+#: src/TouchPoint-WP/Utilities/DateFormats.php:71
+#: src/TouchPoint-WP/Utilities/DateFormats.php:307
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+#: src/TouchPoint-WP/Utilities/DateFormats.php:188
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:174
+#: src/TouchPoint-WP/Utilities/DateFormats.php:189
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr "j M"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:176
+#: src/TouchPoint-WP/Utilities/DateFormats.php:191
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:177
+#: src/TouchPoint-WP/Utilities/DateFormats.php:192
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:326
+#: src/TouchPoint-WP/Utilities/DateFormats.php:341
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:183
+#: src/TouchPoint-WP/Utilities/DateFormats.php:198
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:189
+#: src/TouchPoint-WP/Utilities/DateFormats.php:204
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:195
+#: src/TouchPoint-WP/Utilities/DateFormats.php:210
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:200
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:212
+#: src/TouchPoint-WP/CalendarGrid.php:213
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 9b8d2850..54d77df8 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-05-22T21:37:34+00:00\n"
+"POT-Creation-Date: 2024-06-25T14:43:31+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -41,7 +41,7 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:17
 #: src/templates/admin/locationsKoForm.php:13
-#: src/templates/admin/locationsKoForm.php:50
+#: src/templates/admin/locationsKoForm.php:58
 msgid "Delete"
 msgstr ""
 
@@ -265,7 +265,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3474
+#: src/TouchPoint-WP/Involvement.php:3480
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -288,12 +288,12 @@ msgid "Session could not be validated."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:149
+#: src/TouchPoint-WP/CalendarGrid.php:150
 msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:212
+#: src/TouchPoint-WP/CalendarGrid.php:213
 msgid "There are no %s published for this month."
 msgstr ""
 
@@ -330,8 +330,8 @@ msgstr ""
 #: src/TouchPoint-WP/Involvement.php:959
 #: src/TouchPoint-WP/Involvement.php:1034
 #: src/TouchPoint-WP/Involvement.php:1056
-#: src/TouchPoint-WP/Utilities/DateFormats.php:250
-#: src/TouchPoint-WP/Utilities/DateFormats.php:313
+#: src/TouchPoint-WP/Utilities/DateFormats.php:265
+#: src/TouchPoint-WP/Utilities/DateFormats.php:328
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -405,18 +405,18 @@ msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
 #: src/TouchPoint-WP/Involvement.php:1841
-#: src/TouchPoint-WP/Partner.php:832
+#: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
 #: src/TouchPoint-WP/Involvement.php:1849
-#: src/TouchPoint-WP/Partner.php:848
+#: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1852
-#: src/TouchPoint-WP/Partner.php:851
+#: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
@@ -433,74 +433,74 @@ msgstr ""
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3453
+#: src/TouchPoint-WP/Involvement.php:3459
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3456
+#: src/TouchPoint-WP/Involvement.php:3462
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3527
+#: src/TouchPoint-WP/Involvement.php:3533
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3539
-#: src/TouchPoint-WP/Partner.php:1312
+#: src/TouchPoint-WP/Involvement.php:3545
+#: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3551
+#: src/TouchPoint-WP/Involvement.php:3557
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3586
-#: src/TouchPoint-WP/Involvement.php:3622
+#: src/TouchPoint-WP/Involvement.php:3596
+#: src/TouchPoint-WP/Involvement.php:3632
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3591
+#: src/TouchPoint-WP/Involvement.php:3601
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3595
+#: src/TouchPoint-WP/Involvement.php:3605
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3600
+#: src/TouchPoint-WP/Involvement.php:3610
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3603
+#: src/TouchPoint-WP/Involvement.php:3613
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3616
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3609
+#: src/TouchPoint-WP/Involvement.php:3619
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3617
+#: src/TouchPoint-WP/Involvement.php:3627
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3715
-#: src/TouchPoint-WP/Involvement.php:3812
+#: src/TouchPoint-WP/Involvement.php:3725
+#: src/TouchPoint-WP/Involvement.php:3822
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3789
-#: src/TouchPoint-WP/Person.php:1832
+#: src/TouchPoint-WP/Involvement.php:3799
+#: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3799
-#: src/TouchPoint-WP/Person.php:1815
+#: src/TouchPoint-WP/Involvement.php:3809
+#: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -556,11 +556,11 @@ msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:839
+#: src/TouchPoint-WP/Partner.php:841
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1253
+#: src/TouchPoint-WP/Partner.php:1255
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -581,22 +581,22 @@ msgstr ""
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1442
+#: src/TouchPoint-WP/Person.php:1446
 #: src/TouchPoint-WP/Utilities.php:251
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1448
+#: src/TouchPoint-WP/Person.php:1452
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1602
+#: src/TouchPoint-WP/Person.php:1591
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1670
+#: src/TouchPoint-WP/Person.php:1676
 msgid "You may need to sign in."
 msgstr ""
 
@@ -1474,116 +1474,116 @@ msgid "Expand"
 msgstr ""
 
 #. translators: %1$s is the start time, %2$s is the end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:56
-#: src/TouchPoint-WP/Utilities/DateFormats.php:292
+#: src/TouchPoint-WP/Utilities/DateFormats.php:71
+#: src/TouchPoint-WP/Utilities/DateFormats.php:307
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:86
-#: src/TouchPoint-WP/Utilities/DateFormats.php:158
+#: src/TouchPoint-WP/Utilities/DateFormats.php:101
+#: src/TouchPoint-WP/Utilities/DateFormats.php:173
 msgid "Tonight"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:88
-#: src/TouchPoint-WP/Utilities/DateFormats.php:160
+#: src/TouchPoint-WP/Utilities/DateFormats.php:103
+#: src/TouchPoint-WP/Utilities/DateFormats.php:175
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:94
-#: src/TouchPoint-WP/Utilities/DateFormats.php:166
+#: src/TouchPoint-WP/Utilities/DateFormats.php:109
+#: src/TouchPoint-WP/Utilities/DateFormats.php:181
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:101
+#: src/TouchPoint-WP/Utilities/DateFormats.php:116
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:102
+#: src/TouchPoint-WP/Utilities/DateFormats.php:117
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:104
+#: src/TouchPoint-WP/Utilities/DateFormats.php:119
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:105
+#: src/TouchPoint-WP/Utilities/DateFormats.php:120
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:111
+#: src/TouchPoint-WP/Utilities/DateFormats.php:126
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:117
+#: src/TouchPoint-WP/Utilities/DateFormats.php:132
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:123
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:128
+#: src/TouchPoint-WP/Utilities/DateFormats.php:143
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+#: src/TouchPoint-WP/Utilities/DateFormats.php:188
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:174
+#: src/TouchPoint-WP/Utilities/DateFormats.php:189
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:176
+#: src/TouchPoint-WP/Utilities/DateFormats.php:191
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:177
+#: src/TouchPoint-WP/Utilities/DateFormats.php:192
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:183
+#: src/TouchPoint-WP/Utilities/DateFormats.php:198
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:189
+#: src/TouchPoint-WP/Utilities/DateFormats.php:204
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:195
+#: src/TouchPoint-WP/Utilities/DateFormats.php:210
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:200
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:326
+#: src/TouchPoint-WP/Utilities/DateFormats.php:341
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 

From 1a09d6c2eb09f2d6a4a1069d5cdaa601859ad6a6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 11:59:02 -0400
Subject: [PATCH 136/423] Documentation issues

---
 generateDocs.php | 3 +--
 phpdoc.dist.xml  | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/generateDocs.php b/generateDocs.php
index 73cb8df8..670c11ac 100644
--- a/generateDocs.php
+++ b/generateDocs.php
@@ -26,10 +26,9 @@
 
 
 echo "Running PHPDoc Analysis...";
-exec("php " . PHPDOC_PHAR_FILENAME . " run -d src -t docs --template=\"xml\"");
+exec("php " . PHPDOC_PHAR_FILENAME . " -d src -t docs --template=\"xml\"");
 echo "    Complete\n\n";
 
-
 echo "Creating Markdown files...";
 $argv[1] = "docs/structure.xml";
 $argv[2] = "docs/";
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 2cb1ef44..97af9e7d 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -23,11 +23,6 @@
             </markers>
 <!--            <default-package-name>TouchPointWP</default-package-name>-->
         </api>
-        <guide>
-            <source>
-                <path>docs/wpApi</path>
-            </source>
-        </guide>
     </version>
 <!--    <setting name="guides.enabled" value="true"/>-->
 </phpdocumentor>
\ No newline at end of file

From b46dedaa23cb77c51eda6fb8ebacd36d57cdbcd4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 14:19:05 -0400
Subject: [PATCH 137/423] Correcting links in WordPress Hook docs

---
 generateDocs.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/generateDocs.php b/generateDocs.php
index 670c11ac..2fe553a9 100644
--- a/generateDocs.php
+++ b/generateDocs.php
@@ -20,6 +20,14 @@
 echo "    Complete\n\n";
 
 
+echo "Correcting links in WordPress Hooks...";
+$doc = file_get_contents("docs/wp-Api.md");
+$pattern = '/\[(\.[\S-]+)]\(([\S]+)\), \[line (\d+)\]\(([\S-]+)/';
+$replace = "[src/TouchPoint-WP/$2](https://github.com/TenthPres/TouchPoint-WP/blob/master/src/TouchPoint-WP/$2), [line $3](https://github.com/TenthPres/TouchPoint-WP/blob/master/src/TouchPoint-WP/$4\n\n";
+$doc = preg_replace($pattern, $replace, $doc);
+file_put_contents("docs/wp-Api.md", $doc);
+echo "    Complete\n\n";
+
 echo "Removing previous documentation files...";
 array_map('unlink', glob('docs/tp-*.md'));
 echo "    Complete.\n\n";

From 3040905796d2eac9308c97a965e8501f361ebbd1 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 14:33:58 -0400
Subject: [PATCH 138/423] Doc block improvements

---
 src/TouchPoint-WP/EventsCalendar.php             |  8 +++++---
 src/TouchPoint-WP/Involvement.php                | 13 +++++++------
 .../Involvement_PostTypeSettings.php             |  2 +-
 src/TouchPoint-WP/Meeting.php                    |  4 ++--
 src/TouchPoint-WP/Partner.php                    |  8 ++++----
 src/TouchPoint-WP/Person.php                     |  6 +++---
 src/TouchPoint-WP/Rsvp.php                       |  4 ++--
 src/TouchPoint-WP/Taxonomies.php                 |  2 +-
 src/TouchPoint-WP/TouchPointWP.php               |  4 +++-
 src/TouchPoint-WP/TouchPointWP_Settings.php      |  8 ++++----
 src/TouchPoint-WP/Utilities.php                  | 16 ++++++++--------
 src/TouchPoint-WP/Utilities/DateFormats.php      | 10 +++++-----
 12 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 8d150ea9..c2253e1c 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -19,6 +19,7 @@
  * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
  * mobile app.
  *
+ * @since 0.0.90 Deprecated
  * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
  */
 abstract class EventsCalendar implements api, module
@@ -70,8 +71,8 @@ protected static function generateEventsList(array $params = []): array
 			/**
 			 * Allows for manipulation of the html returned to the calendar feature of 2.0 Mobile apps.
 			 *
-			 * @since 0.0.2
-			 *
+			 * @since 0.0.2 Added
+			 * @since 0.0.90 Deprecated
 			 * @depecated 0.0.90 Will be going away with Mobile App version 2.0
 			 *
 			 * @param string $content The html thus far.
@@ -120,7 +121,8 @@ protected static function generateEventsList(array $params = []): array
 				/**
 				 * Insert a CSS file into all event content for mobile 2.0 app.
 				 *
-				 * @since 0.0.3
+				 * @since 0.0.3 Added
+				 * @since 0.0.90 Deprecated
 				 * @depecated 0.0.90 Will be going away with Mobile App version 2.0
 				 *
 				 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 09eed133..f1510f10 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -435,7 +435,7 @@ public static function templateFilter(string $template): string
 		 *
 		 * Default is true.
 		 *
-		 * @since 0.0.6
+		 * @since 0.0.6 Added
 		 *
 		 * @param bool $value The value to return.  True will allow the default templates to be applied.
 		 * @param string $className The name of the class calling for the template.
@@ -614,6 +614,7 @@ public function getRegistrationType(): int
 	/**
 	 * Whether the involvement should link to a registration form, rather than directly joining the org.
 	 *
+	 * @since 0.0.90 Deprecated
 	 * @deprecated 0.0.90  Does not take into account all the possible registration types; will be removed in a future version.
 	 *
 	 * @return bool
@@ -1495,7 +1496,7 @@ public static function listShortcode($params = [], string $content = ""): string
 				 * Determines whether or not to automatically include the plugin-default CSS.  Return false to use your
 				 * own CSS instead.
 				 *
-				 * @since 0.0.15
+				 * @since 0.0.15 Added
 				 *
 				 * @param bool $useCss Whether or not to include the default CSS.  True = include
 				 * @param string $className The name of the current calling class.
@@ -3497,7 +3498,7 @@ public function notableAttributes(array $exclude = []): array
 		 * @see Involvement::notableAttributes()
 		 * @see PostTypeCapable::notableAttributes()
 		 *
-		 * @since 0.0.11
+		 * @since 0.0.11 Added
 		 *
 		 * @param string[] $attrs The list of notable attributes.
 		 * @param Involvement $this The Involvement object.
@@ -3563,7 +3564,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		 * Allows for manipulation of the action buttons for an Involvement.  This is the list of buttons that appear
 		 * on the Involvement to allow the user to interact with it.
 		 *
-		 * @since 0.0.7
+		 * @since 0.0.7 Added
 		 *
 		 * @see Involvement::getActionButtons()
 		 * @see PostTypeCapable::getActionButtons()
@@ -3753,7 +3754,7 @@ protected static function allowContact(string $invType): bool
 		 * Determines whether contact of any kind is allowed.  This is meant to prevent abuse in contact forms by
 		 * removing the ability to contact people and thereby hiding the forms.
 		 *
-		 * @since 0.0.35
+		 * @since 0.0.35 Added
 		 *
 		 * @param bool $allowed True if contact is allowed.
 		 */
@@ -3763,7 +3764,7 @@ protected static function allowContact(string $invType): bool
 		 * Determines whether contact is allowed for any Involvements.  This is called *after* tp_allow_contact, and
 		 * that will set the default.
 		 *
-		 * @since 0.0.35
+		 * @since 0.0.35 Added
 		 *
 		 * @see tp_allow_contact
 		 *
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index 8c3a9c6f..480b0b84 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -85,7 +85,7 @@ final public static function &instance(): array
 			 *
 			 * @see Involvement_PostTypeSettings
 			 *
-			 * @since 0.0.90
+			 * @since 0.0.90 Added
 			 *
 			 * @param Involvement_PostTypeSettings[] $settingsArr An array of the Post Type Settings objects.
 			 */
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 931cc395..92632fb5 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -303,7 +303,7 @@ public function notableAttributes(array $exclude = []): array
 		 * @see Meeting::notableAttributes()
 		 * @see PostTypeCapable::notableAttributes()
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @param string[] $attrs The list of notable attributes.
 		 * @param Meeting $this The Meeting object.
@@ -354,7 +354,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		 * Allows for manipulation of the action buttons for a Meeting.  This is the list of buttons that appear
 		 * on the Meeting to allow the user to interact with it.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @see Meeting::getActionButtons()
 		 * @see PostTypeCapable::getActionButtons()
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index d59e4137..e63bf747 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -565,7 +565,7 @@ public static function templateFilter(string $template): string
 		 *
 		 * Default is true.
 		 *
-		 * @since 0.0.6
+		 * @since 0.0.6 Added
 		 *
 		 * @param bool $value The value to return.  True will allow the default templates to be applied.
 		 * @param string $className The name of the class calling for the template.
@@ -691,7 +691,7 @@ public static function listShortcode($params = [], string $content = ""): string
 				 * Determines whether or not to automatically include the plugin-default CSS.  Return false to use your
 				 * own CSS instead.
 				 *
-				 * @since 0.0.15
+				 * @since 0.0.15 Added
 				 *
 				 * @param bool $useCss Whether or not to include the default CSS.  True = include
 				 * @param string $className The name of the current calling class.
@@ -1264,7 +1264,7 @@ public function notableAttributes(array $exclude = []): array
 		 * @see Partner::notableAttributes()
 		 * @see PostTypeCapable::notableAttributes()
 		 *
-		 * @since 0.0.6
+		 * @since 0.0.6 Added
 		 *
 		 * @param string[] $attrs The list of notable attributes.
 		 * @param Partner $this The Partner object.
@@ -1319,7 +1319,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		 * Allows for manipulation of the action buttons for a Partner.  This is the list of buttons that appear
 		 * on the Partner to allow the user to interact with it.
 		 *
-		 * @since 0.0.7
+		 * @since 0.0.7 Added
 		 *
 		 * @see Partner::getActionButtons()
 		 * @see PostTypeCapable::getActionButtons()
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index de49c650..ff14488a 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1202,7 +1202,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		 * Allows for manipulation of the action buttons for a Person.  This is the list of buttons that appear
 		 * on the Person to allow the user to interact with them.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @see Person::getActionButtons()
 		 *
@@ -1785,7 +1785,7 @@ protected static function allowContact(): bool
 		 * Determines whether contact of any kind is allowed.  This is meant to prevent abuse in contact forms by
 		 * removing the ability to contact people and thereby hiding the forms.
 		 *
-		 * @since 0.0.35
+		 * @since 0.0.35 Added
 		 *
 		 * @param bool $allowed True if contact is allowed.
 		 */
@@ -1795,7 +1795,7 @@ protected static function allowContact(): bool
 		 * Determines whether contact is allowed for any People.  This is called *after* tp_allow_contact, and
 		 * that will set the default.
 		 *
-		 * @since 0.0.35
+		 * @since 0.0.35 Added
 		 *
 		 * @see tp_allow_contact
 		 *
diff --git a/src/TouchPoint-WP/Rsvp.php b/src/TouchPoint-WP/Rsvp.php
index 1b1fe9f8..184f01b8 100644
--- a/src/TouchPoint-WP/Rsvp.php
+++ b/src/TouchPoint-WP/Rsvp.php
@@ -5,7 +5,7 @@
 
 namespace tp\TouchPointWP;
 
-// TODO sort out what goes here, and what goes in Meetings.
+// TODO sort out what goes here, and what goes in Meetings.  Answer: all of this should go to Meetings.
 
 if ( ! defined('ABSPATH')) {
 	exit(1);
@@ -14,7 +14,7 @@
 /**
  * This class provides the RSVP functionality for Meetings.
  *
- * @deprecated  0.0.90
+ * @deprecated  0.0.90  TODO is this true?
  */
 abstract class Rsvp implements module
 {
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index fdba6804..12f79cd2 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -175,7 +175,7 @@ public static function insertTermsForLookupBasedTaxonomy(array $list, string $ta
 	 *
 	 * @return ?int
 	 *
-	 * @since 0.0.32
+	 * @since 0.0.32 Added
 	 */
 	public static function getTaxTermId(string $taxonomy, $value): ?int
 	{
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 7a9bc19c..05b572ef 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -269,7 +269,7 @@ public static function cronAdd15Minutes($schedules)
 	 * @param string|mixed $text The text to be modified. (should be a string, but this is WordPress, so maybe not.)
 	 *
 	 * @return string The modified text.
-	 * @since 0.0.23
+	 * @since 0.0.23 Added
 	 *
 	 */
 	public static function capitalPyScript(mixed $text): string
@@ -1341,6 +1341,7 @@ private function logVersion(): void
 	 *
 	 * @return bool
 	 *
+	 * @since 0.0.90 Deprecated
 	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendarPro(): bool
@@ -1357,6 +1358,7 @@ public static function useTribeCalendarPro(): bool
 	 *
 	 * @return bool
 	 *
+	 * @since 0.0.90 Deprecated
 	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
 	 */
 	public static function useTribeCalendar(): bool
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 313c74d1..a1bf699b 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -143,7 +143,7 @@ public function __construct(TouchPointWP $parent)
 	 * @param ?TouchPointWP $parent Object instance.
 	 *
 	 * @return TouchPointWP_Settings instance
-	 * @since 0.0.90
+	 * @since 0.0.90 Added
 	 * @static
 	 * @see TouchPointWP()
 	 */
@@ -1226,7 +1226,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 		/**
 		 * Adjust the settings array before it's returned.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 */
 		$this->settings = apply_filters('tp_settings_fields', $this->settings);
 
@@ -1857,7 +1857,7 @@ protected function validation_updateScriptsIfChanged(mixed $new, string $field):
 	/**
 	 * Cloning is forbidden.
 	 *
-	 * @since 0.0.90
+	 * @since 0.0.90 Added
 	 */
 	public function __clone()
 	{
@@ -1871,7 +1871,7 @@ public function __clone()
 	/**
 	 * Unserializing instances of this class is forbidden.
 	 *
-	 * @since 0.0.90
+	 * @since 0.0.90 Added
 	 */
 	public function __wakeup()
 	{
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 07656926..55098701 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -321,7 +321,7 @@ public static function getColorFor(string $itemName, string $setName): string
 		/**
 		 * Allows for a custom color function to assign a color for a given value.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @param mixed $current The current value.  Null is provided to the function because the color hasn't otherwise been determined yet.
 		 * @param string $itemName The name of the current item.
@@ -353,7 +353,7 @@ public static function getColorFor(string $itemName, string $setName): string
 		 * deterministic which color will be assigned to which item.  If it needs to be, use the `tp_custom_color_function`
 		 * filter instead.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @param string[] $array The array of colors in hex format, starting with '#'.
 		 * @param string $setName The name of the set for which the colors are needed.
@@ -486,7 +486,7 @@ public static function getAllHeaders(): array
 	 * @param string      $title
 	 *
 	 * @return int|string The attachmentId for the image.  Can be reused for other posts.
-	 * @since 0.0.24
+	 * @since 0.0.24 Added
 	 */
 	public static function updatePostImageFromUrl(int $postId, ?string $newUrl, string $title)
 	{
@@ -616,7 +616,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		 * Allows for the standardization of HTML content, typically during the import from TouchPoint.  If this
 		 * filter is used, the default filtering will be bypassed. Use other filters for more precise control.
 		 *
-		 * @since 0.0.34
+		 * @since 0.0.34 Added
 		 *
 		 * @param string $html The HTML to be standardized.
 		 * @param string $context A context string to pass to hooks.
@@ -631,7 +631,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		/**
 		 * Make any adjustments to HTML content before the rest of the standardization process happens.
 		 *
-		 * @since 0.0.25
+		 * @since 0.0.25 Added
 		 *
 		 * @param string $html The HTML to be standardized.
 		 * @param string $context A context string to pass to hooks.
@@ -644,7 +644,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		/**
 		 * The maximum header level to allow in an HTML string.  Default is 2.
 		 *
-		 * @since 0.0.25
+		 * @since 0.0.25 Added
 		 *
 		 * @param int    $maxHeader The highest header level (lowest number) to allow in the HTML. (e.g. 2 for <h2> tags)
 		 * @param string $context A context string to pass to hooks.
@@ -662,7 +662,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		/**
 		 * The allowed tags in the HTML standardization process.  Default is a set of common tags, but tags such as script, style, img, and others are stripped.
 		 *
-		 * @since 0.0.25
+		 * @since 0.0.25 Added
 		 *
 		 * @param string[] $allowedTags The allowed tags in the HTML.
 		 * @param string   $context A context string to pass to hooks.
@@ -678,7 +678,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		/**
 		 * Make any adjustments to HTML content after the rest of the standardization process happens.
 		 *
-		 * @since 0.0.25
+		 * @since 0.0.25 Added
 		 *
 		 * @param string $html The HTML to be standardized.
 		 * @param string $context A context string to pass to hooks.
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 3d256a65..318431e3 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -27,7 +27,7 @@ public static function TimeStringFormatted(DateTimeInterface $dt): string
 		/**
 		 * Allows for manipulation of the string returned as a formatted time.
 		 *
-		 * @since 0.0.34
+		 * @since 0.0.34 Added
 		 *
 		 * @param string $ts The string, as formatted so far.
 		 * @param DateTimeInterface $dt The DateTimeInterface object for the time being formatted.
@@ -40,7 +40,7 @@ public static function TimeStringFormatted(DateTimeInterface $dt): string
 	 *
 	 * @return int
 	 *
-	 * @since 0.0.90
+	 * @since 0.0.90 added
 	 */
 	public static function timestampAndOffset(?DateTimeInterface $dt): int
 	{
@@ -74,7 +74,7 @@ public static function TimeRangeStringFormatted(DateTimeInterface $startDt, Date
 		 * Allows for manipulation of a time range string.  For example, combined with `tp_adjust_time_string`, you
 		 * can change a range of 1:00pm - 2:00pm to 1-2pm.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @param string            $ts The string, as formatted so far.
 		 * @param string            $startStr The start string, with default formatting.
@@ -148,7 +148,7 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 		/**
 		 * Allows for manipulation of the string returned as a formatted date.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @param string $r The string, as formatted so far.
 		 * @param DateTimeInterface $dt The DateTimeInterface object for the date being formatted.
@@ -220,7 +220,7 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 		/**
 		 * Allows for manipulation of the string returned as a (short) formatted date.
 		 *
-		 * @since 0.0.90
+		 * @since 0.0.90 Added
 		 *
 		 * @param string $r The string, as formatted so far.
 		 * @param DateTimeInterface $dt The DateTimeInterface object for the date being formatted.

From 21b509138064f96478bca8c33c813144f6611437 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 14:36:40 -0400
Subject: [PATCH 139/423] Docs update

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 0825550d..6de28f71 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 0825550d5c2b840783878236156093c6318a53d0
+Subproject commit 6de28f7178daa3410ea018c0042f1343d3d1ee4b

From 761d5f5db746aa53effac82b67a8c63b7eeed1ab Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 22:22:19 -0400
Subject: [PATCH 140/423] Adding app 2.0 API for Meeting-based calendar.

---
 docs                                        |   2 +-
 src/TouchPoint-WP/EventsCalendar.php        | 269 +++++++++++++++++++-
 src/TouchPoint-WP/Meeting.php               |  45 +++-
 src/TouchPoint-WP/TouchPointWP.php          |  22 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php |  31 ++-
 5 files changed, 357 insertions(+), 12 deletions(-)

diff --git a/docs b/docs
index 6de28f71..f6648ddf 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 6de28f7178daa3410ea018c0042f1343d3d1ee4b
+Subproject commit f6648ddff2de964a64d525c682b39dd358dca70e
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index c2253e1c..9a168da8 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -10,6 +10,7 @@
 }
 
 use WP_Post;
+use WP_Query;
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once 'api.php';
@@ -19,13 +20,30 @@
  * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
  * mobile app.
  *
- * @since 0.0.90 Deprecated
+ * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
  * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
  */
 abstract class EventsCalendar implements api, module
 {
+	/**
+	 * @param array $params
+	 *
+	 * @return array
+	 *
+	 * @since 0.0.2 Added
+	 * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
+	 */
 	protected static function generateEventsList(array $params = []): array
 	{
+		if (TouchPointWP::instance()->settings->ec_app_cal_provider === 'meetings') {
+			return self::generateEventsListFromMeetings($params);
+		}
+
+		if (!function_exists('tribe_get_events')) {
+			return [];
+		}
+
 		$eventsList = [];
 
 		$params = array_merge(
@@ -73,7 +91,7 @@ protected static function generateEventsList(array $params = []): array
 			 *
 			 * @since 0.0.2 Added
 			 * @since 0.0.90 Deprecated
-			 * @depecated 0.0.90 Will be going away with Mobile App version 2.0
+			 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
 			 *
 			 * @param string $content The html thus far.
 			 */
@@ -123,7 +141,7 @@ protected static function generateEventsList(array $params = []): array
 				 *
 				 * @since 0.0.3 Added
 				 * @since 0.0.90 Deprecated
-				 * @depecated 0.0.90 Will be going away with Mobile App version 2.0
+				 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
 				 *
 				 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
 				 */
@@ -170,10 +188,227 @@ protected static function generateEventsList(array $params = []): array
 		return $eventsList;
 	}
 
+	/**
+	 * @param array $params
+	 *
+	 * @return array
+	 *
+	 * @since 0.0.90 Added and Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
+	 * @depreacted
+	 */
+	protected static function generateEventsListFromMeetings(array $params = []): array
+	{
+		$eventsList = [];
+
+		$tpDomain = TouchPointWP::instance()->settings->host;
+		$dlDomain = TouchPointWP::instance()->settings->host_deeplink;
+
+		$q = new WP_Query();
+
+		$existingMq = $q->get('meta_query');
+
+		$now = Utilities::dateTimeNow();
+
+		$mq = [
+			[
+				[
+					'key' => Meeting::MEETING_END_META_KEY,
+					'value' => $now->format('U'),
+					'compare' => ">="
+				],
+				[ // This condition is to allow for the possibility of events without end times.
+					[
+						'key' => Meeting::MEETING_END_META_KEY,
+						'compare' => '=',
+						'value' => 0
+					],
+					[
+						'key' => Meeting::MEETING_START_META_KEY,
+						'value' => $now->format('U'),
+						'compare' => ">"
+					],
+					'relation' => 'AND'
+				],
+				'relation' => 'OR'
+			],
+			[
+				'key' => Meeting::MEETING_META_KEY,
+				'value' => 0,
+				'compare' => ">"
+			],
+			'relation' => 'AND'
+		];
+
+		if (!empty($existingMq)) {
+			$mq = [
+				'relation' => 'AND',
+				$existingMq,
+				$mq,
+			];
+		}
+
+		$q->set('meta_query', $mq);
+
+		$q->set('meta_key', Meeting::MEETING_START_META_KEY);
+		$q->set('orderby', 'meta_value');
+		$q->set('order', 'ASC');
+		$q->set('posts_per_page', 200);
+
+		$q->set('post_type', Involvement_PostTypeSettings::getPostTypes());
+
+		$iids = [];
+		$count = 0;
+
+		foreach ($q->get_posts() as $eQ) {
+			/** @var WP_Post $eQ */
+			global $post;
+			$post = $eQ;
+
+			try {
+				$e = Meeting::fromPost($eQ);
+			} catch (TouchPointWP_Exception) {
+				continue;
+			}
+
+			$iid = $e->involvementId();
+			if (in_array($iid, $iids)) {
+				continue;
+			}
+			$iids[] = $iid;
+
+			$eO = [];
+
+			$locationContent = [];
+			$separator = " • ";
+
+			$location = $e->locationName();
+			if ($location !== '' && $location !== null) {
+				$locationContent[] = $location;
+			}
+//			$sstring = $e->scheduleString($separator);
+//			if ($sstring) {
+//				$locationContent[] = html_entity_decode($sstring);
+//			}
+			if ($e->isMultiDay()) {
+				$locationContent[] = __("Multi-Day", "TouchPoint-WP");
+			}
+			$locationContent = implode($separator, $locationContent);
+
+			$content = trim(get_the_content(null, true, $eQ->ID));
+			$content = apply_filters('the_content', $content);
+			/**
+			 * Allows for manipulation of the html returned to the calendar feature of 2.0 Mobile apps.
+			 *
+			 * @param string $content The html thus far.
+			 *
+			 * @since 0.0.90 Deprecated
+			 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
+			 *
+			 * @since 0.0.2 Added
+			 */
+			$content = apply_filters('tp_app_events_content', $content);
+
+			$content = html_entity_decode($content);
+
+			// Add Header and footer Scripts, etc.
+			if ($content !== '') {
+				ob_start();
+				do_action('wp_print_styles');
+				do_action('wp_print_head_scripts');
+				$content = ob_get_clean() . $content;
+
+				ob_start();
+				do_action('wp_print_footer_scripts');
+				do_action('wp_print_scripts');
+				$content .= ob_get_clean();
+			}
+
+			// Add domain to relative links
+			$content = preg_replace(
+				"/['\"]\/([^\/\"']*)[\"']/i",
+				'"' . get_home_url() . '/$1"',
+				$content
+			);
+
+			// Replace TouchPoint links with deeplinks where applicable
+			// Registration Links
+			if ($tpDomain !== '' && $dlDomain !== '') {
+				$content = preg_replace(
+					"/:\/\/$tpDomain\/OnlineReg\/([\d]+)/i",
+					"://" . $dlDomain . '/registrations/register/${1}?from={{MOBILE_OS}}',
+					$content
+				);
+			}
+
+			if ($content !== '') {
+				$cssUrl = null;
+				if (TouchPointWP::instance()->settings->ec_use_standardizing_style === 'on') {
+					$cssUrl = TouchPointWP::instance(
+						)->assets_url . 'template/ec-standardizing-style.css?v=' . TouchPointWP::VERSION;
+				}
+
+				/**
+				 * Insert a CSS file into all event content for mobile 2.0 app.
+				 *
+				 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
+				 *
+				 * @since 0.0.90 Deprecated
+				 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
+				 *
+				 * @since 0.0.3 Added
+				 */
+				$cssUrl = apply_filters('tp_app_events_css_url', $cssUrl);
+				if (is_string($cssUrl)) {
+					$content = "<link rel=\"stylesheet\" href=\"$cssUrl\">" . $content;
+				}
+			}
+
+			// Not needed for apps, but helpful for diagnostics
+			$eO['ID'] = $eQ->ID;
+			$eO['IID'] = $iid;
+
+			// Android (apparently not used on iOS?)
+			$eO['all_day'] = $e->isAllDay();
+
+			// Android
+			$eO['image'] = get_the_post_thumbnail_url($eQ->ID, 'large');
+			// iOS
+			$eO['RelatedImageFileKey'] = $eO['image'];
+
+			// iOS
+			$eO['Description'] = str_replace("{{MOBILE_OS}}", "iOS", $content);
+			// Android
+			$eO['content'] = str_replace("{{MOBILE_OS}}", "android", $content);
+
+			// iOS
+			$eO['Subject'] = $eQ->post_title;
+			// Android
+			$eO['title'] = $eQ->post_title;
+
+			// iOS
+			$eO['StartDateTime'] = $e->startDt->format('c');
+			// Android
+			$eO['start_date'] = $eO['StartDateTime'];
+
+			// iOS
+			$eO['Location'] = $locationContent;
+			// Android
+			$eO['room'] = $locationContent;
+
+			$eventsList[] = $eO;
+		}
+
+		return $eventsList;
+	}
+
 	/**
 	 * Print json for Events Calendar for Mobile app.
 	 *
 	 * @param array $params Parameters from the request to use for filtering or such.
+	 *
+	 * @since 0.0.2 Added
+	 * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
 	 */
 	protected static function echoAppList(array $params = []): void
 	{
@@ -188,6 +423,11 @@ protected static function echoAppList(array $params = []): void
 	 * Generate previews of the HTML generated for the App Events Calendar
 	 *
 	 * This is wildly inefficient since each iframe will calculate the full list.
+	 *
+	 * @param array $params Parameters from the request to use for filtering or such.
+	 * @since 0.0.90 Added
+	 * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
 	 */
 	protected static function previewAppList(array $params = []): void
 	{
@@ -202,6 +442,18 @@ protected static function previewAppList(array $params = []): void
 		}
 	}
 
+	/**
+	 * Generate previews of the HTML generated for one item on the 2.0 app events calendar.
+	 *
+	 * This is wildly inefficient since each iframe will calculate the full list.
+	 *
+	 * @param array $params Parameters from the request to use for filtering or such.
+	 * @param int $item The item to preview
+	 *
+	 * @since 0.0.90 Added
+	 * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
+	 */
 	protected static function previewAppListItem(array $params = [], int $item = 0): void
 	{
 		$eventsList = self::generateEventsList($params);
@@ -209,6 +461,17 @@ protected static function previewAppListItem(array $params = [], int $item = 0):
 		echo $eventsList[$item]['content'];
 	}
 
+	/**
+	 * Handle API requests
+	 *
+	 * @param array $uri The request URI already parsed by parse_url()
+	 *
+	 * @return bool False if endpoint is not found.  Should print the result.
+	 *
+	 * @since 0.0.2 Added
+	 * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
+	 * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
+	 */
 	public static function api(array $uri): bool
 	{
 		if (count($uri['path']) === 2) {
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 92632fb5..a1b7cb5e 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -242,6 +242,18 @@ public static function fromPost(WP_Post $post): Meeting
 		return self::$_instances[$mid];
 	}
 
+	/**
+	 * Get the involvement ID (without necessarily instantiating the Involvement)
+	 *
+	 * @since 0.0.90 Added
+	 *
+	 * @return int
+	 */
+	public function involvementId(): int
+	{
+		return intval(get_post_meta($this->post_id, self::MEETING_INV_ID_META_KEY, true));
+	}
+
 	/**
 	 * Get the Involvement object associated with this Meeting.
 	 *
@@ -259,6 +271,37 @@ public function involvement(): Involvement
 		throw new TouchPointWP_Exception("Meeting is not associated with an Involvement.", 171002);
 	}
 
+	/**
+	 * Get the human-readable schedule for the meeting as a string.  If multiple elements exist, they will be joined by
+	 * $join.  Returns null if the schedule string is unavailable for some reason.
+	 *
+	 * @param string $join
+	 *
+	 * @return ?string
+	 *
+	 * @since 0.0.90 Added
+	 */
+	public function scheduleString(string $join): ?string
+	{
+		$ss = $this->scheduleStringArray();
+		if (count($ss) > 0) {
+			return implode($join, $ss);
+		}
+		return null;
+	}
+
+	/**
+	 * Get the human-readable schedule for the meeting as a string or set of strings in an array.
+	 *
+	 * @return array
+	 *
+	 * @since 0.0.90 Added
+	 */
+	public function scheduleStringArray(): array
+	{
+		return DateFormats::DurationToStringArray($this->startDt, $this->endDt, $this->isMultiDay(), $this->isAllDay());
+	}
+
 
 	/**
 	 * Get notable attributes, such as gender restrictions, as strings.
@@ -279,7 +322,7 @@ public function notableAttributes(array $exclude = []): array
 			}
 		}
 
-		$d = DateFormats::DurationToStringArray($this->startDt, $this->endDt, $this->isMultiDay(), $this->isAllDay());
+		$d = $this->scheduleStringArray();
 
 		$attrs = [...$d, ...$attrs];
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 05b572ef..e1009b87 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -426,7 +426,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 
 			// App Events Endpoint
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_APP_EVENTS &&
-				TouchPointWP::useTribeCalendar()
+				TouchPointWP::useTribeOrMeetingCalendars()
 			) {
 				if ( ! EventsCalendar::api($reqUri)) {
 					return $continue;
@@ -717,8 +717,8 @@ public static function load($file): TouchPointWP
 		}
 
 		// Load Tribe module if enabled (by presence of Events Calendar plugin)
-		if (self::useTribeCalendar()
-			&& ! class_exists("tp\TouchPointWP\EventsCalendar")) {
+		if (self::useTribeOrMeetingCalendars()
+			&& !class_exists("tp\TouchPointWP\EventsCalendar")) {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 				require_once 'EventsCalendar.php';
 			}
@@ -1353,6 +1353,7 @@ public static function useTribeCalendarPro(): bool
 		return is_plugin_active('events-calendar-pro/events-calendar-pro.php');
 	}
 
+
 	/**
 	 * Indicates that Tribe Calendar is enabled.
 	 *
@@ -1366,6 +1367,21 @@ public static function useTribeCalendar(): bool
 		return self::useTribeCalendarPro() || is_plugin_active('the-events-calendar/the-events-calendar.php');
 	}
 
+
+	/**
+	 * Indicates that a calendar function is available, especially for the 2.0 mobile app option.
+	 *
+	 * @return bool
+	 *
+	 * @since 0.0.90 Added & Deprecated.  Will be removed once version 2.0 of the mobile app is fully retired.
+	 * @deprecated 0.0.90. Will be removed once version 2.0 of the mobile app is fully retired.
+	 */
+	public static function useTribeOrMeetingCalendars(): bool
+	{
+		return self::useTribeCalendar() || get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_meeting_cal') === "on";
+	}
+
+
 	/**
 	 * Sort a list of hierarchical terms into a list in which each parent is immediately followed by its children.
 	 *
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index a1bf699b..045005a1 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -66,6 +66,7 @@
  *
  * @property-read string       locations_json     JSON string describing fixed locations.
  *
+ * @property-read string       ec_app_cal_provider The provider of the calendar data for the mobile app. Either "meetings" or "tribe".
  * @property-read string       ec_use_standardizing_style Whether to insert the standardizing stylesheet into mobile app requests.
  *
  * @property-read string       mc_name_plural     What Meetings should be called, plural (e.g. "Events" or "Meetings")
@@ -759,18 +760,40 @@ private function settingsFields(bool|string $includeDetail = false): array
 			];
 		}
 
-		if (TouchPointWP::useTribeCalendar()) {
+		if (TouchPointWP::useTribeOrMeetingCalendars()) {
+			$options = [];
+			$default = '';
+			if (TouchPointWP::useTribeCalendar()) {
+				$options['tribe'] = __('Events Calendar plugin by Modern Tribe', 'TouchPoint-WP');
+				$default = 'tribe';
+			}
+			if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_meeting_cal') === "on") {
+				$options['meetings'] = __('TouchPoint Meetings', 'TouchPoint-WP');
+				$default = 'meetings';
+			}
+
 			/** @noinspection HtmlUnknownTarget */
 			$this->settings['events_calendar'] = [
-				'title'       => __('Events Calendar', 'TouchPoint-WP'),
-				'description' => __('Integrate with The Events Calendar from ModernTribe.', 'TouchPoint-WP'),
+				'title'       => __('App 2.0 Calendar', 'TouchPoint-WP'),
+				'description' => __('Integrate Custom Mobile app version 2.0 with The Events Calendar from ModernTribe.', 'TouchPoint-WP'),
 				'fields'      => [
+					[
+						'id'          => 'ec_app_cal_provider',
+						'label'       => __('Events Provider', 'TouchPoint-WP'),
+						'description' => __(
+							'The source of events for version 2.0 of the Custom Mobile App.',
+							'TouchPoint-WP'
+						),
+						'type'        => 'select',
+						'options'     => $options,
+						'default'     => $default,
+					],
 					[
 						'id'          => 'ec_app_cal_url',
 						'label'       => __('Events for Custom Mobile App', 'TouchPoint-WP'),
 						'type'        => 'instructions',
 						'description' => strtr(
-							'<p>' . __('To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:', 'TouchPoint-WP') . '</p>' .
+							'<p>' . __("To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:", 'TouchPoint-WP') . '</p>' .
 							'<input type="url" value="{apiUrl}" readonly style="width: 100%;" />' .
 							'<a href="{previewUrl}" class="btn">' . __('Preview', 'TouchPoint-WP') . '</a>',
 							[

From 206cfa6b9c9719d4128282886337a533b758c7c4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 22:38:40 -0400
Subject: [PATCH 141/423] i18n for revised mobile app 2.0 calendar

---
 README.md                                   |   2 +-
 i18n/TouchPoint-WP-es_ES.po                 | 501 ++++++++++----------
 i18n/TouchPoint-WP.pot                      | 491 ++++++++++---------
 src/TouchPoint-WP/EventsCalendar.php        |   2 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php |   2 +-
 5 files changed, 516 insertions(+), 482 deletions(-)

diff --git a/README.md b/README.md
index 1c0c63fa..fad7fd02 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ appropriate care for their security.
 
 ### Events
 Improve display of events in the TouchPoint Custom Mobile App by providing content from [The Events Calendar Plugin by
-ModernTribe](https://theeventscalendar.com/).  This is compatible with both the free and "Pro" versions.
+Modern Tribe](https://theeventscalendar.com/).  This is compatible with both the free and "Pro" versions.
 
 ### Authentication (Beta)
 Authenticate TouchPoint users to WordPress, so you can know your website users. 
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 49ae4857..0a5ea7a2 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:944
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:551
+#: src/TouchPoint-WP/Meeting.php:594
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1758
+#: src/TouchPoint-WP/Involvement.php:1759
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1784
+#: src/TouchPoint-WP/Involvement.php:1785
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +173,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2004
+#: src/TouchPoint-WP/Involvement.php:2005
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -199,11 +199,12 @@ msgstr "Su token de inicio de sesión no es válido."
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
-#: src/TouchPoint-WP/EventsCalendar.php:61
+#: src/TouchPoint-WP/EventsCalendar.php:80
 msgid "Recurring"
 msgstr "Periódico"
 
-#: src/TouchPoint-WP/EventsCalendar.php:64
+#: src/TouchPoint-WP/EventsCalendar.php:83
+#: src/TouchPoint-WP/EventsCalendar.php:293
 msgid "Multi-Day"
 msgstr "varios días"
 
@@ -223,64 +224,64 @@ msgstr "Registro aún no abierto"
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1633
+#: src/TouchPoint-WP/Involvement.php:1634
 #: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1841
+#: src/TouchPoint-WP/Involvement.php:1842
 #: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3459
+#: src/TouchPoint-WP/Involvement.php:3460
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3462
+#: src/TouchPoint-WP/Involvement.php:3463
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3533
+#: src/TouchPoint-WP/Involvement.php:3534
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3596
-#: src/TouchPoint-WP/Involvement.php:3632
+#: src/TouchPoint-WP/Involvement.php:3597
+#: src/TouchPoint-WP/Involvement.php:3633
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3601
+#: src/TouchPoint-WP/Involvement.php:3602
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3605
+#: src/TouchPoint-WP/Involvement.php:3606
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3610
+#: src/TouchPoint-WP/Involvement.php:3611
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3613
+#: src/TouchPoint-WP/Involvement.php:3614
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3616
+#: src/TouchPoint-WP/Involvement.php:3617
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3619
+#: src/TouchPoint-WP/Involvement.php:3620
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3627
+#: src/TouchPoint-WP/Involvement.php:3628
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3545
+#: src/TouchPoint-WP/Involvement.php:3546
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -306,514 +307,502 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:550
+#: src/TouchPoint-WP/Meeting.php:593
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1928
+#: src/TouchPoint-WP/TouchPointWP.php:1946
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1985
+#: src/TouchPoint-WP/TouchPointWP.php:2003
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1988
+#: src/TouchPoint-WP/TouchPointWP.php:2006
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1991
+#: src/TouchPoint-WP/TouchPointWP.php:2009
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1996
-#: src/TouchPoint-WP/TouchPointWP.php:1997
+#: src/TouchPoint-WP/TouchPointWP.php:2014
+#: src/TouchPoint-WP/TouchPointWP.php:2015
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2114
-#: src/TouchPoint-WP/TouchPointWP.php:2150
+#: src/TouchPoint-WP/TouchPointWP.php:2132
+#: src/TouchPoint-WP/TouchPointWP.php:2168
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2164
-#: src/TouchPoint-WP/TouchPointWP.php:2208
+#: src/TouchPoint-WP/TouchPointWP.php:2182
+#: src/TouchPoint-WP/TouchPointWP.php:2226
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2340
+#: src/TouchPoint-WP/TouchPointWP.php:2358
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:254
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:256
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:261
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:271
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:273
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:279
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:281
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:301
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:303
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:312
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:314
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:334
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:336
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:345
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:347
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:358
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:370
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:382
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:384
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:395
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:397
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:407
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:409
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:419
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:421
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:438
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:459
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:461
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:476
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:478
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:487
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:498
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:736
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:515
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:517
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:530
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:532
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:550
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:552
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:559
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:572
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:574
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:578
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:579
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:608
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:610
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:615
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:624
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:626
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:637
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:646
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:648
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:657
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:659
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:670
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:681
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:692
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:694
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:703
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:705
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:714
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:716
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:725
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:727
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:738
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:748
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:765
-msgid "Events Calendar"
-msgstr "Calendario de eventos"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:766
-msgid "Integrate with The Events Calendar from ModernTribe."
-msgstr "Integre con el calendario de eventos de ModernTribe."
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:793
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
-msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
-msgstr "Para usar los eventos de su calendario de eventos en la aplicación móvil personalizada, configure el proveedor en <code>Wordpress Plugin - Modern Tribe</code> y use esta URL:"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:798
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:790
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:902
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:903
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:926
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:943
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1027
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1016
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1017
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1040
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1046
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1069
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1073
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1086
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1075
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1251
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1274
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1305
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1306
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1328
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1329
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1377
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1586
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1609
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1708
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1731
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1759
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1782
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -981,7 +970,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2281
+#: src/TouchPoint-WP/TouchPointWP.php:2299
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1036,16 +1025,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1806
+#: src/TouchPoint-WP/Involvement.php:1807
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1819
+#: src/TouchPoint-WP/Involvement.php:1820
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1690
+#: src/TouchPoint-WP/Involvement.php:1691
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1163,12 +1152,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:994
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1000
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:972
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:995
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1207,76 +1196,76 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1807
+#: src/TouchPoint-WP/Involvement.php:1808
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1808
+#: src/TouchPoint-WP/Involvement.php:1809
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1849
+#: src/TouchPoint-WP/Involvement.php:1850
 #: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1852
+#: src/TouchPoint-WP/Involvement.php:1853
 #: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:930
-#: src/TouchPoint-WP/Involvement.php:959
-#: src/TouchPoint-WP/Involvement.php:1034
-#: src/TouchPoint-WP/Involvement.php:1056
+#: src/TouchPoint-WP/Involvement.php:931
+#: src/TouchPoint-WP/Involvement.php:960
+#: src/TouchPoint-WP/Involvement.php:1035
+#: src/TouchPoint-WP/Involvement.php:1057
 #: src/TouchPoint-WP/Utilities/DateFormats.php:265
 #: src/TouchPoint-WP/Utilities/DateFormats.php:328
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:968
+#: src/TouchPoint-WP/Involvement.php:969
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:975
+#: src/TouchPoint-WP/Involvement.php:976
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:985
+#: src/TouchPoint-WP/Involvement.php:986
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:991
+#: src/TouchPoint-WP/Involvement.php:992
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1000
+#: src/TouchPoint-WP/Involvement.php:1001
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1006
+#: src/TouchPoint-WP/Involvement.php:1007
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3480
+#: src/TouchPoint-WP/Involvement.php:3481
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:372
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1288,39 +1277,39 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1945
+#: src/TouchPoint-WP/Involvement.php:1946
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1955
+#: src/TouchPoint-WP/Involvement.php:1956
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1974
+#: src/TouchPoint-WP/Involvement.php:1975
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:483
+#: src/TouchPoint-WP/Meeting.php:526
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:511
+#: src/TouchPoint-WP/Meeting.php:554
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:521
+#: src/TouchPoint-WP/Meeting.php:564
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3725
-#: src/TouchPoint-WP/Involvement.php:3822
+#: src/TouchPoint-WP/Involvement.php:3726
+#: src/TouchPoint-WP/Involvement.php:3823
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:323
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1385,7 +1374,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:325
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1436,7 +1425,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1733
+#: src/TouchPoint-WP/Involvement.php:1734
 msgid "Language"
 msgstr "Idioma"
 
@@ -1453,11 +1442,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:827
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1465,44 +1454,44 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:884
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Meeting Deletion Handling"
 msgstr "Manejo de eliminación de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:891
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:914
 msgid "Always delete from WordPress"
 msgstr "Eliminar siempre de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:915
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3809
+#: src/TouchPoint-WP/Involvement.php:3810
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:522
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:360
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1514,7 +1503,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3799
+#: src/TouchPoint-WP/Involvement.php:3800
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1534,48 +1523,48 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:290
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:292
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr "Las reuniones que hayan transcurrido más de esta cantidad de días pasados se trasladarán al Archivo de eventos. Una vez que pase esta fecha, la información de la reunión ya no se actualizará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:895
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan transcurrido tantos días desde el evento."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1087
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1088
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1602,11 +1591,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:403
+#: src/TouchPoint-WP/Meeting.php:446
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:404
+#: src/TouchPoint-WP/Meeting.php:447
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1640,16 +1629,16 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3557
+#: src/TouchPoint-WP/Involvement.php:3558
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:288
+#: src/TouchPoint-WP/Meeting.php:331
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:348
+#: src/TouchPoint-WP/Meeting.php:391
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1658,39 +1647,39 @@ msgstr "Reunión en %s"
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:831
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:843
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:844
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Event"
 msgstr "Evento"
 
@@ -1714,7 +1703,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:405
+#: src/TouchPoint-WP/Meeting.php:448
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
@@ -1724,8 +1713,8 @@ msgid "Creating an Involvement object from an object without a post_id is not ye
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:933
-#: src/TouchPoint-WP/Involvement.php:954
+#: src/TouchPoint-WP/Involvement.php:934
+#: src/TouchPoint-WP/Involvement.php:955
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
@@ -1796,3 +1785,31 @@ msgstr "No hay %s publicados para este mes."
 #: src/templates/admin/locationsKoForm.php:43
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:767
+msgid "Events Calendar plugin by Modern Tribe"
+msgstr "Complemento de calendario de eventos de Modern Tribe"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+msgid "TouchPoint Meetings"
+msgstr "reuniones de TouchPoint"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+msgid "App 2.0 Calendar"
+msgstr "Calendario de la app 2.0"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:782
+msgid "Events Provider"
+msgstr "Proveedor de eventos"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:783
+msgid "The source of events for version 2.0 of the Custom Mobile App."
+msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
+msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:778
+msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
+msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 54d77df8..66f3df54 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-25T14:43:31+00:00\n"
+"POT-Creation-Date: 2024-06-26T02:35:11+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:944
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
 msgid "Divisions to Import"
 msgstr ""
 
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:551
+#: src/TouchPoint-WP/Meeting.php:594
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -158,13 +158,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1758
+#: src/TouchPoint-WP/Involvement.php:1759
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1784
+#: src/TouchPoint-WP/Involvement.php:1785
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -254,7 +254,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2004
+#: src/TouchPoint-WP/Involvement.php:2005
 msgid "No %s Found."
 msgstr ""
 
@@ -265,7 +265,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3480
+#: src/TouchPoint-WP/Involvement.php:3481
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -297,11 +297,12 @@ msgstr ""
 msgid "There are no %s published for this month."
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:61
+#: src/TouchPoint-WP/EventsCalendar.php:80
 msgid "Recurring"
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:64
+#: src/TouchPoint-WP/EventsCalendar.php:83
+#: src/TouchPoint-WP/EventsCalendar.php:293
 msgid "Multi-Day"
 msgstr ""
 
@@ -326,180 +327,180 @@ msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:930
-#: src/TouchPoint-WP/Involvement.php:959
-#: src/TouchPoint-WP/Involvement.php:1034
-#: src/TouchPoint-WP/Involvement.php:1056
+#: src/TouchPoint-WP/Involvement.php:931
+#: src/TouchPoint-WP/Involvement.php:960
+#: src/TouchPoint-WP/Involvement.php:1035
+#: src/TouchPoint-WP/Involvement.php:1057
 #: src/TouchPoint-WP/Utilities/DateFormats.php:265
 #: src/TouchPoint-WP/Utilities/DateFormats.php:328
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:933
-#: src/TouchPoint-WP/Involvement.php:954
+#: src/TouchPoint-WP/Involvement.php:934
+#: src/TouchPoint-WP/Involvement.php:955
 msgid "%1$s All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:968
+#: src/TouchPoint-WP/Involvement.php:969
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:975
+#: src/TouchPoint-WP/Involvement.php:976
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:985
+#: src/TouchPoint-WP/Involvement.php:986
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:991
+#: src/TouchPoint-WP/Involvement.php:992
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1000
+#: src/TouchPoint-WP/Involvement.php:1001
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1006
+#: src/TouchPoint-WP/Involvement.php:1007
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1633
+#: src/TouchPoint-WP/Involvement.php:1634
 #: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1690
+#: src/TouchPoint-WP/Involvement.php:1691
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1733
+#: src/TouchPoint-WP/Involvement.php:1734
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1806
+#: src/TouchPoint-WP/Involvement.php:1807
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1807
+#: src/TouchPoint-WP/Involvement.php:1808
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1808
+#: src/TouchPoint-WP/Involvement.php:1809
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1819
+#: src/TouchPoint-WP/Involvement.php:1820
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1841
+#: src/TouchPoint-WP/Involvement.php:1842
 #: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1849
+#: src/TouchPoint-WP/Involvement.php:1850
 #: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1852
+#: src/TouchPoint-WP/Involvement.php:1853
 #: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1945
+#: src/TouchPoint-WP/Involvement.php:1946
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1955
+#: src/TouchPoint-WP/Involvement.php:1956
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1974
+#: src/TouchPoint-WP/Involvement.php:1975
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3459
+#: src/TouchPoint-WP/Involvement.php:3460
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3462
+#: src/TouchPoint-WP/Involvement.php:3463
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3533
+#: src/TouchPoint-WP/Involvement.php:3534
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3545
+#: src/TouchPoint-WP/Involvement.php:3546
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3557
+#: src/TouchPoint-WP/Involvement.php:3558
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3596
-#: src/TouchPoint-WP/Involvement.php:3632
+#: src/TouchPoint-WP/Involvement.php:3597
+#: src/TouchPoint-WP/Involvement.php:3633
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3601
+#: src/TouchPoint-WP/Involvement.php:3602
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3605
+#: src/TouchPoint-WP/Involvement.php:3606
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3610
+#: src/TouchPoint-WP/Involvement.php:3611
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3613
+#: src/TouchPoint-WP/Involvement.php:3614
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3616
+#: src/TouchPoint-WP/Involvement.php:3617
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3619
+#: src/TouchPoint-WP/Involvement.php:3620
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3627
+#: src/TouchPoint-WP/Involvement.php:3628
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3725
-#: src/TouchPoint-WP/Involvement.php:3822
+#: src/TouchPoint-WP/Involvement.php:3726
+#: src/TouchPoint-WP/Involvement.php:3823
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3799
+#: src/TouchPoint-WP/Involvement.php:3800
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3809
+#: src/TouchPoint-WP/Involvement.php:3810
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr ""
@@ -513,44 +514,44 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:288
+#: src/TouchPoint-WP/Meeting.php:331
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:348
+#: src/TouchPoint-WP/Meeting.php:391
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:403
+#: src/TouchPoint-WP/Meeting.php:446
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:404
+#: src/TouchPoint-WP/Meeting.php:447
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:405
+#: src/TouchPoint-WP/Meeting.php:448
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:483
+#: src/TouchPoint-WP/Meeting.php:526
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:511
+#: src/TouchPoint-WP/Meeting.php:554
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:521
+#: src/TouchPoint-WP/Meeting.php:564
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:550
+#: src/TouchPoint-WP/Meeting.php:593
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
@@ -708,659 +709,675 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1928
+#: src/TouchPoint-WP/TouchPointWP.php:1946
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1985
+#: src/TouchPoint-WP/TouchPointWP.php:2003
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1988
+#: src/TouchPoint-WP/TouchPointWP.php:2006
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1991
+#: src/TouchPoint-WP/TouchPointWP.php:2009
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1996
-#: src/TouchPoint-WP/TouchPointWP.php:1997
+#: src/TouchPoint-WP/TouchPointWP.php:2014
+#: src/TouchPoint-WP/TouchPointWP.php:2015
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2114
-#: src/TouchPoint-WP/TouchPointWP.php:2150
+#: src/TouchPoint-WP/TouchPointWP.php:2132
+#: src/TouchPoint-WP/TouchPointWP.php:2168
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2164
-#: src/TouchPoint-WP/TouchPointWP.php:2208
+#: src/TouchPoint-WP/TouchPointWP.php:2182
+#: src/TouchPoint-WP/TouchPointWP.php:2226
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2281
+#: src/TouchPoint-WP/TouchPointWP.php:2299
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2340
+#: src/TouchPoint-WP/TouchPointWP.php:2358
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:254
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:256
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:261
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:271
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:273
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:279
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:281
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:290
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:292
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:301
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:303
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:312
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:314
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:323
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:325
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:334
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:336
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:345
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:347
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:358
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:360
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:370
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:372
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:382
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:384
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:395
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:397
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:407
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:409
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:419
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:421
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:438
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:441
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:459
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:461
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:476
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:478
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:487
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:498
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:736
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:515
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:517
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:520
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:522
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:530
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:532
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:550
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:552
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:559
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:572
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:574
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:578
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:579
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:608
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:610
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:613
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:615
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:624
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:626
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:637
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:646
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:648
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:657
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:659
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:670
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:681
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:692
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:694
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:703
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:705
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:714
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:716
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:725
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:727
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:738
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:748
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:765
-msgid "Events Calendar"
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:767
+msgid "Events Calendar plugin by Modern Tribe"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+msgid "TouchPoint Meetings"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+msgid "App 2.0 Calendar"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:778
+msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:766
-msgid "Integrate with The Events Calendar from ModernTribe."
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:782
+msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:770
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:783
+msgid "The source of events for version 2.0 of the Custom Mobile App."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:793
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
-msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> and use this url:"
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:798
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:790
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:827
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:831
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:809
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:816
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:843
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:844
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:828
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:833
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:845
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:846
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:858
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:859
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:871
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:872
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:895
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:884
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Meeting Deletion Handling"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:885
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:891
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:914
 msgid "Always delete from WordPress"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:915
 msgid "Mark the occurrence as cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:902
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:903
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:926
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:943
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:945
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1087
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:957
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:971
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:994
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1000
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:972
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:995
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:996
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:997
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1027
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1016
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1017
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1040
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1046
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1069
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1073
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1086
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1075
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1088
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1251
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1274
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1305
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1306
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1328
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1329
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1377
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1586
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1609
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1708
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1731
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1759
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1782
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 9a168da8..83fe8b3b 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -17,7 +17,7 @@
 }
 
 /**
- * Provides an interface to bridge the gap between The Events Calendar plugin (by ModernTribe) and the TouchPoint
+ * Provides an interface to bridge the gap between The Events Calendar plugin (by Modern Tribe) and the TouchPoint
  * mobile app.
  *
  * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 045005a1..1fc438da 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -775,7 +775,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 			/** @noinspection HtmlUnknownTarget */
 			$this->settings['events_calendar'] = [
 				'title'       => __('App 2.0 Calendar', 'TouchPoint-WP'),
-				'description' => __('Integrate Custom Mobile app version 2.0 with The Events Calendar from ModernTribe.', 'TouchPoint-WP'),
+				'description' => __('Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'ec_app_cal_provider',

From d5850c0d442c0285aabb11a419abe3b8eab28334 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 22:38:48 -0400
Subject: [PATCH 142/423] Adding app 2.0 API for Meeting-based calendar.

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index f6648ddf..c0930ef7 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit f6648ddff2de964a64d525c682b39dd358dca70e
+Subproject commit c0930ef7c825edca591d7b3914bdefa392f6e37c

From facae3acecd28a0d5abfb1404e7bc99e07bc9e6b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 22:49:51 -0400
Subject: [PATCH 143/423] Removing some duplicate code and filter declarations

---
 docs                                 |   2 +-
 src/TouchPoint-WP/EventsCalendar.php | 213 ++++++++++-----------------
 2 files changed, 77 insertions(+), 138 deletions(-)

diff --git a/docs b/docs
index c0930ef7..c37f74c5 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit c0930ef7c825edca591d7b3914bdefa392f6e37c
+Subproject commit c37f74c5bfb90f579d92263fe7645085030004c1
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 83fe8b3b..6ad3ffc6 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -60,9 +60,6 @@ protected static function generateEventsList(array $params = []): array
 
 		$usePro = TouchPointWP::useTribeCalendarPro();
 
-		$tpDomain = TouchPointWP::instance()->settings->host;
-		$dlDomain = TouchPointWP::instance()->settings->host_deeplink;
-
 		foreach ($eventsQ as $eQ) {
 			/** @var WP_Post $eQ */
 			global $post;
@@ -85,71 +82,7 @@ protected static function generateEventsList(array $params = []): array
 			$locationContent = implode(" • ", $locationContent);
 
 			$content = trim(get_the_content(null, true, $eQ->ID));
-			$content = apply_filters('the_content', $content);
-			/**
-			 * Allows for manipulation of the html returned to the calendar feature of 2.0 Mobile apps.
-			 *
-			 * @since 0.0.2 Added
-			 * @since 0.0.90 Deprecated
-			 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
-			 *
-			 * @param string $content The html thus far.
-			 */
-			$content = apply_filters('tp_app_events_content', $content);
-
-			$content = html_entity_decode($content);
-
-			// Add Header and footer Scripts, etc.
-			if ($content !== '') {
-				ob_start();
-				do_action('wp_print_styles');
-				do_action('wp_print_head_scripts');
-				$content = ob_get_clean() . $content;
-
-				ob_start();
-				do_action('wp_print_footer_scripts');
-				do_action('wp_print_scripts');
-				$content .= ob_get_clean();
-			}
-
-			// Add domain to relative links
-			$content = preg_replace(
-				"/['\"]\/([^\/\"']*)[\"']/i",
-				'"' . get_home_url() . '/$1"',
-				$content
-			);
-
-			// Replace TouchPoint links with deeplinks where applicable
-			// Registration Links
-			if ($tpDomain !== '' && $dlDomain !== '') {
-				$content = preg_replace(
-					"/:\/\/$tpDomain\/OnlineReg\/([\d]+)/i",
-					"://" . $dlDomain . '/registrations/register/${1}?from={{MOBILE_OS}}',
-					$content
-				);
-			}
-
-			if ($content !== '') {
-				$cssUrl = null;
-				if (TouchPointWP::instance()->settings->ec_use_standardizing_style === 'on') {
-					$cssUrl = TouchPointWP::instance(
-						)->assets_url . 'template/ec-standardizing-style.css?v=' . TouchPointWP::VERSION;
-				}
-
-				/**
-				 * Insert a CSS file into all event content for mobile 2.0 app.
-				 *
-				 * @since 0.0.3 Added
-				 * @since 0.0.90 Deprecated
-				 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
-				 *
-				 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
-				 */
-				$cssUrl = apply_filters('tp_app_events_css_url', $cssUrl);
-				if (is_string($cssUrl)) {
-					$content = "<link rel=\"stylesheet\" href=\"$cssUrl\">" . $content;
-				}
-			}
+			$content = self::formatContent($content);
 
 			// Not needed for apps, but helpful for diagnostics
 			$eO['ID'] = $eQ->ID;
@@ -187,6 +120,80 @@ protected static function generateEventsList(array $params = []): array
 
 		return $eventsList;
 	}
+	
+	private static function formatContent(?string $content): string
+	{
+		$tpDomain = TouchPointWP::instance()->settings->host;
+		$dlDomain = TouchPointWP::instance()->settings->host_deeplink;
+
+		$content = apply_filters('the_content', $content);
+
+		/**
+		 * Allows for manipulation of the html returned to the calendar feature of 2.0 Mobile apps.
+		 *
+		 * @since 0.0.2 Added
+		 * @since 0.0.90 Deprecated
+		 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
+		 *
+		 * @param string $content The html thus far.
+		 */
+		$content = apply_filters('tp_app_events_content', $content);
+		$content = html_entity_decode($content);
+
+		// Add Header and footer Scripts, etc.
+		if ($content !== '') {
+			ob_start();
+			do_action('wp_print_styles');
+			do_action('wp_print_head_scripts');
+			$content = ob_get_clean() . $content;
+
+			ob_start();
+			do_action('wp_print_footer_scripts');
+			do_action('wp_print_scripts');
+			$content .= ob_get_clean();
+		}
+
+		// Add domain to relative links
+		$content = preg_replace(
+			"/['\"]\/([^\/\"']*)[\"']/i",
+			'"' . get_home_url() . '/$1"',
+			$content
+		);
+
+		// Replace TouchPoint links with deeplinks where applicable
+		// Registration Links
+		if ($tpDomain !== '' && $dlDomain !== '') {
+			$content = preg_replace(
+				"/:\/\/$tpDomain\/OnlineReg\/([\d]+)/i",
+				"://" . $dlDomain . '/registrations/register/${1}?from={{MOBILE_OS}}',
+				$content
+			);
+		}
+
+		if ($content !== '') {
+			$cssUrl = null;
+			if (TouchPointWP::instance()->settings->ec_use_standardizing_style === 'on') {
+				$cssUrl = TouchPointWP::instance(
+					)->assets_url . 'template/ec-standardizing-style.css?v=' . TouchPointWP::VERSION;
+			}
+
+			/**
+			 * Insert a CSS file into all event content for mobile 2.0 app.
+			 *
+			 * @since 0.0.3 Added
+			 * @since 0.0.90 Deprecated
+			 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
+			 *
+			 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
+			 */
+			$cssUrl = apply_filters('tp_app_events_css_url', $cssUrl);
+			if (is_string($cssUrl)) {
+				$content = "<link rel=\"stylesheet\" href=\"$cssUrl\">" . $content;
+			}
+		}
+
+		return $content;
+	}
 
 	/**
 	 * @param array $params
@@ -200,9 +207,6 @@ protected static function generateEventsListFromMeetings(array $params = []): ar
 	{
 		$eventsList = [];
 
-		$tpDomain = TouchPointWP::instance()->settings->host;
-		$dlDomain = TouchPointWP::instance()->settings->host_deeplink;
-
 		$q = new WP_Query();
 
 		$existingMq = $q->get('meta_query');
@@ -295,73 +299,8 @@ protected static function generateEventsListFromMeetings(array $params = []): ar
 			$locationContent = implode($separator, $locationContent);
 
 			$content = trim(get_the_content(null, true, $eQ->ID));
-			$content = apply_filters('the_content', $content);
-			/**
-			 * Allows for manipulation of the html returned to the calendar feature of 2.0 Mobile apps.
-			 *
-			 * @param string $content The html thus far.
-			 *
-			 * @since 0.0.90 Deprecated
-			 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
-			 *
-			 * @since 0.0.2 Added
-			 */
-			$content = apply_filters('tp_app_events_content', $content);
-
-			$content = html_entity_decode($content);
-
-			// Add Header and footer Scripts, etc.
-			if ($content !== '') {
-				ob_start();
-				do_action('wp_print_styles');
-				do_action('wp_print_head_scripts');
-				$content = ob_get_clean() . $content;
-
-				ob_start();
-				do_action('wp_print_footer_scripts');
-				do_action('wp_print_scripts');
-				$content .= ob_get_clean();
-			}
-
-			// Add domain to relative links
-			$content = preg_replace(
-				"/['\"]\/([^\/\"']*)[\"']/i",
-				'"' . get_home_url() . '/$1"',
-				$content
-			);
-
-			// Replace TouchPoint links with deeplinks where applicable
-			// Registration Links
-			if ($tpDomain !== '' && $dlDomain !== '') {
-				$content = preg_replace(
-					"/:\/\/$tpDomain\/OnlineReg\/([\d]+)/i",
-					"://" . $dlDomain . '/registrations/register/${1}?from={{MOBILE_OS}}',
-					$content
-				);
-			}
 
-			if ($content !== '') {
-				$cssUrl = null;
-				if (TouchPointWP::instance()->settings->ec_use_standardizing_style === 'on') {
-					$cssUrl = TouchPointWP::instance(
-						)->assets_url . 'template/ec-standardizing-style.css?v=' . TouchPointWP::VERSION;
-				}
-
-				/**
-				 * Insert a CSS file into all event content for mobile 2.0 app.
-				 *
-				 * @param string $cssUrl The url for a CSS file.  By default, one provided with the plugin is used.
-				 *
-				 * @since 0.0.90 Deprecated
-				 * @deprecated 0.0.90 Will be going away with Mobile App version 2.0
-				 *
-				 * @since 0.0.3 Added
-				 */
-				$cssUrl = apply_filters('tp_app_events_css_url', $cssUrl);
-				if (is_string($cssUrl)) {
-					$content = "<link rel=\"stylesheet\" href=\"$cssUrl\">" . $content;
-				}
-			}
+			$content = self::formatContent($content);
 
 			// Not needed for apps, but helpful for diagnostics
 			$eO['ID'] = $eQ->ID;

From 61a90bcf85e8d400c8241b49b6ed5c68b5702627 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 23:46:08 -0400
Subject: [PATCH 144/423] Adding action buttons to app calendar

---
 .gitignore                                    |  1 +
 docs                                          |  2 +-
 i18n/TouchPoint-WP-es_ES.po                   | 57 +++++++++---------
 i18n/TouchPoint-WP.pot                        | 59 ++++++++++---------
 src/TouchPoint-WP/EventsCalendar.php          |  2 +-
 src/TouchPoint-WP/Involvement.php             | 48 +++++++++------
 src/TouchPoint-WP/Meeting.php                 | 42 ++++++++++---
 src/TouchPoint-WP/Partner.php                 | 15 ++---
 src/TouchPoint-WP/PostTypeCapable.php         |  9 +--
 .../Utilities/StringableArray.php             | 15 +++++
 10 files changed, 156 insertions(+), 94 deletions(-)

diff --git a/.gitignore b/.gitignore
index 768f5b34..12986275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ composer.lock
 /.idea/deployment.xml
 /.idea/dataSources.xml
 /.idea/webServers.xml
+/.idea/runConfigurations/Local.xml
 
 *.min.js
 node_modules
diff --git a/docs b/docs
index c37f74c5..42f0cb60 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit c37f74c5bfb90f579d92263fe7645085030004c1
+Subproject commit 42f0cb60c35106413e08375c31a41620ce6e3897
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 0a5ea7a2..a5571e49 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/Meeting.php:599
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -199,12 +199,12 @@ msgstr "Su token de inicio de sesión no es válido."
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
-#: src/TouchPoint-WP/EventsCalendar.php:80
+#: src/TouchPoint-WP/EventsCalendar.php:77
 msgid "Recurring"
 msgstr "Periódico"
 
-#: src/TouchPoint-WP/EventsCalendar.php:83
-#: src/TouchPoint-WP/EventsCalendar.php:293
+#: src/TouchPoint-WP/EventsCalendar.php:80
+#: src/TouchPoint-WP/EventsCalendar.php:297
 msgid "Multi-Day"
 msgstr "varios días"
 
@@ -243,45 +243,45 @@ msgstr "Solo hombres"
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3534
+#: src/TouchPoint-WP/Involvement.php:3538
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3597
-#: src/TouchPoint-WP/Involvement.php:3633
+#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3646
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3602
+#: src/TouchPoint-WP/Involvement.php:3611
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3615
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3611
+#: src/TouchPoint-WP/Involvement.php:3620
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3614
+#: src/TouchPoint-WP/Involvement.php:3623
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3617
+#: src/TouchPoint-WP/Involvement.php:3626
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3620
+#: src/TouchPoint-WP/Involvement.php:3629
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3628
+#: src/TouchPoint-WP/Involvement.php:3637
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3546
+#: src/TouchPoint-WP/Involvement.php:3555
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -307,7 +307,8 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:593
+#: src/TouchPoint-WP/Meeting.php:598
+#: src/TouchPoint-WP/Meeting.php:618
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
@@ -1289,23 +1290,23 @@ msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográ
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:526
+#: src/TouchPoint-WP/Meeting.php:531
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:554
+#: src/TouchPoint-WP/Meeting.php:559
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:564
+#: src/TouchPoint-WP/Meeting.php:569
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3726
-#: src/TouchPoint-WP/Involvement.php:3823
+#: src/TouchPoint-WP/Involvement.php:3740
+#: src/TouchPoint-WP/Involvement.php:3837
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1478,7 +1479,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3810
+#: src/TouchPoint-WP/Involvement.php:3824
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1503,7 +1504,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3800
+#: src/TouchPoint-WP/Involvement.php:3814
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1591,11 +1592,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:446
+#: src/TouchPoint-WP/Meeting.php:451
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:447
+#: src/TouchPoint-WP/Meeting.php:452
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1629,7 +1630,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3558
+#: src/TouchPoint-WP/Involvement.php:3567
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1638,7 +1639,7 @@ msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:391
+#: src/TouchPoint-WP/Meeting.php:396
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1703,7 +1704,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:448
+#: src/TouchPoint-WP/Meeting.php:453
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 66f3df54..8fb1a788 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-26T02:35:11+00:00\n"
+"POT-Creation-Date: 2024-06-26T03:42:49+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/Meeting.php:599
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -297,12 +297,12 @@ msgstr ""
 msgid "There are no %s published for this month."
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:80
+#: src/TouchPoint-WP/EventsCalendar.php:77
 msgid "Recurring"
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:83
-#: src/TouchPoint-WP/EventsCalendar.php:293
+#: src/TouchPoint-WP/EventsCalendar.php:80
+#: src/TouchPoint-WP/EventsCalendar.php:297
 msgid "Multi-Day"
 msgstr ""
 
@@ -442,65 +442,65 @@ msgstr ""
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3534
+#: src/TouchPoint-WP/Involvement.php:3538
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3546
+#: src/TouchPoint-WP/Involvement.php:3555
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3558
+#: src/TouchPoint-WP/Involvement.php:3567
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3597
-#: src/TouchPoint-WP/Involvement.php:3633
+#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3646
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3602
+#: src/TouchPoint-WP/Involvement.php:3611
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3606
+#: src/TouchPoint-WP/Involvement.php:3615
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3611
+#: src/TouchPoint-WP/Involvement.php:3620
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3614
+#: src/TouchPoint-WP/Involvement.php:3623
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3617
+#: src/TouchPoint-WP/Involvement.php:3626
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3620
+#: src/TouchPoint-WP/Involvement.php:3629
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3628
+#: src/TouchPoint-WP/Involvement.php:3637
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3726
-#: src/TouchPoint-WP/Involvement.php:3823
+#: src/TouchPoint-WP/Involvement.php:3740
+#: src/TouchPoint-WP/Involvement.php:3837
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3800
+#: src/TouchPoint-WP/Involvement.php:3814
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3810
+#: src/TouchPoint-WP/Involvement.php:3824
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr ""
@@ -519,39 +519,40 @@ msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:391
+#: src/TouchPoint-WP/Meeting.php:396
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:446
+#: src/TouchPoint-WP/Meeting.php:451
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:447
+#: src/TouchPoint-WP/Meeting.php:452
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:448
+#: src/TouchPoint-WP/Meeting.php:453
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:526
+#: src/TouchPoint-WP/Meeting.php:531
 #: src/TouchPoint-WP/TouchPointWP.php:969
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:554
+#: src/TouchPoint-WP/Meeting.php:559
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:564
+#: src/TouchPoint-WP/Meeting.php:569
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:593
+#: src/TouchPoint-WP/Meeting.php:598
+#: src/TouchPoint-WP/Meeting.php:618
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 6ad3ffc6..8ef17c14 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -299,7 +299,7 @@ protected static function generateEventsListFromMeetings(array $params = []): ar
 			$locationContent = implode($separator, $locationContent);
 
 			$content = trim(get_the_content(null, true, $eQ->ID));
-
+			$content .= "<div>" . $e->getActionButtons('mobile', 'btn', withTouchPointLink: false, absoluteLinks: true)->join("  ") . "</div>";
 			$content = self::formatContent($content);
 
 			// Not needed for apps, but helpful for diagnostics
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index f1510f10..7deeba06 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3510,13 +3510,15 @@ public function notableAttributes(array $exclude = []): array
 	 * Returns the html with buttons for actions the user can perform.  This must be called *within* an element with
 	 * the `data-tp-involvement` attribute with the post_id (NOT the Inv ID) as the value.
 	 *
-	 * @param ?string $context A reference to where the action buttons are meant to be used.
-	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
-	 *     elements.
+	 * @param string|null $context A string that gives filters some context for where the request is coming from
+	 * @param string      $btnClass HTML class names to put into the buttons/links
+	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param bool        $absoluteLinks Set true to make the links absolute, so they work from apps or emails.
+	 * @param bool        $includeRegister Set false to exclude the register button.
 	 *
-	 * @return StringableArray()
+	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $includeRegister = true): StringableArray
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false, bool $includeRegister = true): StringableArray
 	{
 		TouchPointWP::requireScript('swal2-defer');
 		TouchPointWP::requireScript('base-defer');
@@ -3529,11 +3531,18 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 			$btnClass = " class=\"$btnClass\"";
 		}
 
+		$baseLink = get_permalink($this->post_id);
+
 		$ret = new StringableArray();
 		if (self::allowContact($this->invType) && $this->leaders()->count() > 0) {
-			$text = __("Contact Leaders", 'TouchPoint-WP');
-			$ret[] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button> ";
-			TouchPointWP::enqueueActionsStyle('inv-contact');
+			$text  = __("Contact Leaders", 'TouchPoint-WP');
+			if (!$absoluteLinks) {
+				$ret[] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button> ";
+				TouchPointWP::enqueueActionsStyle('inv-contact');
+			} else {
+				$iid = $this->invId;
+				$ret[] = "<a href=\"$baseLink#tp-contact-i$iid\"$btnClass>$text</a> ";
+			}
 		}
 
 		// Register Button
@@ -3542,7 +3551,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		}
 
 		// Show on map button.  (Only works if map is called before this is.)
-		if (self::$_hasArchiveMap && $this->geo !== null) {
+		if (self::$_hasArchiveMap && $this->geo !== null && !$absoluteLinks) {
 			$text = __("Show on Map", 'TouchPoint-WP');
 			if ($ret->count() > 1) {
 				TouchPointWP::requireScript("fontAwesome");
@@ -3582,11 +3591,11 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 	 * Get the HTML for the register button.  Labels depend on several settings within TouchPoint.
 	 *
 	 * @param string $btnClass  Class names
-	 * @param bool   $includeRsvp
+	 * @param bool   $absoluteLinks  Whether only absolute links should be provided that can be used in emails, apps, etc.
 	 *
 	 * @return ?string HTML for the registration button, whatever that should be. Null if nothing to return.
 	 */
-	public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?string
+	public function getRegisterButton(string $btnClass, bool $absoluteLinks = false): ?string
 	{
 		if ($btnClass !== "") {
 			$btnClass = " class=\"$btnClass\"";
@@ -3626,8 +3635,12 @@ public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?
 
 			case RegistrationType::JOIN:
 				$text = __('Join', 'TouchPoint-WP');
-				TouchPointWP::enqueueActionsStyle('inv-join');
-				return "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"join\" $btnClass>$text</button>  ";
+				if (!$absoluteLinks) {
+					TouchPointWP::enqueueActionsStyle('inv-join');
+					return "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"join\" $btnClass>$text</button>  ";
+				}
+				$link = get_permalink($this->post_id()) . "#tp-join-i" . $this->invId;
+				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::EXTERNAL:
 				$text = __('Register', 'TouchPoint-WP');
@@ -3636,11 +3649,12 @@ public function getRegisterButton(string $btnClass, bool $includeRsvp = true): ?
 				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::RSVP:
-				if ($includeRsvp) {
-					$asAMeeting = $this->AsAMeeting();
-					if ($asAMeeting !== null) {
-						return $asAMeeting->getRsvpButton($btnClass);
+				$asAMeeting = $this->AsAMeeting();
+				if ($asAMeeting !== null) {
+					if ($absoluteLinks) {
+						return $asAMeeting->getRsvpLink($btnClass);
 					}
+					return $asAMeeting->getRsvpButton($btnClass);
 				}
 		}
 		return null;
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index a1b7cb5e..6ef2923c 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -355,13 +355,14 @@ public function notableAttributes(array $exclude = []): array
 	}
 
 	/**
-	 * @param ?string $context
-	 * @param string  $btnClass
-	 * @param bool    $withTouchPointLink
+	 * @param string|null $context A string that gives filters some context for where the request is coming from
+	 * @param string      $btnClass HTML class names to put into the buttons/links
+	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param bool        $absoluteLinks  Set true to make the links absolute, so they work from apps or emails.
 	 *
 	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true): StringableArray
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
 	{
 		TouchPointWP::requireScript('swal2-defer');
 		TouchPointWP::requireScript('base-defer');
@@ -375,14 +376,18 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 			return new StringableArray();
 		}
 
-		$ret = $inv->getActionButtons($context . "_meeting", $btnClass, false, false);
+		$ret = $inv->getActionButtons($context . "_meeting", $btnClass, false, $absoluteLinks, false);
 
 		if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
-			$ret[] = $inv->getRegisterButton($btnClass);
+			$ret[] = $inv->getRegisterButton($btnClass, $absoluteLinks);
 		}
 
 		if ($inv->getRegistrationType() === RegistrationType::RSVP) {
-			$ret[] = $this->getRsvpButton($btnClass);
+			if ($absoluteLinks) {
+				$ret[] = $this->getRsvpLink($btnClass);
+			} else {
+				$ret[] = $this->getRsvpButton($btnClass);
+			}
 		}
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
@@ -601,6 +606,29 @@ public function getRsvpButton(string $btnClass = ""): string
 		return "<a href=\"#\" onclick=\"return false;\" $btnClass disabled data-tp-action=\"rsvp\" data-tp-mtg=\"$this->mtgId\"><span class=\"rsvp-btn-content\" style=\"display:none\">$link</span><span class=\"rsvp-btn-preload\">$preloadMsg</span></a>";
 	}
 
+	/**
+	 * Get a link to RSVP for the meeting that can be used in emails, apps, or other contexts.
+	 *
+	 * @param string $btnClass
+	 *
+	 * @return string
+	 */
+	public function getRsvpLink(string $btnClass = ""): string
+	{
+		$link = __("RSVP", "TouchPoint-WP");
+
+		$baseUrl = get_permalink($this->post_id);
+
+		$btnClass = trim($btnClass);
+		if ($btnClass !== '' && !str_starts_with($btnClass, "class=")) {
+			$btnClass = "class=\"$btnClass\"";
+		}
+
+		$mid = $this->mtgId;
+		return "<a href=\"$baseUrl#tp-rsvp-m$mid\" $btnClass>$link</a>";
+
+	}
+
 	/**
 	 * Indicates if the given post can be instantiated as a Meeting.
 	 *
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index e63bf747..ceefa8e8 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1291,14 +1291,14 @@ protected function enqueueForJsInstantiation(): bool
 	 * Returns the html with buttons for actions the user can perform.  This must be called *within* an element with
 	 * the `data-tp-partner` attribute with the post_id as the value or 0 for secure partners.
 	 *
-	 * @param ?string $context A reference to where the action buttons are meant to be used.
-	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
-	 *     elements.
-	 * @param bool $withTouchPointLink Whether or not to include the TouchPoint link.  Default is true.
+	 * @param string|null $context A string that gives filters some context for where the request is coming from
+	 * @param string      $btnClass HTML class names to put into the buttons/links
+	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param bool        $absoluteLinks  Set true to make the links absolute, so they work from apps or emails.
 	 *
 	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true): StringableArray
+	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
 	{
 		$this->enqueueForJsInstantiation();
 
@@ -1308,7 +1308,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		}
 
 		// Show on map button.  (Only works if map is called before this is.)
-		if (self::$_hasArchiveMap && ! $this->decoupleLocation && $this->geo !== null) {
+		if (self::$_hasArchiveMap && ! $this->decoupleLocation && $this->geo !== null && !$absoluteLinks) {
 			$text = __("Show on Map", "TouchPoint-WP");
 			$ret[] = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
 		}
@@ -1329,8 +1329,9 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		 * @param ?string $context A reference to where the action buttons are meant to be used.
 		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
 		 *     elements.
+		 * @param bool $absoluteLinks Set true to make the links absolute, so they work from apps or emails.
 		 */
-		return apply_filters("tp_partner_actions", $ret, $this, $context, $btnClass);
+		return apply_filters("tp_partner_actions", $ret, $this, $context, $btnClass, $absoluteLinks);
 	}
 
 	public static function getJsInstantiationString(): string
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index eea8612d..072a7512 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -92,13 +92,14 @@ protected function processAttributeExclusions(array $subject, array $exclude): a
 	}
 
 	/**
-	 * @param string $context  A string that gives filters some context for where the request is coming from
-	 * @param string $btnClass HTML class names to put into the buttons/links
-	 * @param bool   $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param string|null $context A string that gives filters some context for where the request is coming from
+	 * @param string      $btnClass HTML class names to put into the buttons/links
+	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param bool        $absoluteLinks  Set true to make the links absolute, so they work from apps or emails.
 	 *
 	 * @return StringableArray
 	 */
-	public abstract function getActionButtons(string $context, string $btnClass, bool $withTouchPointLink = true): StringableArray;
+	public abstract function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray;
 
 	/**
 	 * Indicates if the given post can be instantiated as the given post type.
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index 2a766224..7807e5f7 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -73,6 +73,21 @@ public function __toString()
 		return implode($this->separator, $this->getArrayCopy());
 	}
 
+	/**
+	 * @param string|null $separator
+	 *
+	 * @return string
+	 *
+	 * @since 0.0.90 Added
+	 */
+	public function join(string $separator = null): string
+	{
+		if (is_null($separator)) {
+			$separator = $this->separator;
+		}
+		return implode($separator, $this->getArrayCopy());
+	}
+
 	/**
 	 * Convert the array to a list string with ampersands and such.
 	 *

From 33b7741c8d514cf3a8e018216f2acc44fafa4c33 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 23:48:39 -0400
Subject: [PATCH 145/423] Doc clarity

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 42f0cb60..65e3b7ae 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 42f0cb60c35106413e08375c31a41620ce6e3897
+Subproject commit 65e3b7aefedc1f2413648257342c1d704bc551b9

From 4817cdfae1ddf827edf3d48fd00d507c2f13e847 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 23:56:03 -0400
Subject: [PATCH 146/423] Minor formats in utilities

---
 src/TouchPoint-WP/Utilities.php                 | 4 ++--
 src/TouchPoint-WP/Utilities/StringableArray.php | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 55098701..b59382f4 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -243,11 +243,11 @@ public static function stringArrayToListString(array $strings): string
 		$comma     = ', ';
 		$and       = ' & ';
 		$useOxford = false;
-		if (strpos($concat, ', ') !== false) {
+		if (str_contains($concat, ', ')) {
 			$comma     = '; ';
 			$useOxford = true;
 		}
-		if (strpos($concat, ' & ') !== false) {
+		if (str_contains($concat, ' & ')) {
 			$and       = ' ' . __('and', 'TouchPoint-WP') . ' ';
 			$useOxford = true;
 		}
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index 7807e5f7..dc81453f 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -70,10 +70,12 @@ public function contains($needle): bool
 	 */
 	public function __toString()
 	{
-		return implode($this->separator, $this->getArrayCopy());
+		return $this->join();
 	}
 
 	/**
+	 * Link the items together with a given separator, which may be different from the separator used in the constructor.
+	 *
 	 * @param string|null $separator
 	 *
 	 * @return string

From e52815f1211f6f28c4016718f15f08cc6488b6d3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 25 Jun 2024 23:56:28 -0400
Subject: [PATCH 147/423] Minor formats in utilities

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 65e3b7ae..21c64751 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 65e3b7aefedc1f2413648257342c1d704bc551b9
+Subproject commit 21c647510e2f7f2ba07bfb107edebe9a88e0e418

From 486239f9e8205cd58f5198f77f8e3c37fcda752f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Jun 2024 19:08:25 -0400
Subject: [PATCH 148/423] Images for Involvements and Meetings Resolving some
 issues with timezones.

---
 assets/template/partials-template-style.css   | 27 ++++++
 src/TouchPoint-WP/Involvement.php             | 72 +++++++++++----
 src/TouchPoint-WP/Meeting.php                 | 92 +++++++++++++++++--
 src/TouchPoint-WP/TouchPointWP.php            |  6 +-
 src/TouchPoint-WP/Utilities.php               | 14 +++
 src/TouchPoint-WP/Utilities/DateFormats.php   | 17 ++++
 .../Utilities/StringableArray.php             |  2 +-
 src/TouchPoint-WP/hierarchical.php            | 31 +++++++
 src/templates/involvement-single.php          | 72 ++++++++-------
 src/templates/partner-single.php              | 10 ++
 10 files changed, 279 insertions(+), 64 deletions(-)
 create mode 100644 src/TouchPoint-WP/hierarchical.php

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index e65ec75c..53b49baa 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -203,4 +203,31 @@ main.TouchPointWP-main {
 article .TouchPointWP-detail-cell .TouchPointWP-detail-cell-section {
     text-align:center;
     margin-bottom: 2em;
+}
+
+header div.header-image-container {
+    max-width: 800px;
+    width: 100%;
+    padding-top: 50%;
+    margin-left: auto;
+    margin-right: auto;
+    background-size: cover;
+    background-position: center;
+    overflow:hidden;
+}
+
+header div.header-image-container.partner-header-image {
+    background-size: contain;
+}
+
+header div.header-image-container img {
+    /* visible to screen readers only */
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0;
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 7deeba06..06d403be 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -13,6 +13,7 @@
 	require_once "api.php";
 	require_once "jsInstantiation.php";
 	require_once "jsonLd.php";
+	require_once "hierarchical.php";
 	require_once "updatesViaCron.php";
 	require_once "Utilities.php";
 	require_once "Involvement_PostTypeSettings.php";
@@ -40,7 +41,7 @@
 /**
  * Fundamental object meant to correspond to an Involvement in TouchPoint
  */
-class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module, JsonSerializable
+class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module, hierarchical, JsonSerializable
 {
 	use jsInstantiation;
 	use jsonLd;
@@ -300,15 +301,15 @@ public static function init(): void
 		}
 
 		// Register default templates for Involvements
-		add_filter('template_include', [self::class, 'templateFilter']);
+		add_filter('template_include', [self::class, 'templateFilter'], 10, 1);
 
 		// Register function to return schedule instead of publishing date
 		add_filter('get_the_date', [self::class, 'filterPublishDate'], 10, 3);
 		add_filter('get_the_time', [self::class, 'filterPublishDate'], 10, 3);
 
 		// Register function to return leaders instead of authors
-		add_filter('the_author', [self::class, 'filterAuthor'], 10, 3);
-		add_filter('get_the_author_display_name', [self::class, 'filterAuthor'], 10, 3);
+		add_filter('the_author', [self::class, 'filterAuthor'], 10, 1);
+		add_filter('get_the_author_display_name', [self::class, 'filterAuthor'], 10, 1);
 	}
 
 	public static function checkUpdates(): void
@@ -615,7 +616,8 @@ public function getRegistrationType(): int
 	 * Whether the involvement should link to a registration form, rather than directly joining the org.
 	 *
 	 * @since 0.0.90 Deprecated
-	 * @deprecated 0.0.90  Does not take into account all the possible registration types; will be removed in a future version.
+	 * @deprecated 0.0.90  Does not take into account all the possible registration types; will be removed in a future
+	 *     version.
 	 *
 	 * @return bool
 	 */
@@ -667,12 +669,39 @@ protected function schedules(): array
 		return $this->_schedules;
 	}
 
+	/**
+	 * Get the parent of this object **which may be an object of a different class**.
+	 *
+	 * Returns null if there is no parent.
+	 *
+	 * @return Involvement|null
+	 */
+	public function getParent(): ?Involvement
+	{
+		if ($this->parentPostId === null) {
+			$this->parentPostId = $this->post->post_parent;
+			if ($this->parentPostId > 0) {
+				$parent = get_post($this->parentPostId);
+				if ($parent !== null) {
+					try {
+						$this->parentObject = self::fromPost($parent);
+					} catch (TouchPointWP_Exception) {
+						$this->parentObject = null;
+					}
+				}
+			}
+		}
+		return $this->parentObject;
+	}
+	protected ?int $parentPostId = null;
+	protected ?self $parentObject = null;
+
 	/**
 	 * Get a description of the meeting schedule in a human-friendly phrase, e.g. Sundays at 11:00am, starting January
 	 * 14.
 	 *
-	 * This is separated out to a static method to prevent involvement from being instantiated (with those database hits)
-	 * when the content is cached.  (10x faster or more)
+	 * This is separated out to a static method to prevent involvement from being instantiated (with those database
+	 * hits) when the content is cached.  (10x faster or more)
 	 *
 	 * @param int           $invId
 	 * @param ?Involvement  $inv
@@ -2725,7 +2754,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 			unset($timeStr, $weekday);
 		}
 
-		// Start and end dates
+		// first and last meeting dates
 		$tense = Taxonomies::TAX_TENSE_PRESENT;
 		if ($inv->firstMeeting !== null && $inv->firstMeeting < Utilities::dateTimeNow()) { // First meeting already happened.
 			$inv->firstMeeting = null; // We don't need to list info from the past.
@@ -3118,8 +3147,8 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
 		} else {
 			update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId);
-			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, DateFormats::timestampAndOffset($mtgO->mtgStartDt));
-			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, DateFormats::timestampAndOffset($mtgO->mtgEndDt));
+			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, DateFormats::timestampWithoutOffset($mtgO->mtgStartDt));
+			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, DateFormats::timestampWithoutOffset($mtgO->mtgEndDt));
 			update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, !!$feature);
 			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
 			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
@@ -3520,11 +3549,13 @@ public function notableAttributes(array $exclude = []): array
 	 */
 	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false, bool $includeRegister = true): StringableArray
 	{
-		TouchPointWP::requireScript('swal2-defer');
-		TouchPointWP::requireScript('base-defer');
-		$this->enqueueForJsInstantiation();
-		$this->enqueueForJsonLdInstantiation();
-		Person::enqueueUsersForJsInstantiation();
+		if (!$absoluteLinks) {
+			TouchPointWP::requireScript('swal2-defer');
+			TouchPointWP::requireScript('base-defer');
+			$this->enqueueForJsInstantiation();
+			$this->enqueueForJsonLdInstantiation();
+			Person::enqueueUsersForJsInstantiation();
+		}
 
 		$classesOnly = $btnClass;
 		if ($btnClass !== "") {
@@ -3591,7 +3622,8 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 	 * Get the HTML for the register button.  Labels depend on several settings within TouchPoint.
 	 *
 	 * @param string $btnClass  Class names
-	 * @param bool   $absoluteLinks  Whether only absolute links should be provided that can be used in emails, apps, etc.
+	 * @param bool   $absoluteLinks  Whether only absolute links should be provided that can be used in emails, apps,
+	 *     etc.
 	 *
 	 * @return ?string HTML for the registration button, whatever that should be. Null if nothing to return.
 	 */
@@ -3630,7 +3662,9 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false)
 						break;
 				}
 				$link  = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
-				TouchPointWP::enqueueActionsStyle('inv-register');
+				if (!$absoluteLinks) {
+					TouchPointWP::enqueueActionsStyle('inv-register');
+				}
 				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::JOIN:
@@ -3645,7 +3679,9 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false)
 			case RegistrationType::EXTERNAL:
 				$text = __('Register', 'TouchPoint-WP');
 				$link = $this->getRegistrationUrl();
-				TouchPointWP::enqueueActionsStyle('inv-register');
+				if (!$absoluteLinks) {
+					TouchPointWP::enqueueActionsStyle('inv-register');
+				}
 				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::RSVP:
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 6ef2923c..bfe2a043 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -11,6 +11,7 @@
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once 'api.php';
+	require_once 'hierarchical.php';
 }
 
 use DateTime;
@@ -25,7 +26,7 @@
 /**
  * Handle meeting content, particularly RSVPs.
  */
-class Meeting extends PostTypeCapable implements api, module, hasGeo
+class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchical
 {
 	use jsInstantiation;
 //	use jsonLd; TODO
@@ -43,7 +44,7 @@ class Meeting extends PostTypeCapable implements api, module, hasGeo
 	// This is the same as the meta key for involvement locations.
 	public const MEETING_LOCATION_META_KEY = TouchPointWP::SETTINGS_PREFIX . "locationName";
 
-	private static bool $_isLoaded = false;  // TODO why is this here?
+	private static bool $_isLoaded = false;
 	private static array $_instances = [];
 	private static ?Involvement_PostTypeSettings $_typeSet = null;
 
@@ -167,8 +168,11 @@ protected function __construct(object $object)
 		$start = intval(get_post_meta($this->post_id, self::MEETING_START_META_KEY, true));
 		$end = intval(get_post_meta($this->post_id, self::MEETING_END_META_KEY, true));
 		$tz = wp_timezone();
-		$this->startDt = ($start === 0 ? null : DateTimeImmutable::createFromMutable(DateTime::createFromFormat("U", $start, $tz)));
-		$this->endDt   = ($end   === 0 ? null : DateTimeImmutable::createFromMutable(DateTime::createFromFormat("U", $end, $tz)));
+		$tz0 = Utilities::utcTimeZone();
+		$startDt = $start === 0 ? null : DateTime::createFromFormat("U", $start, $tz0)->setTimezone($tz);
+		$endDt = $end   === 0 ? null : DateTime::createFromFormat("U", $end, $tz0)->setTimezone($tz);
+		$this->startDt = ($startDt === null ? null : DateTimeImmutable::createFromMutable($startDt));
+		$this->endDt   = ($endDt   === null ? null : DateTimeImmutable::createFromMutable($endDt));
 
 		$this->registerConstruction();
 	}
@@ -257,6 +261,7 @@ public function involvementId(): int
 	/**
 	 * Get the Involvement object associated with this Meeting.
 	 *
+	 * @return Involvement
 	 * @throws TouchPointWP_Exception
 	 */
 	public function involvement(): Involvement
@@ -271,6 +276,23 @@ public function involvement(): Involvement
 		throw new TouchPointWP_Exception("Meeting is not associated with an Involvement.", 171002);
 	}
 
+
+	/**
+	 * Get the parent of this object **which is a different class**.
+	 *
+	 * Returns null if there is no parent.
+	 *
+	 * @return ?Involvement
+	 */
+	public function getParent(): ?Involvement
+	{
+		try {
+			return $this->involvement();
+		} catch (TouchPointWP_Exception) {
+			return null;
+		}
+	}
+
 	/**
 	 * Get the human-readable schedule for the meeting as a string.  If multiple elements exist, they will be joined by
 	 * $join.  Returns null if the schedule string is unavailable for some reason.
@@ -364,11 +386,13 @@ public function notableAttributes(array $exclude = []): array
 	 */
 	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
 	{
-		TouchPointWP::requireScript('swal2-defer');
-		TouchPointWP::requireScript('base-defer');
-		$this->enqueueForJsInstantiation();
-//		$this->enqueueForJsonLdInstantiation();
-		Person::enqueueUsersForJsInstantiation();
+		if (!$absoluteLinks) {
+			TouchPointWP::requireScript('swal2-defer');
+			TouchPointWP::requireScript('base-defer');
+			$this->enqueueForJsInstantiation();
+//		    $this->enqueueForJsonLdInstantiation();
+			Person::enqueueUsersForJsInstantiation();
+		}
 
 		try {
 			$inv = $this->involvement();
@@ -454,6 +478,42 @@ public function status_i18n(bool $excludeScheduled = false): ?string
 		};
 	}
 
+	/**
+	 * Filters the post thumbnail ID.  Allows meetings to have the image of their parent without having an image themselves.
+	 *
+	 * @param int|false        $thumbnail_id Post thumbnail ID or false if the post does not exist.
+	 * @param int|WP_Post|null $post         Post ID or WP_Post object. Default is global `$post`.
+	 */
+	public static function filterThumbnailId(int|false $thumbnail_id, int|WP_Post|null $post): bool|int
+	{
+		if ($thumbnail_id > 0) { // If already set, we have nothing to do.
+			return $thumbnail_id;
+		}
+
+		if (is_numeric($post)) {
+			$post = get_post($post);
+		}
+
+		if (!$post instanceof WP_Post) { // Something went wrong because we don't have a post.
+			return $thumbnail_id;
+		}
+
+		if (!self::postIsType($post)) { // Not our problem
+			return $thumbnail_id;
+		}
+
+		try {
+			$involvementPostId = Meeting::fromPost($post)->getParent()?->post_id();
+			if (!$involvementPostId) {
+				return $thumbnail_id;
+			}
+			return get_post_thumbnail_id($involvementPostId);
+		} catch (TouchPointWP_Exception) {
+		}
+
+		return $thumbnail_id;
+	}
+
 	/**
 	 * Handle API requests
 	 *
@@ -643,10 +703,22 @@ public static function postIsType(WP_Post $post): bool
 
 	public static function load(): bool
 	{
-		// TODO: Implement load() method... or make not a module anymore.
+		if (self::$_isLoaded) {
+			return true;
+		}
+
+		self::$_isLoaded = true;
+
+		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']);
+
 		return true;
 	}
 
+	public static function init(): void
+	{
+		add_filter('post_thumbnail_id', [self::class, 'filterThumbnailId'], 10, 3);
+	}
+
 	/**
 	 * Indicate the tense of the meeting.
 	 *
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index e1009b87..0f8d5e29 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -691,7 +691,8 @@ public static function load($file): TouchPointWP
 		}
 
 		// Load Involvements tool if enabled.
-		if ($instance->settings->enable_involvements === "on") {
+		if ($instance->settings->enable_involvements === "on" ||
+			$instance->settings->enable_meeting_cal === "on") {
 			$instance->involvements = Involvement::load();
 		}
 
@@ -710,9 +711,6 @@ public static function load($file): TouchPointWP
 
 		// Load Meetings / Events Calendar
 		if ($instance->settings->enable_meeting_cal === "on") {
-			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-				require_once 'Meeting.php';
-			}
 			$instance->meeting = Meeting::load();
 		}
 
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index b59382f4..90249c83 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -8,6 +8,7 @@
 use DateInterval;
 use DateTimeImmutable;
 use DateTimeInterface;
+use DateTimeZone;
 use Exception;
 use WP_Post_Type;
 
@@ -88,11 +89,24 @@ public static function dateTimeNowPlus1D(): DateTimeImmutable
 
 		return self::$_dateTimeNowPlus1D;
 	}
+	
+	/**
+	 * @return DateTimeZone
+	 */
+	public static function utcTimeZone(): DateTimeZone
+	{
+		if (self::$_utcTimeZone === null) {
+			self::$_utcTimeZone = new DateTimeZone('UTC');
+		}
+
+		return self::$_utcTimeZone;
+	}
 
 	private static ?DateTimeImmutable $_dateTimeNow = null;
 	private static ?DateTimeImmutable $_dateTimeTodayAtMidnight = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1Y = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1D = null;
+	private static ?DateTimeZone $_utcTimeZone = null;
 
 	/**
 	 * Gets the plural form of a weekday name.
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 318431e3..26511445 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -35,6 +35,23 @@ public static function TimeStringFormatted(DateTimeInterface $dt): string
 		return apply_filters('tp_adjust_time_string', $ts, $dt);
 	}
 
+	/**
+	 * @param ?DateTimeInterface $dt
+	 *
+	 * @return int
+	 *
+	 * @since 0.0.90 added
+	 */
+	public static function timestampWithoutOffset(?DateTimeInterface $dt): int
+	{
+		if ($dt === null) {
+			return 0;
+		}
+
+		$dt = $dt->setTimezone(Utilities::utcTimeZone());
+		return $dt->getTimestamp();
+	}
+
 	/**
 	 * @param ?DateTimeInterface $dt
 	 *
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index dc81453f..595e0c9c 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -40,7 +40,7 @@ public function count(): int
 	}
 
 	/**
-	 * Append to the end of the array.
+	 * Append to the start of the array.
 	 *
 	 * @param mixed $value
 	 */
diff --git a/src/TouchPoint-WP/hierarchical.php b/src/TouchPoint-WP/hierarchical.php
new file mode 100644
index 00000000..d4e00e06
--- /dev/null
+++ b/src/TouchPoint-WP/hierarchical.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use WP_Post;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+
+/**
+ * Some items are hierarchical.  This trait provides a simpler interface for interacting with parents and allowing
+ * attributes to be inherited by children from parents.
+ *
+ * @since 0.0.90 Added
+ */
+interface hierarchical
+{
+	/**
+	 * Get the parent of this object **which may be an object of a different class**.
+	 *
+	 * Returns null if there is no parent. 
+	 *
+	 * @return mixed
+	 */
+	public function getParent(): mixed;
+}
\ No newline at end of file
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 0060a45c..81f3ebe1 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -20,6 +20,16 @@
 ?>
 
 <header class="archive-header has-text-align-center header-footer-group">
+    <?php
+    $image = get_the_post_thumbnail_url($p, 'full');
+    $imageAlt = esc_html(get_the_post_thumbnail_caption($p));
+    if ($image) {
+        echo "<div class=\"header-image-container\" style=\"background-image: url('$image');\">";
+        echo "<img src='$image' alt='$imageAlt' class='involvement-header-image tp-header-image'>";
+        echo "</div>";
+    }
+    ?>
+
     <div class="archive-header-inner section-inner medium">
         <h1 class="archive-title page-title"><?php echo the_title() ?></h1>
     </div>
@@ -29,7 +39,7 @@
     <div class="post-inner involvement-inner">
         <div class="entry-content">
             <?php
-                the_content();
+            the_content();
             ?>
         </div><!-- .entry-content -->
     </div><!-- .post-inner -->
@@ -60,28 +70,28 @@
 </article>
 
 <?php if ($settings->hierarchical) {
-    $children = get_children([
-                                 'post_parent' => $p->ID,
-                                 'orderby' => 'title',
-                                 'order' => 'ASC',
-                                 'meta_key'     => TouchPointWP::INVOLVEMENT_META_KEY,
-                                 'meta_value'   => 0,
-                                 'meta_compare' => '>'
-                             ]);
-    if (count($children) > 0) {
-        echo "<div class='involvement-list child-involvements'>";
-    }
-    foreach ($children as $post) {
-        /** @var WP_Post $post */
-        $loadedPart = get_template_part('list-item', 'involvement-list-item');
-        if ($loadedPart === false) {
-            TouchPointWP::enqueuePartialsStyle();
-            require TouchPointWP::$dir . "/src/templates/parts/involvement-list-item.php";
-        }
-    }
-    if (count($children) > 0) {
-        echo "</div>";
-    }
+	$children = get_children([
+		                         'post_parent' => $p->ID,
+		                         'orderby' => 'title',
+		                         'order' => 'ASC',
+		                         'meta_key'     => TouchPointWP::INVOLVEMENT_META_KEY,
+		                         'meta_value'   => 0,
+		                         'meta_compare' => '>'
+	                         ]);
+	if (count($children) > 0) {
+		echo "<div class='involvement-list child-involvements'>";
+	}
+	foreach ($children as $post) {
+		/** @var WP_Post $post */
+		$loadedPart = get_template_part('list-item', 'involvement-list-item');
+		if ($loadedPart === false) {
+			TouchPointWP::enqueuePartialsStyle();
+			require TouchPointWP::$dir . "/src/templates/parts/involvement-list-item.php";
+		}
+	}
+	if (count($children) > 0) {
+		echo "</div>";
+	}
 }
 
 if ($settings->importMeetings && $tps->enable_meeting_cal === "on") {
@@ -93,16 +103,16 @@
 		                         'meta_value'   => time(),
 		                         'meta_compare' => '>'
 	                         ]);
-    $count = count($meetings);
+	$count = count($meetings);
 	if ($count > 0) {
 		echo "<div class='event-list'>";
-        $heading = sprintf(
-                // translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
-                _n('Upcoming %1$s', 'Upcoming %2$s', 'TouchPoint-WP'),
-                TouchPointWP::instance()->settings->mc_name_singular,
-                TouchPointWP::instance()->settings->mc_name_plural
-        );
-        echo "<h3>$heading</h3>";
+		$heading = sprintf(
+		// translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
+			_n('Upcoming %1$s', 'Upcoming %2$s', 'TouchPoint-WP'),
+			TouchPointWP::instance()->settings->mc_name_singular,
+			TouchPointWP::instance()->settings->mc_name_plural
+		);
+		echo "<h3>$heading</h3>";
 	}
 	foreach ($meetings as $post) {
 		/** @var WP_Post $post */
diff --git a/src/templates/partner-single.php b/src/templates/partner-single.php
index efda5cd3..0c3c6145 100644
--- a/src/templates/partner-single.php
+++ b/src/templates/partner-single.php
@@ -16,6 +16,16 @@
 ?>
 
 <header class="archive-header has-text-align-center header-footer-group">
+	<?php
+	$image = get_the_post_thumbnail_url($pst, 'full');
+	$imageAlt = esc_html(get_the_post_thumbnail_caption($pst));
+	if ($image) {
+		echo "<div class=\"header-image-container partner-header-image\" style=\"background-image: url('$image');\">";
+		echo "<img src='$image' alt='$imageAlt' class='partner-header-image tp-header-image'>";
+		echo "</div>";
+	}
+	?>
+
     <div class="archive-header-inner section-inner medium">
         <h1 class="archive-title page-title"><?php echo the_title() ?></h1>
     </div>

From 43dd4c508bc8dfeb02628879fcc1ed6c6c332824 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Jun 2024 22:40:13 -0400
Subject: [PATCH 149/423] Bug with Meeting images

---
 src/TouchPoint-WP/EventsCalendar.php | 2 +-
 src/TouchPoint-WP/Meeting.php        | 5 ++++-
 src/TouchPoint-WP/TouchPointWP.php   | 4 ++--
 src/templates/involvement-single.php | 1 +
 src/templates/partner-single.php     | 5 +++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 8ef17c14..5f9e59a3 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -310,7 +310,7 @@ protected static function generateEventsListFromMeetings(array $params = []): ar
 			$eO['all_day'] = $e->isAllDay();
 
 			// Android
-			$eO['image'] = get_the_post_thumbnail_url($eQ->ID, 'large');
+			$eO['image'] = get_the_post_thumbnail_url($eQ, 'large');
 			// iOS
 			$eO['RelatedImageFileKey'] = $eO['image'];
 
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index bfe2a043..ed821630 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -282,6 +282,8 @@ public function involvement(): Involvement
 	 *
 	 * Returns null if there is no parent.
 	 *
+	 * In cases where a meeting post is also an involvement post, it will return the involvement, which has the same post_id.
+	 *
 	 * @return ?Involvement
 	 */
 	public function getParent(): ?Involvement
@@ -498,7 +500,8 @@ public static function filterThumbnailId(int|false $thumbnail_id, int|WP_Post|nu
 			return $thumbnail_id;
 		}
 
-		if (!self::postIsType($post)) { // Not our problem
+		if (!self::postIsType($post) || Involvement::postIsType($post)) {
+			// Second condition is necessary to prevent loops when meeting post == involvement post
 			return $thumbnail_id;
 		}
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 0f8d5e29..6cdee532 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1110,8 +1110,8 @@ public function reverseGeocode(float $lat, float $lng, bool $includeIpLoc = true
 				}
 
 				return new Geo(
-					$out['lat'],
-					$out['lng'],
+					$lat,
+					$lng,
 					$human,
 					'nav',
 				);
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 81f3ebe1..5fecfca2 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -22,6 +22,7 @@
 <header class="archive-header has-text-align-center header-footer-group">
     <?php
     $image = get_the_post_thumbnail_url($p, 'full');
+    $image = $image ? esc_url($image) : false;
     $imageAlt = esc_html(get_the_post_thumbnail_caption($p));
     if ($image) {
         echo "<div class=\"header-image-container\" style=\"background-image: url('$image');\">";
diff --git a/src/templates/partner-single.php b/src/templates/partner-single.php
index 0c3c6145..28762c0a 100644
--- a/src/templates/partner-single.php
+++ b/src/templates/partner-single.php
@@ -18,10 +18,11 @@
 <header class="archive-header has-text-align-center header-footer-group">
 	<?php
 	$image = get_the_post_thumbnail_url($pst, 'full');
+	$image = $image ? esc_url($image) : false;
 	$imageAlt = esc_html(get_the_post_thumbnail_caption($pst));
 	if ($image) {
-		echo "<div class=\"header-image-container partner-header-image\" style=\"background-image: url('$image');\">";
-		echo "<img src='$image' alt='$imageAlt' class='partner-header-image tp-header-image'>";
+		echo "<div class=\"header-image-container\" style=\"background-image: url('$image');\">";
+		echo "<img src='$image' alt='$imageAlt' class='involvement-header-image tp-header-image'>";
 		echo "</div>";
 	}
 	?>

From 1bdea38a746e655ff69d99c2930ab0c44337967b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Jun 2024 22:41:16 -0400
Subject: [PATCH 150/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 254 +++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 256 ++++++++++++++++++------------------
 2 files changed, 255 insertions(+), 255 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index a5571e49..d8a4c0df 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:599
+#: src/TouchPoint-WP/Meeting.php:662
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1759
+#: src/TouchPoint-WP/Involvement.php:1788
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1785
+#: src/TouchPoint-WP/Involvement.php:1814
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +173,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2005
+#: src/TouchPoint-WP/Involvement.php:2034
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -208,80 +208,80 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:488
+#: src/TouchPoint-WP/Involvement.php:489
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:493
+#: src/TouchPoint-WP/Involvement.php:494
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:500
+#: src/TouchPoint-WP/Involvement.php:501
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:506
+#: src/TouchPoint-WP/Involvement.php:507
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1634
+#: src/TouchPoint-WP/Involvement.php:1663
 #: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1842
+#: src/TouchPoint-WP/Involvement.php:1871
 #: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3460
+#: src/TouchPoint-WP/Involvement.php:3489
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3492
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3538
+#: src/TouchPoint-WP/Involvement.php:3569
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3606
-#: src/TouchPoint-WP/Involvement.php:3646
+#: src/TouchPoint-WP/Involvement.php:3638
+#: src/TouchPoint-WP/Involvement.php:3680
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3611
+#: src/TouchPoint-WP/Involvement.php:3643
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3615
+#: src/TouchPoint-WP/Involvement.php:3647
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3620
+#: src/TouchPoint-WP/Involvement.php:3652
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3623
+#: src/TouchPoint-WP/Involvement.php:3655
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3626
+#: src/TouchPoint-WP/Involvement.php:3658
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3629
+#: src/TouchPoint-WP/Involvement.php:3661
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3637
+#: src/TouchPoint-WP/Involvement.php:3671
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3555
+#: src/TouchPoint-WP/Involvement.php:3586
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -307,44 +307,44 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:598
-#: src/TouchPoint-WP/Meeting.php:618
+#: src/TouchPoint-WP/Meeting.php:661
+#: src/TouchPoint-WP/Meeting.php:681
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1946
+#: src/TouchPoint-WP/TouchPointWP.php:1947
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2003
+#: src/TouchPoint-WP/TouchPointWP.php:2004
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2006
+#: src/TouchPoint-WP/TouchPointWP.php:2007
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2009
+#: src/TouchPoint-WP/TouchPointWP.php:2010
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2014
 #: src/TouchPoint-WP/TouchPointWP.php:2015
+#: src/TouchPoint-WP/TouchPointWP.php:2016
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2132
-#: src/TouchPoint-WP/TouchPointWP.php:2168
+#: src/TouchPoint-WP/TouchPointWP.php:2133
+#: src/TouchPoint-WP/TouchPointWP.php:2169
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2182
-#: src/TouchPoint-WP/TouchPointWP.php:2226
+#: src/TouchPoint-WP/TouchPointWP.php:2183
+#: src/TouchPoint-WP/TouchPointWP.php:2227
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2358
+#: src/TouchPoint-WP/TouchPointWP.php:2359
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -808,7 +808,7 @@ msgid "Save Settings"
 msgstr "Guardar ajustes"
 
 #: src/TouchPoint-WP/Person.php:1446
-#: src/TouchPoint-WP/Utilities.php:251
+#: src/TouchPoint-WP/Utilities.php:265
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
@@ -971,7 +971,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2299
+#: src/TouchPoint-WP/TouchPointWP.php:2300
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1026,85 +1026,85 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1807
+#: src/TouchPoint-WP/Involvement.php:1836
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1820
+#: src/TouchPoint-WP/Involvement.php:1849
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1691
+#: src/TouchPoint-WP/Involvement.php:1720
 msgid "Genders"
 msgstr "Géneros"
 
-#: src/TouchPoint-WP/Utilities.php:107
+#: src/TouchPoint-WP/Utilities.php:121
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr "los domingos"
 
-#: src/TouchPoint-WP/Utilities.php:108
+#: src/TouchPoint-WP/Utilities.php:122
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr "los lunes"
 
-#: src/TouchPoint-WP/Utilities.php:109
+#: src/TouchPoint-WP/Utilities.php:123
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr "los martes"
 
-#: src/TouchPoint-WP/Utilities.php:110
+#: src/TouchPoint-WP/Utilities.php:124
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr "los miércoles"
 
-#: src/TouchPoint-WP/Utilities.php:111
+#: src/TouchPoint-WP/Utilities.php:125
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr "los jueves"
 
-#: src/TouchPoint-WP/Utilities.php:112
+#: src/TouchPoint-WP/Utilities.php:126
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr "los viernes"
 
-#: src/TouchPoint-WP/Utilities.php:113
+#: src/TouchPoint-WP/Utilities.php:127
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr "los sábados"
 
-#: src/TouchPoint-WP/Utilities.php:159
+#: src/TouchPoint-WP/Utilities.php:173
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr "Dom"
 
-#: src/TouchPoint-WP/Utilities.php:160
+#: src/TouchPoint-WP/Utilities.php:174
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr "Lun"
 
-#: src/TouchPoint-WP/Utilities.php:161
+#: src/TouchPoint-WP/Utilities.php:175
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr "Mar"
 
-#: src/TouchPoint-WP/Utilities.php:162
+#: src/TouchPoint-WP/Utilities.php:176
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr "Mié"
 
-#: src/TouchPoint-WP/Utilities.php:163
+#: src/TouchPoint-WP/Utilities.php:177
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr "Jue"
 
-#: src/TouchPoint-WP/Utilities.php:164
+#: src/TouchPoint-WP/Utilities.php:178
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr "Vie"
 
-#: src/TouchPoint-WP/Utilities.php:165
+#: src/TouchPoint-WP/Utilities.php:179
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
@@ -1162,106 +1162,106 @@ msgstr "Ubicaciones"
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
-#: src/TouchPoint-WP/Utilities.php:207
+#: src/TouchPoint-WP/Utilities.php:221
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr "Tarde en la noche"
 
-#: src/TouchPoint-WP/Utilities.php:209
+#: src/TouchPoint-WP/Utilities.php:223
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr "Madrugada"
 
-#: src/TouchPoint-WP/Utilities.php:211
+#: src/TouchPoint-WP/Utilities.php:225
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr "Mañana"
 
-#: src/TouchPoint-WP/Utilities.php:213
+#: src/TouchPoint-WP/Utilities.php:227
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr "Mediodía"
 
-#: src/TouchPoint-WP/Utilities.php:215
+#: src/TouchPoint-WP/Utilities.php:229
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: src/TouchPoint-WP/Utilities.php:217
+#: src/TouchPoint-WP/Utilities.php:231
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr "Tardecita"
 
-#: src/TouchPoint-WP/Utilities.php:219
+#: src/TouchPoint-WP/Utilities.php:233
 msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1808
+#: src/TouchPoint-WP/Involvement.php:1837
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1809
+#: src/TouchPoint-WP/Involvement.php:1838
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1850
+#: src/TouchPoint-WP/Involvement.php:1879
 #: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1853
+#: src/TouchPoint-WP/Involvement.php:1882
 #: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:931
 #: src/TouchPoint-WP/Involvement.php:960
-#: src/TouchPoint-WP/Involvement.php:1035
-#: src/TouchPoint-WP/Involvement.php:1057
-#: src/TouchPoint-WP/Utilities/DateFormats.php:265
-#: src/TouchPoint-WP/Utilities/DateFormats.php:328
+#: src/TouchPoint-WP/Involvement.php:989
+#: src/TouchPoint-WP/Involvement.php:1064
+#: src/TouchPoint-WP/Involvement.php:1086
+#: src/TouchPoint-WP/Utilities/DateFormats.php:282
+#: src/TouchPoint-WP/Utilities/DateFormats.php:345
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:969
+#: src/TouchPoint-WP/Involvement.php:998
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:976
+#: src/TouchPoint-WP/Involvement.php:1005
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:986
+#: src/TouchPoint-WP/Involvement.php:1015
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:992
+#: src/TouchPoint-WP/Involvement.php:1021
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1001
+#: src/TouchPoint-WP/Involvement.php:1030
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1007
+#: src/TouchPoint-WP/Involvement.php:1036
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3481
+#: src/TouchPoint-WP/Involvement.php:3510
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1278,35 +1278,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1946
+#: src/TouchPoint-WP/Involvement.php:1975
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1956
+#: src/TouchPoint-WP/Involvement.php:1985
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:1975
+#: src/TouchPoint-WP/Involvement.php:2004
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:531
-#: src/TouchPoint-WP/TouchPointWP.php:969
+#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/TouchPointWP.php:970
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:559
+#: src/TouchPoint-WP/Meeting.php:622
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:569
+#: src/TouchPoint-WP/Meeting.php:632
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3740
-#: src/TouchPoint-WP/Involvement.php:3837
+#: src/TouchPoint-WP/Involvement.php:3776
+#: src/TouchPoint-WP/Involvement.php:3873
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1426,7 +1426,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1734
+#: src/TouchPoint-WP/Involvement.php:1763
 msgid "Language"
 msgstr "Idioma"
 
@@ -1479,7 +1479,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3824
+#: src/TouchPoint-WP/Involvement.php:3860
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1504,7 +1504,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3814
+#: src/TouchPoint-WP/Involvement.php:3850
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1514,12 +1514,12 @@ msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:207
+#: src/TouchPoint-WP/Meeting.php:211
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:208
+#: src/TouchPoint-WP/Meeting.php:212
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1569,18 +1569,18 @@ msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones dis
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:101
-#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+#: src/TouchPoint-WP/Utilities/DateFormats.php:118
+#: src/TouchPoint-WP/Utilities/DateFormats.php:190
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:103
-#: src/TouchPoint-WP/Utilities/DateFormats.php:175
+#: src/TouchPoint-WP/Utilities/DateFormats.php:120
+#: src/TouchPoint-WP/Utilities/DateFormats.php:192
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:109
-#: src/TouchPoint-WP/Utilities/DateFormats.php:181
+#: src/TouchPoint-WP/Utilities/DateFormats.php:126
+#: src/TouchPoint-WP/Utilities/DateFormats.php:198
 msgid "Tomorrow"
 msgstr "mañana"
 
@@ -1588,38 +1588,38 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:458
+#: src/TouchPoint-WP/Utilities.php:472
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:451
+#: src/TouchPoint-WP/Meeting.php:477
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:452
+#: src/TouchPoint-WP/Meeting.php:478
 msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:126
+#: src/TouchPoint-WP/Utilities/DateFormats.php:143
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:132
+#: src/TouchPoint-WP/Utilities/DateFormats.php:149
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:155
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:143
+#: src/TouchPoint-WP/Utilities/DateFormats.php:160
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -1630,16 +1630,16 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3567
+#: src/TouchPoint-WP/Involvement.php:3598
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:331
+#: src/TouchPoint-WP/Meeting.php:355
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:396
+#: src/TouchPoint-WP/Meeting.php:422
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1684,96 +1684,96 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:116
+#: src/TouchPoint-WP/Utilities/DateFormats.php:133
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:117
+#: src/TouchPoint-WP/Utilities/DateFormats.php:134
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:119
+#: src/TouchPoint-WP/Utilities/DateFormats.php:136
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:120
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:453
+#: src/TouchPoint-WP/Meeting.php:479
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:133
+#: src/TouchPoint-WP/Involvement.php:134
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:934
-#: src/TouchPoint-WP/Involvement.php:955
+#: src/TouchPoint-WP/Involvement.php:963
+#: src/TouchPoint-WP/Involvement.php:984
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:87
+#: src/TouchPoint-WP/Meeting.php:88
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
 #. translators: %1$s is the start time, %2$s is the end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:71
-#: src/TouchPoint-WP/Utilities/DateFormats.php:307
+#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+#: src/TouchPoint-WP/Utilities/DateFormats.php:324
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:188
+#: src/TouchPoint-WP/Utilities/DateFormats.php:205
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:189
+#: src/TouchPoint-WP/Utilities/DateFormats.php:206
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr "j M"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:191
+#: src/TouchPoint-WP/Utilities/DateFormats.php:208
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:192
+#: src/TouchPoint-WP/Utilities/DateFormats.php:209
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:341
+#: src/TouchPoint-WP/Utilities/DateFormats.php:358
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:198
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:204
+#: src/TouchPoint-WP/Utilities/DateFormats.php:221
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:210
+#: src/TouchPoint-WP/Utilities/DateFormats.php:227
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+#: src/TouchPoint-WP/Utilities/DateFormats.php:232
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 8fb1a788..70331673 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-26T03:42:49+00:00\n"
+"POT-Creation-Date: 2024-06-28T02:40:31+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:599
+#: src/TouchPoint-WP/Meeting.php:662
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -158,13 +158,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1759
+#: src/TouchPoint-WP/Involvement.php:1788
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1785
+#: src/TouchPoint-WP/Involvement.php:1814
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -247,14 +247,14 @@ msgid "The Campus"
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:207
+#: src/TouchPoint-WP/Meeting.php:211
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2005
+#: src/TouchPoint-WP/Involvement.php:2034
 msgid "No %s Found."
 msgstr ""
 
@@ -265,7 +265,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3481
+#: src/TouchPoint-WP/Involvement.php:3510
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -306,253 +306,253 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:133
+#: src/TouchPoint-WP/Involvement.php:134
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:488
+#: src/TouchPoint-WP/Involvement.php:489
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:493
+#: src/TouchPoint-WP/Involvement.php:494
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:500
+#: src/TouchPoint-WP/Involvement.php:501
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:506
+#: src/TouchPoint-WP/Involvement.php:507
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:931
 #: src/TouchPoint-WP/Involvement.php:960
-#: src/TouchPoint-WP/Involvement.php:1035
-#: src/TouchPoint-WP/Involvement.php:1057
-#: src/TouchPoint-WP/Utilities/DateFormats.php:265
-#: src/TouchPoint-WP/Utilities/DateFormats.php:328
+#: src/TouchPoint-WP/Involvement.php:989
+#: src/TouchPoint-WP/Involvement.php:1064
+#: src/TouchPoint-WP/Involvement.php:1086
+#: src/TouchPoint-WP/Utilities/DateFormats.php:282
+#: src/TouchPoint-WP/Utilities/DateFormats.php:345
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:934
-#: src/TouchPoint-WP/Involvement.php:955
+#: src/TouchPoint-WP/Involvement.php:963
+#: src/TouchPoint-WP/Involvement.php:984
 msgid "%1$s All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:969
+#: src/TouchPoint-WP/Involvement.php:998
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:976
+#: src/TouchPoint-WP/Involvement.php:1005
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:986
+#: src/TouchPoint-WP/Involvement.php:1015
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:992
+#: src/TouchPoint-WP/Involvement.php:1021
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1001
+#: src/TouchPoint-WP/Involvement.php:1030
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1007
+#: src/TouchPoint-WP/Involvement.php:1036
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1634
+#: src/TouchPoint-WP/Involvement.php:1663
 #: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1691
+#: src/TouchPoint-WP/Involvement.php:1720
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1734
+#: src/TouchPoint-WP/Involvement.php:1763
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1807
+#: src/TouchPoint-WP/Involvement.php:1836
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1808
+#: src/TouchPoint-WP/Involvement.php:1837
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1809
+#: src/TouchPoint-WP/Involvement.php:1838
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1820
+#: src/TouchPoint-WP/Involvement.php:1849
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1842
+#: src/TouchPoint-WP/Involvement.php:1871
 #: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1850
+#: src/TouchPoint-WP/Involvement.php:1879
 #: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1853
+#: src/TouchPoint-WP/Involvement.php:1882
 #: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1946
+#: src/TouchPoint-WP/Involvement.php:1975
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1956
+#: src/TouchPoint-WP/Involvement.php:1985
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1975
+#: src/TouchPoint-WP/Involvement.php:2004
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3460
+#: src/TouchPoint-WP/Involvement.php:3489
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3463
+#: src/TouchPoint-WP/Involvement.php:3492
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3538
+#: src/TouchPoint-WP/Involvement.php:3569
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3555
+#: src/TouchPoint-WP/Involvement.php:3586
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3567
+#: src/TouchPoint-WP/Involvement.php:3598
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3606
-#: src/TouchPoint-WP/Involvement.php:3646
+#: src/TouchPoint-WP/Involvement.php:3638
+#: src/TouchPoint-WP/Involvement.php:3680
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3611
+#: src/TouchPoint-WP/Involvement.php:3643
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3615
+#: src/TouchPoint-WP/Involvement.php:3647
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3620
+#: src/TouchPoint-WP/Involvement.php:3652
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3623
+#: src/TouchPoint-WP/Involvement.php:3655
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3626
+#: src/TouchPoint-WP/Involvement.php:3658
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3629
+#: src/TouchPoint-WP/Involvement.php:3661
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3637
+#: src/TouchPoint-WP/Involvement.php:3671
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3740
-#: src/TouchPoint-WP/Involvement.php:3837
+#: src/TouchPoint-WP/Involvement.php:3776
+#: src/TouchPoint-WP/Involvement.php:3873
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3814
+#: src/TouchPoint-WP/Involvement.php:3850
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3824
+#: src/TouchPoint-WP/Involvement.php:3860
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:87
+#: src/TouchPoint-WP/Meeting.php:88
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:208
+#: src/TouchPoint-WP/Meeting.php:212
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:331
+#: src/TouchPoint-WP/Meeting.php:355
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:396
+#: src/TouchPoint-WP/Meeting.php:422
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:451
+#: src/TouchPoint-WP/Meeting.php:477
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:452
+#: src/TouchPoint-WP/Meeting.php:478
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:453
+#: src/TouchPoint-WP/Meeting.php:479
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:531
-#: src/TouchPoint-WP/TouchPointWP.php:969
+#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/TouchPointWP.php:970
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:559
+#: src/TouchPoint-WP/Meeting.php:622
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:569
+#: src/TouchPoint-WP/Meeting.php:632
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:598
-#: src/TouchPoint-WP/Meeting.php:618
+#: src/TouchPoint-WP/Meeting.php:661
+#: src/TouchPoint-WP/Meeting.php:681
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Person in %s"
 msgstr ""
 
 #: src/TouchPoint-WP/Person.php:1446
-#: src/TouchPoint-WP/Utilities.php:251
+#: src/TouchPoint-WP/Utilities.php:265
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
@@ -710,42 +710,42 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1946
+#: src/TouchPoint-WP/TouchPointWP.php:1947
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2003
+#: src/TouchPoint-WP/TouchPointWP.php:2004
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2006
+#: src/TouchPoint-WP/TouchPointWP.php:2007
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2009
+#: src/TouchPoint-WP/TouchPointWP.php:2010
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2014
 #: src/TouchPoint-WP/TouchPointWP.php:2015
+#: src/TouchPoint-WP/TouchPointWP.php:2016
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2132
-#: src/TouchPoint-WP/TouchPointWP.php:2168
+#: src/TouchPoint-WP/TouchPointWP.php:2133
+#: src/TouchPoint-WP/TouchPointWP.php:2169
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2182
-#: src/TouchPoint-WP/TouchPointWP.php:2226
+#: src/TouchPoint-WP/TouchPointWP.php:2183
+#: src/TouchPoint-WP/TouchPointWP.php:2227
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2299
+#: src/TouchPoint-WP/TouchPointWP.php:2300
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2358
+#: src/TouchPoint-WP/TouchPointWP.php:2359
 msgid "People Query Failed"
 msgstr ""
 
@@ -1382,226 +1382,226 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:107
+#: src/TouchPoint-WP/Utilities.php:121
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:108
+#: src/TouchPoint-WP/Utilities.php:122
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:109
+#: src/TouchPoint-WP/Utilities.php:123
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:110
+#: src/TouchPoint-WP/Utilities.php:124
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:111
+#: src/TouchPoint-WP/Utilities.php:125
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:112
+#: src/TouchPoint-WP/Utilities.php:126
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:113
+#: src/TouchPoint-WP/Utilities.php:127
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:159
+#: src/TouchPoint-WP/Utilities.php:173
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:160
+#: src/TouchPoint-WP/Utilities.php:174
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:161
+#: src/TouchPoint-WP/Utilities.php:175
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:162
+#: src/TouchPoint-WP/Utilities.php:176
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:163
+#: src/TouchPoint-WP/Utilities.php:177
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:164
+#: src/TouchPoint-WP/Utilities.php:178
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:165
+#: src/TouchPoint-WP/Utilities.php:179
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:207
+#: src/TouchPoint-WP/Utilities.php:221
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:209
+#: src/TouchPoint-WP/Utilities.php:223
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:211
+#: src/TouchPoint-WP/Utilities.php:225
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:213
+#: src/TouchPoint-WP/Utilities.php:227
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:215
+#: src/TouchPoint-WP/Utilities.php:229
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:217
+#: src/TouchPoint-WP/Utilities.php:231
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:219
+#: src/TouchPoint-WP/Utilities.php:233
 msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:458
+#: src/TouchPoint-WP/Utilities.php:472
 msgid "Expand"
 msgstr ""
 
 #. translators: %1$s is the start time, %2$s is the end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:71
-#: src/TouchPoint-WP/Utilities/DateFormats.php:307
+#: src/TouchPoint-WP/Utilities/DateFormats.php:88
+#: src/TouchPoint-WP/Utilities/DateFormats.php:324
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:101
-#: src/TouchPoint-WP/Utilities/DateFormats.php:173
+#: src/TouchPoint-WP/Utilities/DateFormats.php:118
+#: src/TouchPoint-WP/Utilities/DateFormats.php:190
 msgid "Tonight"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:103
-#: src/TouchPoint-WP/Utilities/DateFormats.php:175
+#: src/TouchPoint-WP/Utilities/DateFormats.php:120
+#: src/TouchPoint-WP/Utilities/DateFormats.php:192
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:109
-#: src/TouchPoint-WP/Utilities/DateFormats.php:181
+#: src/TouchPoint-WP/Utilities/DateFormats.php:126
+#: src/TouchPoint-WP/Utilities/DateFormats.php:198
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:116
+#: src/TouchPoint-WP/Utilities/DateFormats.php:133
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:117
+#: src/TouchPoint-WP/Utilities/DateFormats.php:134
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:119
+#: src/TouchPoint-WP/Utilities/DateFormats.php:136
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:120
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:126
+#: src/TouchPoint-WP/Utilities/DateFormats.php:143
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:132
+#: src/TouchPoint-WP/Utilities/DateFormats.php:149
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:155
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:143
+#: src/TouchPoint-WP/Utilities/DateFormats.php:160
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:188
+#: src/TouchPoint-WP/Utilities/DateFormats.php:205
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:189
+#: src/TouchPoint-WP/Utilities/DateFormats.php:206
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:191
+#: src/TouchPoint-WP/Utilities/DateFormats.php:208
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:192
+#: src/TouchPoint-WP/Utilities/DateFormats.php:209
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:198
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:204
+#: src/TouchPoint-WP/Utilities/DateFormats.php:221
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:210
+#: src/TouchPoint-WP/Utilities/DateFormats.php:227
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+#: src/TouchPoint-WP/Utilities/DateFormats.php:232
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:341
+#: src/TouchPoint-WP/Utilities/DateFormats.php:358
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 

From 14aa405c4e77a1ad7d0e02acc27383d49770a198 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 28 Jun 2024 00:25:34 -0400
Subject: [PATCH 151/423] Resolving a spacing issue with header images.

---
 assets/template/partials-template-style.css | 14 +++++++++-----
 i18n/TouchPoint-WP.pot                      |  2 +-
 src/templates/involvement-single.php        |  8 +++++---
 src/templates/partner-single.php            |  8 +++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index 53b49baa..fcd92cc2 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -206,21 +206,25 @@ article .TouchPointWP-detail-cell .TouchPointWP-detail-cell-section {
 }
 
 header div.header-image-container {
-    max-width: 800px;
+    max-width: 1200px;
     width: 100%;
-    padding-top: 50%;
     margin-left: auto;
     margin-right: auto;
+}
+
+header div.header-image-container div.header-image {
+    width: 100%;
+    padding-bottom: 50%;
     background-size: cover;
     background-position: center;
-    overflow:hidden;
 }
 
-header div.header-image-container.partner-header-image {
+header div.header-image-container div.header-image.partner-header-image {
     background-size: contain;
+    background-repeat: no-repeat;
 }
 
-header div.header-image-container img {
+header img.tpwp-accessibility-header-image {
     /* visible to screen readers only */
     position: absolute;
     width: 1px;
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 70331673..f9c7c08d 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-28T02:40:31+00:00\n"
+"POT-Creation-Date: 2024-06-28T04:24:30+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 5fecfca2..ee526581 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -23,10 +23,12 @@
     <?php
     $image = get_the_post_thumbnail_url($p, 'full');
     $image = $image ? esc_url($image) : false;
-    $imageAlt = esc_html(get_the_post_thumbnail_caption($p));
+    $imageAlt = esc_html(get_post(get_post_thumbnail_id($p))->post_title);
     if ($image) {
-        echo "<div class=\"header-image-container\" style=\"background-image: url('$image');\">";
-        echo "<img src='$image' alt='$imageAlt' class='involvement-header-image tp-header-image'>";
+        echo "<div class=\"header-image-container\">";
+        echo "<div class=\"header-image involvement-header-image\" style=\"background-image: url('$image');\">";
+        echo "<img src='$image' alt='$imageAlt' class='tpwp-accessibility-header-image'>";
+        echo "</div>";
         echo "</div>";
     }
     ?>
diff --git a/src/templates/partner-single.php b/src/templates/partner-single.php
index 28762c0a..9f9c0ef6 100644
--- a/src/templates/partner-single.php
+++ b/src/templates/partner-single.php
@@ -19,10 +19,12 @@
 	<?php
 	$image = get_the_post_thumbnail_url($pst, 'full');
 	$image = $image ? esc_url($image) : false;
-	$imageAlt = esc_html(get_the_post_thumbnail_caption($pst));
+	$imageAlt = esc_html(get_post(get_post_thumbnail_id($pst))->post_title);
 	if ($image) {
-		echo "<div class=\"header-image-container\" style=\"background-image: url('$image');\">";
-		echo "<img src='$image' alt='$imageAlt' class='involvement-header-image tp-header-image'>";
+		echo "<div class=\"header-image-container\">";
+		echo "<div class=\"header-image partner-header-image\" style=\"background-image: url('$image');\">";
+		echo "<img src='$image' alt='$imageAlt' class='tpwp-accessibility-header-image'>";
+		echo "</div>";
 		echo "</div>";
 	}
 	?>

From c12e4fbfa1426b7ed3356ef39ba7bfdaf9270aac Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 28 Jun 2024 00:48:06 -0400
Subject: [PATCH 152/423] Resolving some build issues.

---
 .github/workflows/push.yml              | 27 +++++++++++++++++++++++++
 .idea/runConfigurations/Build__WSL_.xml |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/push.yml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
new file mode 100644
index 00000000..5b951b9b
--- /dev/null
+++ b/.github/workflows/push.yml
@@ -0,0 +1,27 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - "*"
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Permissions
+        run: chmod +x build.sh
+        shell: bash
+
+      - name: Build
+        run: ./build.sh
+        shell: bash
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: touchpoint-wp.zip
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build__WSL_.xml b/.idea/runConfigurations/Build__WSL_.xml
index 33c3c8ff..5805c68d 100644
--- a/.idea/runConfigurations/Build__WSL_.xml
+++ b/.idea/runConfigurations/Build__WSL_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build (WSL)" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="./build.sh" />
+    <option name="SCRIPT_TEXT" value="wsl bash ./build.sh" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />

From 0306de1d8068441cba8fb97e6842ea6421142bc9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 28 Jun 2024 00:49:55 -0400
Subject: [PATCH 153/423] forgot path

---
 .github/workflows/push.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 5b951b9b..2ea511d1 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -21,7 +21,8 @@ jobs:
         run: ./build.sh
         shell: bash
 
-      - name: Upload Artifact
+      - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: touchpoint-wp.zip
\ No newline at end of file
+          name: touchpoint-wp.zip
+          path: touchpoint-wp.zip
\ No newline at end of file

From 614c5f551c0c405af75f8902851917c01248c2cd Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 28 Jun 2024 00:55:17 -0400
Subject: [PATCH 154/423] action cleanup

---
 .github/workflows/push.yml     | 2 +-
 .github/workflows/releases.yml | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 2ea511d1..d7261742 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    name: Create Release
+    name: Create Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 4d3ebffc..5d75a89c 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -12,12 +12,15 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+
       - name: Permissions
         run: chmod +x build.sh
         shell: bash
+
       - name: Build
         run: ./build.sh
         shell: bash
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -28,6 +31,7 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: true
           prerelease: false
+
       - name: Publish Built zip
         uses: actions/upload-release-asset@v1
         env:
@@ -44,9 +48,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Permissions
-        run: chmod +x build.sh
-        shell: bash
+
       - name: Generate Docs
         run: php ./generateDocs.php
         shell: bash
\ No newline at end of file

From 3c867171e62e51da10609b6f6591a7adcea06127 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 23 Jul 2024 22:01:36 -0400
Subject: [PATCH 155/423] Adding email list link

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 21c64751..4cf68572 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 21c647510e2f7f2ba07bfb107edebe9a88e0e418
+Subproject commit 4cf685722223cd6fb72f1ff1627bc890c94fbaa5

From a0ab0f1228db93572bf282d0fb7a8ab7245afa9e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 4 Aug 2024 18:55:08 -0400
Subject: [PATCH 156/423] Adding indications that events are cancelled.

---
 src/TouchPoint-WP/Meeting.php        | 17 ++++++++++++++---
 src/templates/involvement-single.php | 20 ++++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index ed821630..32bbe118 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -41,6 +41,10 @@ class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchic
 	public const MEETING_STATUS_META_KEY = TouchPointWP::SETTINGS_PREFIX . "status";
 	public const MEETING_INV_ID_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgInvId";
 
+	public const STATUS_CANCELLED = "cancelled";
+	public const STATUS_SCHEDULED = "scheduled";
+	public const STATUS_UNKNOWN = "unknown";
+
 	// This is the same as the meta key for involvement locations.
 	public const MEETING_LOCATION_META_KEY = TouchPointWP::SETTINGS_PREFIX . "locationName";
 
@@ -350,9 +354,14 @@ public function notableAttributes(array $exclude = []): array
 
 		$attrs = [...$d, ...$attrs];
 
-		// Add an "in the past" label if the thing is already past. (end may be null)
-		if (($this->endDt ?? $this->startDt) < Utilities::dateTimeNow()) {
-			$attrs['past'] = __("In the Past", "TouchPoint-WP");
+		$status = $this->status_i18n(true);
+		if ($status) {
+			$attrs['status'] = $status;
+		} else {
+			// Add an "in the past" label if the thing is already past. (end may be null)
+			if (($this->endDt ?? $this->startDt) < Utilities::dateTimeNow()) {
+				$attrs['past'] = __("In the Past", "TouchPoint-WP");
+			}
 		}
 
 		$loc = $this->locationName();
@@ -360,6 +369,8 @@ public function notableAttributes(array $exclude = []): array
 			$attrs['location'] = $loc;
 		}
 
+
+
 		$attrs = $this->processAttributeExclusions($attrs, $exclude);
 
 		/**
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index ee526581..7cabd94a 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -36,6 +36,18 @@
     <div class="archive-header-inner section-inner medium">
         <h1 class="archive-title page-title"><?php echo the_title() ?></h1>
     </div>
+    <?php
+
+    if ($obj instanceof Meeting) {
+        if ($obj->status() === Meeting::STATUS_CANCELLED) {
+            echo "<div class='section-inner tpwp-alert-block'>";
+            _e('This meeting has been cancelled.', 'TouchPoint-WP');
+            echo "</div>";
+        }
+    }
+    
+    ?>
+
 </header>
 
 <article <?php post_class(); ?> id="post-<?php the_ID(); ?>" data-tp-involvement="<?php echo $p->ID ?>">
@@ -64,10 +76,10 @@
             </div>
         </div>
         <?php if ($settings->useGeo && $obj->hasGeo() !== null) { ?>
-        <div class="TouchPointWP-detail-cell TouchPointWP-map-container">
-            <!-- TODO this doesn't work for meetings. -->
-            <?php echo Involvement::mapShortcode() ?>
-        </div>
+            <div class="TouchPointWP-detail-cell TouchPointWP-map-container">
+                <!-- TODO this doesn't work for meetings. -->
+                <?php echo Involvement::mapShortcode() ?>
+            </div>
         <?php } ?>
     </div>
 </article>

From 0dd53df28175710b5dba8fa45d63f5509eab79c3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 5 Aug 2024 08:05:30 -0400
Subject: [PATCH 157/423] i18n updates

---
 i18n/TouchPoint-WP-es_ES.po | 33 +++++++++++++++++++--------------
 i18n/TouchPoint-WP.pot      | 35 ++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index d8a4c0df..3f76ac48 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:662
+#: src/TouchPoint-WP/Meeting.php:673
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -307,8 +307,8 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:661
-#: src/TouchPoint-WP/Meeting.php:681
+#: src/TouchPoint-WP/Meeting.php:672
+#: src/TouchPoint-WP/Meeting.php:692
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
@@ -1290,17 +1290,17 @@ msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográ
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/Meeting.php:605
 #: src/TouchPoint-WP/TouchPointWP.php:970
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:622
+#: src/TouchPoint-WP/Meeting.php:633
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:632
+#: src/TouchPoint-WP/Meeting.php:643
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
@@ -1514,12 +1514,12 @@ msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:211
+#: src/TouchPoint-WP/Meeting.php:215
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:212
+#: src/TouchPoint-WP/Meeting.php:216
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1592,11 +1592,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:477
+#: src/TouchPoint-WP/Meeting.php:488
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:478
+#: src/TouchPoint-WP/Meeting.php:489
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1634,12 +1634,12 @@ msgstr "%s esta cancelado."
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:355
+#: src/TouchPoint-WP/Meeting.php:363
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:422
+#: src/TouchPoint-WP/Meeting.php:433
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1704,7 +1704,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:479
+#: src/TouchPoint-WP/Meeting.php:490
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
@@ -1719,7 +1719,7 @@ msgstr "Aún no se admite la creación de un objeto de participación a partir d
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:88
+#: src/TouchPoint-WP/Meeting.php:92
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
@@ -1814,3 +1814,8 @@ msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:778
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
+
+#. translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
+#: src/templates/involvement-single.php:49
+msgid "This %1$s has been Cancelled."
+msgstr "Este %1$s ha sido Cancelado."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index f9c7c08d..4843c660 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-28T04:24:30+00:00\n"
+"POT-Creation-Date: 2024-08-05T12:03:46+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:268
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:662
+#: src/TouchPoint-WP/Meeting.php:673
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -246,8 +246,13 @@ msgstr ""
 msgid "The Campus"
 msgstr ""
 
+#. translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
+#: src/templates/involvement-single.php:49
+msgid "This %1$s has been Cancelled."
+msgstr ""
+
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:211
+#: src/TouchPoint-WP/Meeting.php:215
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
@@ -505,54 +510,54 @@ msgstr ""
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:88
+#: src/TouchPoint-WP/Meeting.php:92
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:212
+#: src/TouchPoint-WP/Meeting.php:216
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:355
+#: src/TouchPoint-WP/Meeting.php:363
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:422
+#: src/TouchPoint-WP/Meeting.php:433
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:477
+#: src/TouchPoint-WP/Meeting.php:488
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:478
+#: src/TouchPoint-WP/Meeting.php:489
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:479
+#: src/TouchPoint-WP/Meeting.php:490
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/Meeting.php:605
 #: src/TouchPoint-WP/TouchPointWP.php:970
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:622
+#: src/TouchPoint-WP/Meeting.php:633
 #: src/TouchPoint-WP/TouchPointWP.php:353
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:632
+#: src/TouchPoint-WP/Meeting.php:643
 #: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:661
-#: src/TouchPoint-WP/Meeting.php:681
+#: src/TouchPoint-WP/Meeting.php:672
+#: src/TouchPoint-WP/Meeting.php:692
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""

From 50754aa9af8995fe55f950b99b356852c56632b8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 6 Aug 2024 10:38:11 -0400
Subject: [PATCH 158/423] Updates to make it more obvious when an event is
 cancelled (did not meet is checked)

---
 assets/template/partials-template-style.css | 5 +++++
 i18n/TouchPoint-WP-es_ES.po                 | 6 +++---
 i18n/TouchPoint-WP.pot                      | 6 +++---
 src/templates/involvement-single.php        | 9 ++++++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index fcd92cc2..b24cd20d 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -234,4 +234,9 @@ header img.tpwp-accessibility-header-image {
     overflow: hidden;
     clip: rect(0, 0, 0, 0);
     border: 0;
+}
+header .tpwp-alert-block {
+    margin: 2em 20%;
+    background: #f003;
+    padding: 1em;
 }
\ No newline at end of file
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 3f76ac48..97400efb 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -1815,7 +1815,7 @@ msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
-#. translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/templates/involvement-single.php:49
-msgid "This %1$s has been Cancelled."
-msgstr "Este %1$s ha sido Cancelado."
+msgid "This %s has been Cancelled."
+msgstr "Este %s ha sido Cancelado."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 4843c660..b154ef0b 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-05T12:03:46+00:00\n"
+"POT-Creation-Date: 2024-08-06T14:10:40+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -246,9 +246,9 @@ msgstr ""
 msgid "The Campus"
 msgstr ""
 
-#. translators: %1$s is the singular name of the event type, %2$s is the plural name of the event type
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/templates/involvement-single.php:49
-msgid "This %1$s has been Cancelled."
+msgid "This %s has been Cancelled."
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 7cabd94a..5679af0c 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -41,7 +41,14 @@
     if ($obj instanceof Meeting) {
         if ($obj->status() === Meeting::STATUS_CANCELLED) {
             echo "<div class='section-inner tpwp-alert-block'>";
-            _e('This meeting has been cancelled.', 'TouchPoint-WP');
+
+            $meetingsCalled = $tps->mc_name_singular;
+
+            echo sprintf(
+                // Translators: %s is the singular name of the of a Meeting, such as "Event".
+                __('This %s has been Cancelled.', 'TouchPoint-WP'),
+                __($meetingsCalled) // deliberately no domain
+            );
             echo "</div>";
         }
     }

From 3fe1d1c846a4723a1f8390ff8e282cb2b3e00565 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 7 Aug 2024 17:04:33 -0400
Subject: [PATCH 159/423] Improvement to settings label based on questions from
 RockBridge

---
 src/TouchPoint-WP/CalendarGrid.php   |  2 +-
 src/TouchPoint-WP/Meeting.php        |  6 ++---
 src/templates/admin/invKoForm.php    | 33 ++++++++++++++++++++++++----
 src/templates/involvement-single.php |  2 +-
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index e97b21c8..0141694c 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -145,7 +145,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 					$attr = "";
 					$status = $m->status();
 
-					if ($status === "cancelled") {
+					if ($status === Meeting::STATUS_CANCELLED) {
 						// Translators: %s is the singular name of the of a Meeting, such as "Event".
 						$title = wp_sprintf(__("%s is cancelled.", "TouchPoint-WP"), TouchPointWP::instance()->settings->mc_name_singular);
 						$attr = "title=\"$title\"";
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 32bbe118..f6fb3278 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -468,9 +468,9 @@ public function status(): string
 		$status = intval(get_post_meta($this->post_id, self::MEETING_STATUS_META_KEY, true));
 
 		return match ($status) {
-			0 => "cancelled",
-			1 => "scheduled",
-			default => "unknown",
+			0 => self::STATUS_CANCELLED,
+			1 => self::STATUS_SCHEDULED,
+			default => self::STATUS_UNKNOWN,
 		};
 	}
 
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 291351e5..5ed1be59 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -162,12 +162,37 @@
         </tr>
         <tr>
             <th>
-                <?php _e("Default Filters", "TouchPoint-WP"); ?>
+                <?php
+
+                _e("Default Filters", "TouchPoint-WP");
+
+                $divisionsLabel = wp_sprintf(
+                        // Translators: %1$s is the user-provided name for Divisions.  %2$s is "Division" or translated equivalent.
+                        _x('%1$s (%2$s)', "TouchPoint-WP"),
+                        $this->get('dv_name_singular'),
+                        __("Division", "TouchPoint-WP")
+                    );
+
+                $resCodeLabel = wp_sprintf(
+                    // Translators: %1$s is the user-provided name for ResCode.  %2$s is "Resident Code" or translated equivalent.
+	                _x('%1$s (%2$s)', "TouchPoint-WP"),
+	                $this->get('rc_name_singular'),
+	                __("Resident Code", "TouchPoint-WP")
+                );
+
+                $campusLabel = wp_sprintf(
+                    // Translators: %1$s is the user-provided name for Campus.  %2$s is "Campus" or translated equivalent.
+	                _x('%1$s (%2$s)', "TouchPoint-WP"),
+	                $this->get('camp_name_singular'),
+	                __("Campus", "TouchPoint-WP")
+                );
+
+                ?>
             </th>
             <td colspan="2">
                 <p>
                     <input id="it-filt-div" type="checkbox" value="div" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-div'}" />
-                    <label for="it-filt-div" data-bind="attr: { for: 'it-' + slug() + '-filt-div'}"><?php echo $this->get('dv_name_singular') ?></label>
+                    <label for="it-filt-div" data-bind="attr: { for: 'it-' + slug() + '-filt-div'}"><?php echo $divisionsLabel ?></label>
                 </p>
                 <p>
                     <input id="it-filt-genderId" type="checkbox" value="genderId" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-genderId'}" />
@@ -175,12 +200,12 @@
                 </p>
                 <p data-bind="visible: useGeo">
                     <input id="it-filt-rescode" type="checkbox" value="rescode" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-rescode'}" />
-                    <label for="it-filt-rescode" data-bind="attr: { for: 'it-' + slug() + '-filt-rescode'}"><?php echo $this->get('rc_name_singular') ?></label>
+                    <label for="it-filt-rescode" data-bind="attr: { for: 'it-' + slug() + '-filt-rescode'}"><?php echo $resCodeLabel ?></label>
                 </p>
                 <?php if ($this->get('enable_campuses') === "on") { ?>
                 <p>
                     <input id="it-filt-campus" type="checkbox" value="campus" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-campus'}" />
-                    <label for="it-filt-campus" data-bind="attr: { for: 'it-' + slug() + '-filt-campus'}"><?php echo $this->get('camp_name_singular') ?></label>
+                    <label for="it-filt-campus" data-bind="attr: { for: 'it-' + slug() + '-filt-campus'}"><?php echo $campusLabel ?></label>
                 </p>
                 <?php } ?>
                 <p>
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 5679af0c..399c5f7c 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -44,7 +44,7 @@
 
             $meetingsCalled = $tps->mc_name_singular;
 
-            echo sprintf(
+            echo wp_sprintf(
                 // Translators: %s is the singular name of the of a Meeting, such as "Event".
                 __('This %s has been Cancelled.', 'TouchPoint-WP'),
                 __($meetingsCalled) // deliberately no domain

From 5a58b5082359b1f23b3cd6c67bc4ac688220694c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Aug 2024 16:01:39 -0400
Subject: [PATCH 160/423] Changing oxford commas to not appear with ampersands.
  Related to #194.

---
 src/TouchPoint-WP/Person.php    | 11 ++++++-----
 src/TouchPoint-WP/Utilities.php |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index ff14488a..c72adb39 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1435,19 +1435,20 @@ public static function arrangeNamesForPeople($people, bool $asLink = false, int
 		$familyNames = [];
 		$comma       = ', ';
 		$and         = ' & ';
-		$useOxford   = false;
+		$useOxford   = 0;
 		foreach ($people as $family) {
 			$fn = self::formatNamesForFamily($family, $asLink);
-			if (strpos($fn, ', ') !== false) {
+			if (str_contains($fn, ', ')) {
 				$comma     = '; ';
-				$useOxford = true;
+				$useOxford = $useOxford | 1;
 			}
-			if (strpos($fn, ' & ') !== false) {
+			if (str_contains($fn, ' & ')) {
 				$and       = ' ' . __('and', 'TouchPoint-WP') . ' ';
-				$useOxford = true;
+				$useOxford = $useOxford | 2;
 			}
 			$familyNames[] = $fn;
 		}
+		$useOxford = $useOxford === 3;
 		if ($andOthers) {
 			$last = _x("others", "list of people, and *others*", "TouchPoint-WP");
 		} else {
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 90249c83..93d54a40 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -256,16 +256,17 @@ public static function stringArrayToListString(array $strings): string
 
 		$comma     = ', ';
 		$and       = ' & ';
-		$useOxford = false;
+		$useOxford = 0;
 		if (str_contains($concat, ', ')) {
 			$comma     = '; ';
-			$useOxford = true;
+			$useOxford = $useOxford | 1;
 		}
 		if (str_contains($concat, ' & ')) {
 			$and       = ' ' . __('and', 'TouchPoint-WP') . ' ';
-			$useOxford = true;
+			$useOxford = $useOxford | 2;
 		}
 
+		$useOxford = $useOxford === 3;
 		$last = array_pop($strings);
 		$str  = implode($comma, $strings);
 		if (count($strings) > 0) {

From 34ff76c997cc75e9c90c0b6f6569f45181432690 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Aug 2024 16:15:27 -0400
Subject: [PATCH 161/423] Changing my mind about oxford commas again.

---
 src/TouchPoint-WP/Person.php    | 7 +++----
 src/TouchPoint-WP/Utilities.php | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index c72adb39..719cf8b4 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1435,20 +1435,19 @@ public static function arrangeNamesForPeople($people, bool $asLink = false, int
 		$familyNames = [];
 		$comma       = ', ';
 		$and         = ' & ';
-		$useOxford   = 0;
+		$useOxford   = false;
 		foreach ($people as $family) {
 			$fn = self::formatNamesForFamily($family, $asLink);
 			if (str_contains($fn, ', ')) {
 				$comma     = '; ';
-				$useOxford = $useOxford | 1;
 			}
 			if (str_contains($fn, ' & ')) {
 				$and       = ' ' . __('and', 'TouchPoint-WP') . ' ';
-				$useOxford = $useOxford | 2;
+				$useOxford = true;
 			}
 			$familyNames[] = $fn;
 		}
-		$useOxford = $useOxford === 3;
+
 		if ($andOthers) {
 			$last = _x("others", "list of people, and *others*", "TouchPoint-WP");
 		} else {
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 93d54a40..6fb439a6 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -256,17 +256,15 @@ public static function stringArrayToListString(array $strings): string
 
 		$comma     = ', ';
 		$and       = ' & ';
-		$useOxford = 0;
+		$useOxford = false;
 		if (str_contains($concat, ', ')) {
 			$comma     = '; ';
-			$useOxford = $useOxford | 1;
 		}
 		if (str_contains($concat, ' & ')) {
 			$and       = ' ' . __('and', 'TouchPoint-WP') . ' ';
-			$useOxford = $useOxford | 2;
+			$useOxford = true;
 		}
 
-		$useOxford = $useOxford === 3;
 		$last = array_pop($strings);
 		$str  = implode($comma, $strings);
 		if (count($strings) > 0) {

From a497fce9c535eb3ee93755b41a97724e5fd0321a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Aug 2024 17:08:01 -0400
Subject: [PATCH 162/423] Breaking schedule strings into parts for most
 Involvement situations.  Makes more complicated schedules a lot easier to
 read. Closes #194.

---
 src/TouchPoint-WP/Involvement.php | 160 ++++++++++++++++++------------
 src/TouchPoint-WP/Meeting.php     |   2 +-
 2 files changed, 98 insertions(+), 64 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 06d403be..b9e9f06a 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -78,7 +78,7 @@ class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo
 	protected ?DateTimeExtended $_nextMeeting;
 	protected ?DateTimeExtended $firstMeeting = null;
 	protected ?DateTimeExtended $lastMeeting = null;
-	protected ?string $_scheduleString;
+	protected ?array $_scheduleStrings = null;
 	protected ?array $_meetings = null;
 	protected ?array $_schedules = null;
 	protected PersonArray $_leaders;
@@ -697,20 +697,20 @@ public function getParent(): ?Involvement
 	protected ?self $parentObject = null;
 
 	/**
-	 * Get a description of the meeting schedule in a human-friendly phrase, e.g. Sundays at 11:00am, starting January
-	 * 14.
-	 *
-	 * This is separated out to a static method to prevent involvement from being instantiated (with those database
-	 * hits) when the content is cached.  (10x faster or more)
+	 * Get the several different strings that can be used to describe the start/end/etc of this involvement.
 	 *
 	 * @param int           $invId
 	 * @param ?Involvement  $inv
 	 *
-	 * @return ?string
+	 * @return ?string[]
 	 */
-	public static function scheduleString(int $invId, $inv = null): ?string
+	protected static function scheduleStrings(int $invId, $inv = null): ?array
 	{
-		$cacheKey = $invId . "_" . get_locale();
+		if (isset($inv->_scheduleStrings)) {
+			return $inv->_scheduleStrings;
+		}
+
+		$cacheKey = $invId . "_" . get_locale() . "_v2";
 		$schStr = wp_cache_get($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP);
 		if (!! $schStr) {
 			return $schStr;
@@ -722,16 +722,33 @@ public static function scheduleString(int $invId, $inv = null): ?string
 				return null;
 			}
 		}
-		if (! isset($inv->_scheduleString)) {
-			$inv->_scheduleString = $inv->scheduleString_calc();
-			wp_cache_set(
-				$cacheKey,
-				$inv->_scheduleString,
-				self::SCHEDULE_STRING_CACHE_GROUP,
-				self::SCHEDULE_STRING_CACHE_EXPIRATION
-			);
-		}
-		return $inv->_scheduleString === "" ? null : $inv->_scheduleString;
+		$inv->_scheduleStrings = $inv->scheduleStrings_calc();
+		wp_cache_set(
+			$cacheKey,
+			$inv->_scheduleStrings,
+			self::SCHEDULE_STRING_CACHE_GROUP,
+			self::SCHEDULE_STRING_CACHE_EXPIRATION
+		);
+		return $inv->_scheduleStrings;
+	}
+
+
+	/**
+	 * Get a description of the meeting schedule in a human-friendly phrase, e.g. Sundays at 11:00am, starting January
+	 * 14.
+	 *
+	 * This is separated out to a static method to prevent involvement from being instantiated (with those database
+	 * hits) when the content is cached.  (10x faster or more)
+	 *
+	 * @param int           $invId
+	 * @param ?Involvement  $inv
+	 *
+	 * @return ?string
+	 */
+	public static function scheduleString(int $invId, $inv = null): ?string
+	{
+		$s = self::scheduleStrings($invId, $inv);
+		return $s['combined'];
 	}
 
 	/**
@@ -879,16 +896,23 @@ protected static function computeCommonOccurrences(array $meetings = [], array $
 	}
 
 	/**
-	 * Calculate the schedule string.
+	 * Calculate the schedule strings.
 	 *
-	 * @return string
+	 * @return string[]
 	 */
-	protected function scheduleString_calc(): string
+	protected function scheduleStrings_calc(): array
 	{
 		$commonOccurrences = self::computeCommonOccurrences($this->meetings(), $this->schedules());
 
 		$dateFormat = get_option('date_format');
 
+		$r = [
+			'datetime' => null,
+			'date' => null,
+			'time' => null,
+			'firstLast' => null,
+			'combined' => null
+		];
 
 		$uniqueTimeStrings = [];
 		$days              = [];
@@ -964,6 +988,7 @@ protected function scheduleString_calc(): string
 					}
 				}
 				$dayStr = Utilities::stringArrayToListString($dayStr);
+				$r['date'] = $dayStr;
 			} else {  // one time of day.  Tue & Thu at 7pm
 				if (count($days) > 1) {
 					// more than one day per week
@@ -977,28 +1002,32 @@ protected function scheduleString_calc(): string
 					$k      = array_key_first($days);
 					$dayStr = Utilities::getPluralDayOfWeekNameForNumber(intval($k[1]));
 				}
+				$r['date'] = $dayStr;
 				$dt = array_values($days)[0][0];
 				/** @var $dt DateTimeExtended */
 				if ($dt->isAllDay) {
 					// translators: "Mon All Day"  or  "Sundays All Day"
 					$dayStr = wp_sprintf(__('%1$s All Day', 'TouchPoint-WP'), $dayStr);
+					$r['time'] = __('All Day', 'TouchPoint-WP');
 				} else {
 					$timeStr = DateFormats::TimeStringFormatted($dt);
 
 					// translators: %1$s is the date(s), %2$s is the time(s).
 					$dayStr  = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $dayStr, $timeStr);
+					$r['time'] = $timeStr;
 				}
 			}
 
-			// Convert start and end to string.
+			// Convert start and end to string,
 			if ($this->firstMeeting !== null && $this->lastMeeting !== null) {
+				$r['firstLast'] = wp_sprintf(
+				// translators: {start date} through {end date}  e.g. February 14 through August 12
+					__('%1$s through %2$s', 'TouchPoint-WP'),
+					$this->firstMeeting->format($dateFormat),
+					$this->lastMeeting->format($dateFormat)
+				);
 				if ($dayStr === null) {
-					$dayStr = wp_sprintf(
-					// translators: {start date} through {end date}  e.g. February 14 through August 12
-						__('%1$s through %2$s', 'TouchPoint-WP'),
-						$this->firstMeeting->format($dateFormat),
-						$this->lastMeeting->format($dateFormat)
-					);
+					$dayStr = $r['firstLast'];
 				} else {
 					$dayStr = wp_sprintf(
 					// translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
@@ -1009,12 +1038,13 @@ protected function scheduleString_calc(): string
 					);
 				}
 			} elseif ($this->firstMeeting !== null) {
-				if ($dayStr === null) {
-					$dayStr = wp_sprintf(
+				$r['firstLast'] = wp_sprintf(
 					// translators: Starts {start date}  e.g. Starts September 15
-						__('Starts %1$s', 'TouchPoint-WP'),
-						$this->firstMeeting->format($dateFormat)
-					);
+					__('Starts %1$s', 'TouchPoint-WP'),
+					$this->firstMeeting->format($dateFormat)
+				);
+				if ($dayStr === null) {
+					$dayStr = $r['firstLast'];
 				} else {
 					$dayStr = wp_sprintf(
 					// translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
@@ -1024,12 +1054,13 @@ protected function scheduleString_calc(): string
 					);
 				}
 			} elseif ($this->lastMeeting !== null) {
+				$r['firstLast'] = wp_sprintf(
+				// translators: Through {end date}  e.g. Through September 15
+					__('Through %1$s', 'TouchPoint-WP'),
+					$this->lastMeeting->format($dateFormat)
+				);
 				if ($dayStr === null) {
-					$dayStr = wp_sprintf(
-					// translators: Through {end date}  e.g. Through September 15
-						__('Through %1$s', 'TouchPoint-WP'),
-						$this->lastMeeting->format($dateFormat)
-					);
+					$dayStr = $r['firstLast'];
 				} else {
 					$dayStr = wp_sprintf(
 					// translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
@@ -1039,13 +1070,12 @@ protected function scheduleString_calc(): string
 					);
 				}
 			}
-			return $dayStr;
-
 
+			$r['combined'] = $dayStr;
 		} else { // Uncommon schedules
 
 			if (count($commonOccurrences) === 0) {
-				return "";
+				return $r;
 			}
 
 			$forceDateTime = false;
@@ -1053,21 +1083,21 @@ protected function scheduleString_calc(): string
 			$dateArr = new StringableArray();
 			$timeArr = [];
 			foreach ($commonOccurrences as $co) {
-				$r = DateFormats::DurationToStringArray($co['example'], $co['exampleEnd'], null, $co['example']->isAllDay);
+				$a = DateFormats::DurationToStringArray($co['example'], $co['exampleEnd'], null, $co['example']->isAllDay);
 
-				if (isset($r['datetime'])) {
+				if (isset($a['datetime'])) {
 					$forceDateTime = true;
-					$dateTimeArr[] = $r['datetime'];
+					$dateTimeArr[] = $a['datetime'];
 				} else {
 					$dateTimeArr[] = wp_sprintf(
 						// translators: %1$s is the date(s), %2$s is the time(s).
-						__('%1$s at %2$s', 'TouchPoint-WP'), $r['date'], $r['time']
+						__('%1$s at %2$s', 'TouchPoint-WP'), $a['date'], $a['time']
 					);
 					if ( !$dateArr->contains(['date'])) {
-						$dateArr[] = $r['date'];
+						$dateArr[] = $a['date'];
 					}
-					if (!in_array($r['time'], $timeArr)) {
-						$timeArr[] = $r['time'];
+					if (!in_array($a['time'], $timeArr)) {
+						$timeArr[] = $a['time'];
 					}
 				}
 			}
@@ -1076,16 +1106,23 @@ protected function scheduleString_calc(): string
 			}
 
 			if ($forceDateTime) {
-				return $dateTimeArr->__toString();
-			}
-
-			$dateStr = $dateArr->toListString();
+				$r['datetime'] = $dateTimeArr->__toString();
+				$r['combined'] = $r['datetime'];
+			} else {
+				$dateStr = $dateArr->toListString();
 
-			return wp_sprintf(
-				// translators: %1$s is the date(s), %2$s is the time(s).
-				__('%1$s at %2$s', 'TouchPoint-WP'), $dateStr, $timeArr[0]
-			);
+				$r['date'] = $dateStr;
+				$r['time'] = $timeArr[0];
+				$r['combined'] = wp_sprintf(
+					// translators: %1$s is the date(s), %2$s is the time(s).
+					__('%1$s at %2$s', 'TouchPoint-WP'),
+					$dateStr,
+					$timeArr[0]
+				);
+			}
 		}
+
+		return $r;
 	}
 
 
@@ -3454,16 +3491,13 @@ public function toJsonLD(): ?array
 	 */
 	public function notableAttributes(array $exclude = []): array
 	{
-		$attrs = [];
-
 		$asMeeting = $this->AsAMeeting();
 		if ($asMeeting !== null) {
 			$attrs = $asMeeting->notableAttributes(['involvement']);
 		} else {
-			$schStr = self::scheduleString($this->invId, $this);
-			if ($schStr) {
-				$attrs['schedule'] = $schStr;
-			}
+			$attrs = self::scheduleStrings($this->invId, $this);
+			unset($attrs['combined']);
+			$attrs = array_filter($attrs);
 		}
 		unset($schStr);
 
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index f6fb3278..0574dc41 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -344,7 +344,7 @@ public function notableAttributes(array $exclude = []): array
 			$attrs = [];
 		} else {
 			try {
-				$attrs = $this->involvement()->notableAttributes(['schedule', 'date', 'datetime', 'time']);
+				$attrs = $this->involvement()->notableAttributes(['date', 'datetime', 'time', 'firstLast']);
 			} catch (TouchPointWP_Exception) {
 				$attrs = [];
 			}

From 28e65a6c54f23a77f50a721e4bac4966779ec6f4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Aug 2024 17:17:25 -0400
Subject: [PATCH 163/423] Resolve a bug where maps were showing for meetings
 and involvements that don't have geo.  Possibly related to #187.

---
 src/templates/involvement-single.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 399c5f7c..d8e30017 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -82,7 +82,7 @@
                 <?php echo $obj->getActionButtons('single-template', "btn button") ?>
             </div>
         </div>
-        <?php if ($settings->useGeo && $obj->hasGeo() !== null) { ?>
+        <?php if ($settings->useGeo && $obj->hasGeo()) { ?>
             <div class="TouchPointWP-detail-cell TouchPointWP-map-container">
                 <!-- TODO this doesn't work for meetings. -->
                 <?php echo Involvement::mapShortcode() ?>

From 7d9f1aef95ec6b0172c514d63e37ec9aa18e196f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Aug 2024 17:48:54 -0400
Subject: [PATCH 164/423] Update to modern standard for date formatting. 
 Closes #189.

---
 composer.json                               |   2 +-
 i18n/TouchPoint-WP-es_ES.po                 | 210 ++++++++++---------
 i18n/TouchPoint-WP.pot                      | 216 +++++++++++---------
 src/TouchPoint-WP/CalendarGrid.php          |  12 +-
 src/TouchPoint-WP/TouchPointWP.php          |   2 +-
 src/TouchPoint-WP/Utilities/DateFormats.php |  27 +--
 touchpoint-wp.php                           |   2 +-
 7 files changed, 252 insertions(+), 219 deletions(-)

diff --git a/composer.json b/composer.json
index 88deaebc..6fca4c4f 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.90",
+  "version": "0.0.91",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 97400efb..c0bb63e1 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -12,27 +12,27 @@ msgstr ""
 "Language: \n"
 
 #. Plugin Name of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "TouchPoint WP"
 msgstr "TouchPoint WP"
 
 #. Plugin URI of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "https://github.com/tenthpres/touchpoint-wp"
 msgstr "https://github.com/tenthpres/touchpoint-wp"
 
 #. Description of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "A WordPress Plugin for integrating with TouchPoint Church Management Software."
 msgstr "Un complemento de WordPress para integrarse con TouchPoint, el software de administración de iglesias."
 
 #. Author of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "James K"
 msgstr "James K"
 
 #. Author URI of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "https://github.com/jkrrv"
 msgstr "https://github.com/jkrrv"
 
@@ -85,7 +85,7 @@ msgstr "Tipos de miembros de líder"
 
 #: src/templates/admin/invKoForm.php:125
 #: src/templates/admin/invKoForm.php:141
-#: src/templates/admin/invKoForm.php:268
+#: src/templates/admin/invKoForm.php:293
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Meeting.php:673
 #: src/TouchPoint-WP/Rsvp.php:75
@@ -114,66 +114,66 @@ msgstr "Próximo / Actual"
 msgid "Current / Upcoming"
 msgstr "Actual / Próximo"
 
-#: src/templates/admin/invKoForm.php:165
+#: src/templates/admin/invKoForm.php:167
 msgid "Default Filters"
 msgstr "Filtros predeterminados"
 
-#: src/templates/admin/invKoForm.php:174
+#: src/templates/admin/invKoForm.php:199
 msgid "Gender"
 msgstr "Género"
 
-#: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1788
+#: src/templates/admin/invKoForm.php:213
+#: src/TouchPoint-WP/Involvement.php:1825
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
-#: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1814
+#: src/templates/admin/invKoForm.php:217
+#: src/TouchPoint-WP/Involvement.php:1851
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
 
-#: src/templates/admin/invKoForm.php:196
+#: src/templates/admin/invKoForm.php:221
 msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
-#: src/templates/admin/invKoForm.php:200
+#: src/templates/admin/invKoForm.php:225
 #: src/TouchPoint-WP/Taxonomies.php:831
 msgid "Age Group"
 msgstr "Grupo de edad"
 
-#: src/templates/admin/invKoForm.php:205
+#: src/templates/admin/invKoForm.php:230
 msgid "Task Owner"
 msgstr "Propietario de la tarea"
 
-#: src/templates/admin/invKoForm.php:212
+#: src/templates/admin/invKoForm.php:237
 msgid "Contact Leader Task Keywords"
 msgstr "Palabras clave de la tarea del líder de contacto"
 
-#: src/templates/admin/invKoForm.php:223
+#: src/templates/admin/invKoForm.php:248
 msgid "Join Task Keywords"
 msgstr "Unirse a las palabras clave de la tarea"
 
-#: src/templates/admin/invKoForm.php:239
+#: src/templates/admin/invKoForm.php:264
 msgid "Add Involvement Post Type"
 msgstr "Agregar tipo de publicación de participación"
 
-#: src/templates/admin/invKoForm.php:246
+#: src/templates/admin/invKoForm.php:271
 msgid "Small Group"
 msgstr "Grupo Pequeño"
 
-#: src/templates/admin/invKoForm.php:247
+#: src/templates/admin/invKoForm.php:272
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:378
+#: src/templates/admin/invKoForm.php:403
 msgid "Select..."
 msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2034
+#: src/TouchPoint-WP/Involvement.php:2071
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -224,64 +224,64 @@ msgstr "Registro aún no abierto"
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1663
+#: src/TouchPoint-WP/Involvement.php:1700
 #: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1908
 #: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3489
+#: src/TouchPoint-WP/Involvement.php:3523
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3492
+#: src/TouchPoint-WP/Involvement.php:3526
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3569
+#: src/TouchPoint-WP/Involvement.php:3603
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3638
-#: src/TouchPoint-WP/Involvement.php:3680
+#: src/TouchPoint-WP/Involvement.php:3672
+#: src/TouchPoint-WP/Involvement.php:3714
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3643
+#: src/TouchPoint-WP/Involvement.php:3677
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3647
+#: src/TouchPoint-WP/Involvement.php:3681
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3652
+#: src/TouchPoint-WP/Involvement.php:3686
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3655
+#: src/TouchPoint-WP/Involvement.php:3689
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3658
+#: src/TouchPoint-WP/Involvement.php:3692
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3661
+#: src/TouchPoint-WP/Involvement.php:3695
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3671
+#: src/TouchPoint-WP/Involvement.php:3705
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3586
+#: src/TouchPoint-WP/Involvement.php:3620
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -807,8 +807,8 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1446
-#: src/TouchPoint-WP/Utilities.php:265
+#: src/TouchPoint-WP/Person.php:1445
+#: src/TouchPoint-WP/Utilities.php:264
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
@@ -1026,16 +1026,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1836
+#: src/TouchPoint-WP/Involvement.php:1873
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1849
+#: src/TouchPoint-WP/Involvement.php:1886
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1720
+#: src/TouchPoint-WP/Involvement.php:1757
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1197,71 +1197,71 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1837
+#: src/TouchPoint-WP/Involvement.php:1874
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1838
+#: src/TouchPoint-WP/Involvement.php:1875
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1879
+#: src/TouchPoint-WP/Involvement.php:1916
 #: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1882
+#: src/TouchPoint-WP/Involvement.php:1919
 #: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:960
-#: src/TouchPoint-WP/Involvement.php:989
-#: src/TouchPoint-WP/Involvement.php:1064
-#: src/TouchPoint-WP/Involvement.php:1086
-#: src/TouchPoint-WP/Utilities/DateFormats.php:282
-#: src/TouchPoint-WP/Utilities/DateFormats.php:345
+#: src/TouchPoint-WP/Involvement.php:984
+#: src/TouchPoint-WP/Involvement.php:1016
+#: src/TouchPoint-WP/Involvement.php:1094
+#: src/TouchPoint-WP/Involvement.php:1118
+#: src/TouchPoint-WP/Utilities/DateFormats.php:283
+#: src/TouchPoint-WP/Utilities/DateFormats.php:346
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:998
+#: src/TouchPoint-WP/Involvement.php:1025
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1005
+#: src/TouchPoint-WP/Involvement.php:1034
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1015
+#: src/TouchPoint-WP/Involvement.php:1043
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1021
+#: src/TouchPoint-WP/Involvement.php:1051
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1030
+#: src/TouchPoint-WP/Involvement.php:1059
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1036
+#: src/TouchPoint-WP/Involvement.php:1067
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3510
+#: src/TouchPoint-WP/Involvement.php:3544
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1278,15 +1278,15 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:1975
+#: src/TouchPoint-WP/Involvement.php:2012
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:1985
+#: src/TouchPoint-WP/Involvement.php:2022
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2004
+#: src/TouchPoint-WP/Involvement.php:2041
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
@@ -1305,8 +1305,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3776
-#: src/TouchPoint-WP/Involvement.php:3873
+#: src/TouchPoint-WP/Involvement.php:3810
+#: src/TouchPoint-WP/Involvement.php:3907
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1426,7 +1426,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1763
+#: src/TouchPoint-WP/Involvement.php:1800
 msgid "Language"
 msgstr "Idioma"
 
@@ -1479,7 +1479,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3860
+#: src/TouchPoint-WP/Involvement.php:3894
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1504,7 +1504,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3850
+#: src/TouchPoint-WP/Involvement.php:3884
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1569,26 +1569,26 @@ msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones dis
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:118
-#: src/TouchPoint-WP/Utilities/DateFormats.php:190
+#: src/TouchPoint-WP/Utilities/DateFormats.php:119
+#: src/TouchPoint-WP/Utilities/DateFormats.php:191
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:120
-#: src/TouchPoint-WP/Utilities/DateFormats.php:192
+#: src/TouchPoint-WP/Utilities/DateFormats.php:121
+#: src/TouchPoint-WP/Utilities/DateFormats.php:193
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:126
-#: src/TouchPoint-WP/Utilities/DateFormats.php:198
+#: src/TouchPoint-WP/Utilities/DateFormats.php:127
+#: src/TouchPoint-WP/Utilities/DateFormats.php:199
 msgid "Tomorrow"
 msgstr "mañana"
 
-#: src/templates/admin/invKoForm.php:341
+#: src/templates/admin/invKoForm.php:366
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:472
+#: src/TouchPoint-WP/Utilities.php:471
 msgid "Expand"
 msgstr "Ampliar"
 
@@ -1601,25 +1601,25 @@ msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:143
+#: src/TouchPoint-WP/Utilities/DateFormats.php:144
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:149
+#: src/TouchPoint-WP/Utilities/DateFormats.php:150
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:155
+#: src/TouchPoint-WP/Utilities/DateFormats.php:156
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:160
+#: src/TouchPoint-WP/Utilities/DateFormats.php:161
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -1630,7 +1630,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3598
+#: src/TouchPoint-WP/Involvement.php:3632
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1684,22 +1684,22 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:133
+#: src/TouchPoint-WP/Utilities/DateFormats.php:134
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:134
+#: src/TouchPoint-WP/Utilities/DateFormats.php:135
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:136
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
@@ -1714,8 +1714,8 @@ msgid "Creating an Involvement object from an object without a post_id is not ye
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:963
-#: src/TouchPoint-WP/Involvement.php:984
+#: src/TouchPoint-WP/Involvement.php:987
+#: src/TouchPoint-WP/Involvement.php:1010
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
@@ -1724,56 +1724,56 @@ msgid "Creating a Meeting object from an object without a post_id is not yet sup
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
 #. translators: %1$s is the start time, %2$s is the end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:88
-#: src/TouchPoint-WP/Utilities/DateFormats.php:324
+#: src/TouchPoint-WP/Utilities/DateFormats.php:89
+#: src/TouchPoint-WP/Utilities/DateFormats.php:325
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+#: src/TouchPoint-WP/Utilities/DateFormats.php:206
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:206
+#: src/TouchPoint-WP/Utilities/DateFormats.php:207
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr "j M"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:208
+#: src/TouchPoint-WP/Utilities/DateFormats.php:209
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:209
+#: src/TouchPoint-WP/Utilities/DateFormats.php:210
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:358
+#: src/TouchPoint-WP/Utilities/DateFormats.php:359
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+#: src/TouchPoint-WP/Utilities/DateFormats.php:216
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#: src/TouchPoint-WP/Utilities/DateFormats.php:222
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#: src/TouchPoint-WP/Utilities/DateFormats.php:228
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:232
+#: src/TouchPoint-WP/Utilities/DateFormats.php:233
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -1819,3 +1819,19 @@ msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el ca
 #: src/templates/involvement-single.php:49
 msgid "This %s has been Cancelled."
 msgstr "Este %s ha sido Cancelado."
+
+#: src/templates/admin/invKoForm.php:173
+msgid "Division"
+msgstr "Division"
+
+#: src/templates/admin/invKoForm.php:180
+msgid "Resident Code"
+msgstr "Código de Residente"
+
+#: src/templates/admin/invKoForm.php:187
+msgid "Campus"
+msgstr "Campus"
+
+#: src/TouchPoint-WP/Involvement.php:1011
+msgid "All Day"
+msgstr "todo el dia"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index b154ef0b..f83ba54a 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,40 +2,40 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.90\n"
+"Project-Id-Version: TouchPoint WP 0.0.91\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-06T14:10:40+00:00\n"
+"POT-Creation-Date: 2024-08-08T21:34:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.10.0\n"
+"X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
 
 #. Plugin Name of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "TouchPoint WP"
 msgstr ""
 
 #. Plugin URI of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "https://github.com/tenthpres/touchpoint-wp"
 msgstr ""
 
 #. Description of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "A WordPress Plugin for integrating with TouchPoint Church Management Software."
 msgstr ""
 
 #. Author of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "James K"
 msgstr ""
 
 #. Author URI of the plugin
-#: C:\Dev\TouchPoint-WP\touchpoint-wp.php
+#: touchpoint-wp.php
 msgid "https://github.com/jkrrv"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:125
 #: src/templates/admin/invKoForm.php:141
-#: src/templates/admin/invKoForm.php:268
+#: src/templates/admin/invKoForm.php:293
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Meeting.php:673
 #: src/TouchPoint-WP/Rsvp.php:75
@@ -149,64 +149,76 @@ msgstr ""
 msgid "Current / Upcoming"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:165
+#: src/templates/admin/invKoForm.php:167
 msgid "Default Filters"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:174
+#: src/templates/admin/invKoForm.php:173
+msgid "Division"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:180
+msgid "Resident Code"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:187
+msgid "Campus"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:199
 msgid "Gender"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:188
-#: src/TouchPoint-WP/Involvement.php:1788
+#: src/templates/admin/invKoForm.php:213
+#: src/TouchPoint-WP/Involvement.php:1825
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:192
-#: src/TouchPoint-WP/Involvement.php:1814
+#: src/templates/admin/invKoForm.php:217
+#: src/TouchPoint-WP/Involvement.php:1851
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:196
+#: src/templates/admin/invKoForm.php:221
 msgid "Prevailing Marital Status"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:200
+#: src/templates/admin/invKoForm.php:225
 #: src/TouchPoint-WP/Taxonomies.php:831
 msgid "Age Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:205
+#: src/templates/admin/invKoForm.php:230
 msgid "Task Owner"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:212
+#: src/templates/admin/invKoForm.php:237
 msgid "Contact Leader Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:223
+#: src/templates/admin/invKoForm.php:248
 msgid "Join Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:239
+#: src/templates/admin/invKoForm.php:264
 msgid "Add Involvement Post Type"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:246
+#: src/templates/admin/invKoForm.php:271
 msgid "Small Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:247
+#: src/templates/admin/invKoForm.php:272
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:341
+#: src/templates/admin/invKoForm.php:366
 msgid "(named person)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:378
+#: src/templates/admin/invKoForm.php:403
 msgid "Select..."
 msgstr ""
 
@@ -259,7 +271,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2034
+#: src/TouchPoint-WP/Involvement.php:2071
 msgid "No %s Found."
 msgstr ""
 
@@ -270,7 +282,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3510
+#: src/TouchPoint-WP/Involvement.php:3544
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -332,180 +344,184 @@ msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:960
-#: src/TouchPoint-WP/Involvement.php:989
-#: src/TouchPoint-WP/Involvement.php:1064
-#: src/TouchPoint-WP/Involvement.php:1086
-#: src/TouchPoint-WP/Utilities/DateFormats.php:282
-#: src/TouchPoint-WP/Utilities/DateFormats.php:345
+#: src/TouchPoint-WP/Involvement.php:984
+#: src/TouchPoint-WP/Involvement.php:1016
+#: src/TouchPoint-WP/Involvement.php:1094
+#: src/TouchPoint-WP/Involvement.php:1118
+#: src/TouchPoint-WP/Utilities/DateFormats.php:283
+#: src/TouchPoint-WP/Utilities/DateFormats.php:346
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:963
-#: src/TouchPoint-WP/Involvement.php:984
+#: src/TouchPoint-WP/Involvement.php:987
+#: src/TouchPoint-WP/Involvement.php:1010
 msgid "%1$s All Day"
 msgstr ""
 
+#: src/TouchPoint-WP/Involvement.php:1011
+msgid "All Day"
+msgstr ""
+
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:998
+#: src/TouchPoint-WP/Involvement.php:1025
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1005
+#: src/TouchPoint-WP/Involvement.php:1034
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1015
+#: src/TouchPoint-WP/Involvement.php:1043
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1021
+#: src/TouchPoint-WP/Involvement.php:1051
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1030
+#: src/TouchPoint-WP/Involvement.php:1059
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1036
+#: src/TouchPoint-WP/Involvement.php:1067
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1663
+#: src/TouchPoint-WP/Involvement.php:1700
 #: src/TouchPoint-WP/Partner.php:810
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1720
+#: src/TouchPoint-WP/Involvement.php:1757
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1763
+#: src/TouchPoint-WP/Involvement.php:1800
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1836
+#: src/TouchPoint-WP/Involvement.php:1873
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1837
+#: src/TouchPoint-WP/Involvement.php:1874
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1838
+#: src/TouchPoint-WP/Involvement.php:1875
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1849
+#: src/TouchPoint-WP/Involvement.php:1886
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1908
 #: src/TouchPoint-WP/Partner.php:834
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1879
+#: src/TouchPoint-WP/Involvement.php:1916
 #: src/TouchPoint-WP/Partner.php:850
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1882
+#: src/TouchPoint-WP/Involvement.php:1919
 #: src/TouchPoint-WP/Partner.php:853
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1975
+#: src/TouchPoint-WP/Involvement.php:2012
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1985
+#: src/TouchPoint-WP/Involvement.php:2022
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2004
+#: src/TouchPoint-WP/Involvement.php:2041
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3489
+#: src/TouchPoint-WP/Involvement.php:3523
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3492
+#: src/TouchPoint-WP/Involvement.php:3526
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3569
+#: src/TouchPoint-WP/Involvement.php:3603
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3586
+#: src/TouchPoint-WP/Involvement.php:3620
 #: src/TouchPoint-WP/Partner.php:1314
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3598
+#: src/TouchPoint-WP/Involvement.php:3632
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3638
-#: src/TouchPoint-WP/Involvement.php:3680
+#: src/TouchPoint-WP/Involvement.php:3672
+#: src/TouchPoint-WP/Involvement.php:3714
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3643
+#: src/TouchPoint-WP/Involvement.php:3677
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3647
+#: src/TouchPoint-WP/Involvement.php:3681
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3652
+#: src/TouchPoint-WP/Involvement.php:3686
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3655
+#: src/TouchPoint-WP/Involvement.php:3689
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3658
+#: src/TouchPoint-WP/Involvement.php:3692
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3661
+#: src/TouchPoint-WP/Involvement.php:3695
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3671
+#: src/TouchPoint-WP/Involvement.php:3705
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3776
-#: src/TouchPoint-WP/Involvement.php:3873
+#: src/TouchPoint-WP/Involvement.php:3810
+#: src/TouchPoint-WP/Involvement.php:3907
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3850
+#: src/TouchPoint-WP/Involvement.php:3884
 #: src/TouchPoint-WP/Person.php:1838
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3860
+#: src/TouchPoint-WP/Involvement.php:3894
 #: src/TouchPoint-WP/Person.php:1821
 msgid "Contact Prohibited."
 msgstr ""
@@ -588,8 +604,8 @@ msgstr ""
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1446
-#: src/TouchPoint-WP/Utilities.php:265
+#: src/TouchPoint-WP/Person.php:1445
+#: src/TouchPoint-WP/Utilities.php:264
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
@@ -1492,121 +1508,121 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:472
+#: src/TouchPoint-WP/Utilities.php:471
 msgid "Expand"
 msgstr ""
 
 #. translators: %1$s is the start time, %2$s is the end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:88
-#: src/TouchPoint-WP/Utilities/DateFormats.php:324
+#: src/TouchPoint-WP/Utilities/DateFormats.php:89
+#: src/TouchPoint-WP/Utilities/DateFormats.php:325
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:118
-#: src/TouchPoint-WP/Utilities/DateFormats.php:190
+#: src/TouchPoint-WP/Utilities/DateFormats.php:119
+#: src/TouchPoint-WP/Utilities/DateFormats.php:191
 msgid "Tonight"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:120
-#: src/TouchPoint-WP/Utilities/DateFormats.php:192
+#: src/TouchPoint-WP/Utilities/DateFormats.php:121
+#: src/TouchPoint-WP/Utilities/DateFormats.php:193
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:126
-#: src/TouchPoint-WP/Utilities/DateFormats.php:198
+#: src/TouchPoint-WP/Utilities/DateFormats.php:127
+#: src/TouchPoint-WP/Utilities/DateFormats.php:199
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:133
+#: src/TouchPoint-WP/Utilities/DateFormats.php:134
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:134
+#: src/TouchPoint-WP/Utilities/DateFormats.php:135
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:136
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:143
+#: src/TouchPoint-WP/Utilities/DateFormats.php:144
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:149
+#: src/TouchPoint-WP/Utilities/DateFormats.php:150
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:155
+#: src/TouchPoint-WP/Utilities/DateFormats.php:156
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:160
+#: src/TouchPoint-WP/Utilities/DateFormats.php:161
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+#: src/TouchPoint-WP/Utilities/DateFormats.php:206
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:206
+#: src/TouchPoint-WP/Utilities/DateFormats.php:207
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:208
+#: src/TouchPoint-WP/Utilities/DateFormats.php:209
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:209
+#: src/TouchPoint-WP/Utilities/DateFormats.php:210
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+#: src/TouchPoint-WP/Utilities/DateFormats.php:216
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#: src/TouchPoint-WP/Utilities/DateFormats.php:222
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#: src/TouchPoint-WP/Utilities/DateFormats.php:228
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:232
+#: src/TouchPoint-WP/Utilities/DateFormats.php:233
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:358
+#: src/TouchPoint-WP/Utilities/DateFormats.php:359
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 0141694c..880fb4ec 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -101,10 +101,10 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 		// Loop through the days of the month
 		do {
-			$ts = DateFormats::timestampAndOffset($d);
-			$day = date_i18n("j", $ts);
+			$ts = DateFormats::timestampWithoutOffset($d);
+			$day = wp_date("j", $ts);
 			$fullDay = DateFormats::DateStringFormatted($d);
-			$wd =  date_i18n("w", $ts);
+			$wd =  wp_date("w", $ts);
 
 			try {
 				$newQ = self::adjustQueryForDay($q, $d, $tz);
@@ -388,11 +388,11 @@ protected static function getLinkForDate(DateTimeInterface $date): string
 	 */
 	protected static function getMonthNameForDate(DateTimeInterface $date): string
 	{
-		$ts = DateFormats::timestampAndOffset($date);
+		$ts = DateFormats::timestampWithoutOffset($date);
 		if ($date->format('Y') === Utilities::dateTimeNow()->format('Y')) {
-			$label = date_i18n('F', $ts);
+			$label = wp_date('F', $ts);
 		} else {
-			$label = date_i18n('F Y', $ts);
+			$label = wp_date('F Y', $ts);
 		}
 		return $label;
 	}
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 6cdee532..65e517fd 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -32,7 +32,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.90";
+	public const VERSION = "0.0.91";
 
 	/**
 	 * The Token
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 26511445..02a4a330 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -22,7 +22,7 @@ abstract class DateFormats
 	 */
 	public static function TimeStringFormatted(DateTimeInterface $dt): string
 	{
-		$ts = date_i18n(get_option('time_format'), self::timestampAndOffset($dt));
+		$ts = wp_date(get_option('time_format'), self::timestampWithoutOffset($dt));
 
 		/**
 		 * Allows for manipulation of the string returned as a formatted time.
@@ -58,6 +58,7 @@ public static function timestampWithoutOffset(?DateTimeInterface $dt): int
 	 * @return int
 	 *
 	 * @since 0.0.90 added
+	 * @deprecated 0.0.91  Now that date_i18n is deprecated, this is probably not needed.
 	 */
 	public static function timestampAndOffset(?DateTimeInterface $dt): int
 	{
@@ -125,16 +126,16 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
 				$r = __("Tomorrow", "TouchPoint-WP");
 			} else {
-				$ts    = DateFormats::timestampAndOffset($dt);
-				$nowTs = DateFormats::timestampAndOffset($now);
+				$ts    = DateFormats::timestampWithoutOffset($dt);
+				$nowTs = DateFormats::timestampWithoutOffset($now);
 
 
 				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
-					$day = date_i18n(_x('l', "Date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
-					$date = date_i18n(_x('F j', "Date string when the year is current.", "TouchPoint-WP"), $ts);
+					$day = wp_date(_x('l', "Date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
+					$date = wp_date(_x('F j', "Date string when the year is current.", "TouchPoint-WP"), $ts);
 				} else {
-					$day = date_i18n(_x('l', "Date string for day of the week, when the year is not current.", "TouchPoint-WP"), $ts);
-					$date = date_i18n(_x('F j, Y', "Date string when the year is not current.", "TouchPoint-WP"), $ts);
+					$day = wp_date(_x('l', "Date string for day of the week, when the year is not current.", "TouchPoint-WP"), $ts);
+					$date = wp_date(_x('F j, Y', "Date string when the year is not current.", "TouchPoint-WP"), $ts);
 				}
 
 				// Last week
@@ -197,16 +198,16 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
 				$r = __("Tomorrow", "TouchPoint-WP");
 			} else {
-				$ts    = DateFormats::timestampAndOffset($dt);
-				$nowTs = DateFormats::timestampAndOffset($now);
+				$ts    = DateFormats::timestampWithoutOffset($dt);
+				$nowTs = DateFormats::timestampWithoutOffset($now);
 
 
 				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
-					$day = date_i18n(_x('D', "Short date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
-					$date = date_i18n(_x('M j', "Short date string when the year is current.", "TouchPoint-WP"), $ts);
+					$day = wp_date(_x('D', "Short date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
+					$date = wp_date(_x('M j', "Short date string when the year is current.", "TouchPoint-WP"), $ts);
 				} else {
-					$day = date_i18n(_x('D', "Short date string for day of the week, when the year is not current.", "TouchPoint-WP"), $ts);
-					$date = date_i18n(_x('M j, Y', "Short date string when the year is not current.", "TouchPoint-WP"), $ts);
+					$day = wp_date(_x('D', "Short date string for day of the week, when the year is not current.", "TouchPoint-WP"), $ts);
+					$date = wp_date(_x('M j, Y', "Short date string when the year is not current.", "TouchPoint-WP"), $ts);
 				}
 
 				// Last week
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 91e2d423..994db3a5 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.90
+Version:            0.0.91
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From 9ac2c91cccb755f6d6da55827c75d1170f9b7c18 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 Aug 2024 18:13:56 -0400
Subject: [PATCH 165/423] Better handling some edge cases related to #194

---
 src/TouchPoint-WP/Involvement.php              | 18 ++++++++++++++----
 src/TouchPoint-WP/Person.php                   |  2 ++
 src/TouchPoint-WP/Utilities.php                | 17 ++++++++++++++---
 .../Utilities/StringableArray.php              |  6 ++++--
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index b9e9f06a..66780052 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1082,8 +1082,18 @@ protected function scheduleStrings_calc(): array
 			$dateTimeArr = new StringableArray();
 			$dateArr = new StringableArray();
 			$timeArr = [];
-			foreach ($commonOccurrences as $co) {
-				$a = DateFormats::DurationToStringArray($co['example'], $co['exampleEnd'], null, $co['example']->isAllDay);
+			$now = Utilities::dateTimeNow();
+
+			// filter meetings to only those not past
+			$originalMeetingCount = count($this->meetings());
+			$meetings = array_filter($this->meetings(), fn($m) => $m->mtgEndDt > $now);
+			if (count($meetings) === 0) {
+				$meetings = $this->meetings();
+			}
+			$andOthers = (count($meetings) !== $originalMeetingCount);
+
+			foreach ($meetings as $m) {
+				$a = DateFormats::DurationToStringArray($m->mtgStartDt, $m->mtgEndDt, null, $m->mtgStartDt->isAllDay);
 
 				if (isset($a['datetime'])) {
 					$forceDateTime = true;
@@ -1106,10 +1116,10 @@ protected function scheduleStrings_calc(): array
 			}
 
 			if ($forceDateTime) {
-				$r['datetime'] = $dateTimeArr->__toString();
+				$r['datetime'] = $dateTimeArr->toListString(2, $andOthers);
 				$r['combined'] = $r['datetime'];
 			} else {
-				$dateStr = $dateArr->toListString();
+				$dateStr = $dateArr->toListString(2, $andOthers);
 
 				$r['date'] = $dateStr;
 				$r['time'] = $timeArr[0];
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 719cf8b4..0675c89d 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1419,6 +1419,8 @@ public function getProfileUrl(): ?string
 	 *
 	 * @param Person[]|PersonArray $people TODO make api compliant with Person object--remove coalesces.  (#120)
 	 *
+	 * TODO merge with Utilities::stringArrayToListString()
+	 *
 	 * @return ?string  Returns a human-readable list of names, nicely formatted with commas and such.
 	 */
 	public static function arrangeNamesForPeople($people, bool $asLink = false, int $familyLimit = 3): ?string
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 6fb439a6..a435fb9a 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -247,11 +247,18 @@ public static function getTimeOfDayTermForTime_noI18n(DateTimeInterface $dt): st
 	 * Turn ['apples', 'oranges', 'pears'] into "apples, oranges & pears"
 	 *
 	 * @param string[] $strings
+	 * @param int      $limit The maximum number of items to include.  Default is very, very high.
+	 * @param bool     $andOthers If true, the last item will be "others" instead of the actual last item.
 	 *
 	 * @return string
 	 */
-	public static function stringArrayToListString(array $strings): string
+	public static function stringArrayToListString(array $strings, int $limit = PHP_INT_MAX, bool $andOthers = false): string
 	{
+		if ($limit < count($strings)) {
+			$andOthers = true;
+			$strings = array_slice($strings, 0, $limit);
+		}
+
 		$concat = implode('', $strings);
 
 		$comma     = ', ';
@@ -265,9 +272,13 @@ public static function stringArrayToListString(array $strings): string
 			$useOxford = true;
 		}
 
-		$last = array_pop($strings);
+		if ($andOthers) {
+			$last = _x("others", "list of items, and *others*", "TouchPoint-WP");
+		} else {
+			$last = array_pop($strings);
+		}
 		$str  = implode($comma, $strings);
-		if (count($strings) > 0) {
+		if ((count($strings) + $andOthers) > 0) {
 			if ($useOxford) {
 				$str .= trim($comma);
 			}
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index 595e0c9c..e4f596f6 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -93,10 +93,12 @@ public function join(string $separator = null): string
 	/**
 	 * Convert the array to a list string with ampersands and such.
 	 *
+	 * @param int $limit
+	 *
 	 * @return string
 	 */
-	public function toListString(): string
+	public function toListString(int $limit = PHP_INT_MAX): string
 	{
-		return Utilities::stringArrayToListString($this->getArrayCopy());
+		return Utilities::stringArrayToListString($this->getArrayCopy(), $limit);
 	}
 }
\ No newline at end of file

From 80e888d9e11f1c0ea6d8063826e9731cc1311a02 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 9 Aug 2024 14:48:11 -0400
Subject: [PATCH 166/423] Python Reports.  Closes #195.

---
 composer.json                      |  2 +-
 docs                               |  2 +-
 package.json                       |  2 +-
 src/TouchPoint-WP/Report.php       |  4 +-
 src/TouchPoint-WP/TouchPointWP.php |  2 +-
 src/python/WebApi.py               | 67 ++++++++++++++++++++----------
 touchpoint-wp.php                  |  2 +-
 7 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/composer.json b/composer.json
index 6fca4c4f..50bc49f5 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.91",
+  "version": "0.0.92",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/docs b/docs
index 4cf68572..d0b1925d 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 4cf685722223cd6fb72f1ff1627bc890c94fbaa5
+Subproject commit d0b1925da8688f9e37a92e041c0f991bfe27bbd1
diff --git a/package.json b/package.json
index 4e5933cd..0bdc17f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index e9d31de0..1e75d3e7 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -98,7 +98,7 @@ public static function fromParams($params): self
 		}
 
 		$params['type'] = strtolower($params['type']);
-		if ($params['type'] !== 'sql') {
+		if ($params['type'] !== 'sql' && $params['type'] !== 'python') {
 			throw new TouchPointWP_Exception("Invalid Report type.", 173002);
 		}
 
@@ -283,7 +283,7 @@ public static function reportShortcode($params = [], string $content = ""): stri
 
 		if (self::$_indexingMode) {
 			// It has been added to the index already, so our work here is done.
-			return "";
+			return $content;
 		}
 
 		$rc = $report->content();
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 65e517fd..26e26924 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -32,7 +32,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.91";
+	public const VERSION = "0.0.92";
 
 	/**
 	 * The Token
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 4809fad3..3295316e 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "0.0.90"
+VERSION = "0.0.92"
 
 sgContactEvName = "Contact"
 
@@ -1139,38 +1139,59 @@ def get_person_info_for_sync(person_obj):
     Data.Title = 'Running requested reports'
 
     if inData.has_key('reports'):
+        # Consolidate the scripts that need to be run.
+
         # noinspection SqlResolve,SqlConstantCondition,SqlConstantExpression
-        reportsQ = 'SELECT Id, Name, Body, TypeId FROM Content WHERE 1=0'
+        sqlReportsQ = 'SELECT Id, Name, Body, TypeId FROM Content WHERE 1=0'
+        pyReportsQ = 'SELECT Id, Name, Body, TypeId FROM Content WHERE 1=0'
         sqlPs = {}
+        pyPs = {}
         for r in inData['reports']:
             rNameL = r['name'].lower()
-            typ = 9999
             if r['type'] == 'sql':
-                typ = 4
                 if rNameL not in sqlPs:
                     sqlPs[rNameL] = []
-                    reportsQ += " OR (Name = '{}' AND TypeId = {})".format(r['name'], typ)
+                    sqlReportsQ += " OR (Name = '{}' AND TypeId = 4)".format(r['name'])
                 sqlPs[rNameL].append(r['p1'])
-
-        Data.sqlPs = sqlPs
-
-        Data.report_results = []
-        for r in q.QuerySql(reportsQ):
-            if r.TypeId == 4:  # SQL
-                rNameL = r.Name.lower()
-                if rNameL in sqlPs:
-                    for p1 in sqlPs[rNameL]:
-                        sql = r.Body.replace("@p1", "'{}'".format(p1))
-
-                        Data.report_results.append({
-                            'id': r.Id,
-                            'name': r.Name,
-                            'type': 'sql',
-                            'p1': p1,
-                            'result': model.SqlGrid(sql)[131:-96]  # The substring removes the superfluous html
-                        })
+            elif r['type'] == 'python':
+                if rNameL not in pyPs:
+                    pyPs[rNameL] = []
+                    pyReportsQ += " OR (Name = '{}' AND TypeId = 5)".format(r['name'])
+                pyPs[rNameL].append(r['p1'])
+
+        reportResults = []
+
+        # Evaluate the Python Reports
+        for r in q.QuerySql(pyReportsQ):
+            rNameL = r.Name.lower()
+            for p1 in pyPs[rNameL]:
+                model.Data.p1 = p1
+
+                reportResults.append({
+                    'id': r.Id,
+                    'name': r.Name,
+                    'type': 'python',
+                    'p1': p1,
+                    'result': model.CallScript(r.Name)
+                })
+
+        # Evaluate the SQL Reports
+        for r in q.QuerySql(sqlReportsQ):
+            rNameL = r.Name.lower()
+            if rNameL in sqlPs:
+                for p1 in sqlPs[rNameL]:
+                    sql = r.Body.replace("@p1", "'{}'".format(p1))
+
+                    reportResults.append({
+                        'id': r.Id,
+                        'name': r.Name,
+                        'type': 'sql',
+                        'p1': p1,
+                        'result': model.SqlGrid(sql)[131:-96]  # The substring removes the superfluous html
+                    })
 
         Data.success = 1
+        Data.report_results = reportResults
 
 if "auth_key_set" in Data.a and model.HttpMethod == "post":
     apiCalled = True
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 994db3a5..d3fa636e 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.91
+Version:            0.0.92
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From 325e0568d5ad6e0498cfef5a4e1639d578c58b79 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 9 Aug 2024 14:53:52 -0400
Subject: [PATCH 167/423] Python Reports.  #195.

---
 README.md | 4 ++++
 docs      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fad7fd02..e5e03da5 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,10 @@ No login required, just an email address and zip code.
 Show your Staff members, Elders, or other collections of people, automatically kept in sync with TouchPoint.
 [Example.](https://www.tenth.org/about/staff)  (This example and others like is are 100% updated from TouchPoint, including the titles and social links.)
 
+### Embedded Reports
+Any SQL or Python report generated in TouchPoint can be embedded into your website and automatically updated.  For example,
+we have a financial update chart that is automatically updated to reflect giving. 
+
 ### Outreach Partners
 Automatically import partner bios and info from TouchPoint for display on your public website, with 
 appropriate care for their security.
diff --git a/docs b/docs
index d0b1925d..64db0108 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit d0b1925da8688f9e37a92e041c0f991bfe27bbd1
+Subproject commit 64db0108b34642ada36cc3e8a2f0716a858bf72b

From cd915e10eebb07067860b8f1c127ddb7a47e790a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 9 Aug 2024 14:55:50 -0400
Subject: [PATCH 168/423] Python Reports.

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 64db0108..0bda5ee9 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 64db0108b34642ada36cc3e8a2f0716a858bf72b
+Subproject commit 0bda5ee9dbbc66865ebbe502d24d282124836059

From afbbf8d9a7fa689188a2ee387d6eb76f1179cb80 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 9 Aug 2024 15:19:02 -0400
Subject: [PATCH 169/423] changing Reports to include the report type in the
 name to distinguish data more easily.

---
 src/TouchPoint-WP/Report.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 1e75d3e7..254ec8e7 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -302,7 +302,10 @@ public static function reportShortcode($params = [], string $content = ""): stri
 		 * @param Report $report The report being displayed.
 		 */
 		$class = apply_filters("tp_rpt_figure_class", self::$classDefault, $report);
-        $rc     = "<figure $idAttr class=\"$class\">\n\t" . str_replace("\n", "\n\t", $rc);
+
+		$permalink = esc_attr(get_post_permalink($report->getPost()));
+
+        $rc     = "<figure $idAttr class=\"$class\" data-tp-report=\"$permalink\">\n\t" . str_replace("\n", "\n\t", $rc);
 
 		// If desired, add a caption that indicates when the table was last updated.
 		if ($params['showupdated']) {
@@ -349,8 +352,7 @@ public function getPost(bool $create = false): ?WP_Post
 						'value' => $this->p1
 					]
 				],
-				'numberposts' => 2
-// only need one, but if there's two, there should be an error condition.
+				'numberposts' => 2  // only need one, but if there's two, there should be an error condition.
 			]);
 
 			$reportPosts = $q->get_posts();
@@ -364,7 +366,7 @@ public function getPost(bool $create = false): ?WP_Post
 				$postId = wp_insert_post([
 					'post_type'   => self::POST_TYPE,
 					'post_status' => 'publish',
-					'post_name'   => $this->title(),
+					'post_name'   => $this->title() . " " . $this->type,
 					'meta_input'  => [
 						self::NAME_META_KEY => $this->name,
 						self::TYPE_META_KEY => $this->type,

From 2fc09296a2a1683d4a2cc7b1cecba68c7803da58 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 13 Aug 2024 21:20:24 -0400
Subject: [PATCH 170/423] Don't show register/rsvp links for cancelled
 meetings. Closes #196

---
 src/TouchPoint-WP/Meeting.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 0574dc41..d2dff664 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -415,15 +415,17 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 
 		$ret = $inv->getActionButtons($context . "_meeting", $btnClass, false, $absoluteLinks, false);
 
-		if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
-			$ret[] = $inv->getRegisterButton($btnClass, $absoluteLinks);
-		}
+		if ($this->status() !== self::STATUS_CANCELLED) {
+			if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
+				$ret[] = $inv->getRegisterButton($btnClass, $absoluteLinks);
+			}
 
-		if ($inv->getRegistrationType() === RegistrationType::RSVP) {
-			if ($absoluteLinks) {
-				$ret[] = $this->getRsvpLink($btnClass);
-			} else {
-				$ret[] = $this->getRsvpButton($btnClass);
+			if ($inv->getRegistrationType() === RegistrationType::RSVP) {
+				if ($absoluteLinks) {
+					$ret[] = $this->getRsvpLink($btnClass);
+				} else {
+					$ret[] = $this->getRsvpButton($btnClass);
+				}
 			}
 		}
 

From 1666f929389a9073ddfc7462be65b3783c56657d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 13 Aug 2024 21:29:26 -0400
Subject: [PATCH 171/423] Correcting build script to not double-zip plugin

---
 .github/workflows/push.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index d7261742..5af129c5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Permissions
         run: chmod +x build.sh
@@ -22,7 +22,7 @@ jobs:
         shell: bash
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: touchpoint-wp.zip
-          path: touchpoint-wp.zip
\ No newline at end of file
+          name: touchpoint-wp
+          path: build

From 25dbdccc320731983b13f2453b654bfca116cea1 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 14 Aug 2024 17:26:26 -0400
Subject: [PATCH 172/423] Not committing these things was a mistake.

---
 src/TouchPoint-WP/Partner.php             | 16 +++--
 src/TouchPoint-WP/Rsvp.php                |  2 +
 src/templates/meeting-archive.php         |  2 +-
 src/templates/parts/meeting-list-item.php | 85 +++++++++++++++++++++++
 4 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 src/templates/parts/meeting-list-item.php

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index ceefa8e8..406dd6f1 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -814,14 +814,16 @@ protected static final function filterDropdownHtml($params = []): string
 		    && TouchPointWP::instance()->settings->global_primary_tax !== "") {
 
 			$tax     = get_taxonomy(Taxonomies::TAX_GP_CATEGORY);
-			$name    = substr($tax->name, strlen(TouchPointWP::SETTINGS_PREFIX));
-			$content .= "<select class=\"$class-filter\" data-partner-filter=\"$name\">";
-			$content .= "<option disabled selected>$tax->label</option>";
-			$content .= "<option value=\"\">$any</option>";
-			foreach (get_terms(Taxonomies::TAX_GP_CATEGORY) as $t) {
-				$content .= "<option value=\"$t->slug\">$t->name</option>";
+			if ($tax !== false) {
+				$name    = substr($tax->name, strlen(TouchPointWP::SETTINGS_PREFIX));
+				$content .= "<select class=\"$class-filter\" data-partner-filter=\"$name\">";
+				$content .= "<option disabled selected>$tax->label</option>";
+				$content .= "<option value=\"\">$any</option>";
+				foreach (get_terms(Taxonomies::TAX_GP_CATEGORY) as $t) {
+					$content .= "<option value=\"$t->slug\">$t->name</option>";
+				}
+				$content .= "</select>";
 			}
-			$content .= "</select>";
 		}
 
 		if ($params['includeMapWarnings']) {
diff --git a/src/TouchPoint-WP/Rsvp.php b/src/TouchPoint-WP/Rsvp.php
index 184f01b8..d3c2ca6e 100644
--- a/src/TouchPoint-WP/Rsvp.php
+++ b/src/TouchPoint-WP/Rsvp.php
@@ -115,6 +115,8 @@ public static function shortcode(array $params, string $content): string
 			TouchPointWP::enqueueActionsStyle('rsvp');
 			Person::enqueueUsersForJsInstantiation();
 
+			// TODO merge with Meeting::rsvpButton()
+
 			return "<a href=\"#\" onclick=\"return false;\" $class disabled data-tp-action=\"rsvp\" data-tp-mtg=\"$meetingId\"><span class=\"rsvp-btn-content\" style=\"display:none\">$content</span><span class=\"rsvp-btn-preload\">$preloadMsg</span></a>";
 		}
 	}
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
index 68eb3377..9b24c18e 100644
--- a/src/templates/meeting-archive.php
+++ b/src/templates/meeting-archive.php
@@ -25,7 +25,7 @@
     <header class="archive-header has-text-align-center header-footer-group">
         <div class="archive-header-inner section-inner medium">
             <h1 class="archive-title page-title"><?php _ex("Events", "What Meetings should be called, plural.", 'TouchPoint-WP') ?></h1>
-            <?php echo Meeting::filterShortcode(['type' => $postType]); ?>
+<!--   TODO         --><?php //echo Meeting::filterShortcode(['type' => $postType]); ?>
             <?php if ($description) { ?>
                 <div class="archive-description"><?php echo wp_kses_post(wpautop($description)); ?></div>
             <?php } ?>
diff --git a/src/templates/parts/meeting-list-item.php b/src/templates/parts/meeting-list-item.php
new file mode 100644
index 00000000..15494161
--- /dev/null
+++ b/src/templates/parts/meeting-list-item.php
@@ -0,0 +1,85 @@
+<?php
+
+use tp\TouchPointWP\Involvement;
+use tp\TouchPointWP\Involvement_PostTypeSettings;
+use tp\TouchPointWP\Meeting;
+use tp\TouchPointWP\TouchPointWP;
+
+global $post;
+
+/** @var $post WP_Post */
+/** @var $settings Involvement_PostTypeSettings */
+
+$mtg = Meeting::fromPost($post);
+
+$postTypeClass = get_post_type($post);
+$postTypeClass = str_replace(TouchPointWP::HOOK_PREFIX, "", $postTypeClass);
+$postItemClass = $params['itemclass'] ?? "mtg-list-item";
+
+?>
+
+<article id="<?php echo $postTypeClass; ?>-<?php the_ID(); ?>" <?php post_class($postItemClass); ?> data-tp-involvement="<?php echo $mtg->post_id() ?>">
+    <header class="entry-header">
+        <div class="entry-header-inner">
+        <?php
+        /** @noinspection HtmlUnknownTarget */
+        the_title(sprintf('<h2 class="entry-title default-max-width heading-size-1"><a href="%s">', esc_url(get_permalink())), '</a></h2>');
+        ?>
+        </div>
+        <div class="post-meta-single post-meta-single-top">
+            <span class="post-meta">
+                <?php
+
+                $metaStrings = [];
+                $notableAttributes = $mtg->notableAttributes();
+                foreach ($notableAttributes as $a)
+                {
+                    $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
+                }
+                echo implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
+
+                ?>
+            </span><!-- .post-meta -->
+        </div>
+    </header><!-- .entry-header -->
+    <div class="entry-content">
+        <?php echo wp_trim_words(get_the_excerpt(), 20, "..."); ?>
+    </div>
+    <div class="actions involvement-actions <?php echo $postTypeClass; ?>-actions">
+        <?php echo $mtg->getActionButtons('list-item', "btn button"); ?>
+    </div>
+    <?php if (isset($settings) && $settings->hierarchical) {
+        $children = get_children([
+            'post_parent' => $post->ID,
+            'orderby' => 'title',
+            'order' => 'ASC',
+            'post_type' => get_post_type($post)
+        ]);
+        if (count($children) > 0) {
+            echo "<div class='child-involvements'>";
+        }
+        foreach ($children as $child) {
+            /** @var WP_Post $child */
+            echo "<div>";
+            $link = get_permalink($child);
+            echo "<h3 class='inline'><a href=\"$link\" class='small'>$child->post_title</a></h3>";
+
+	        $childInv = Involvement::fromPost($child);
+
+	        $metaStrings = [];
+	        foreach ($childInv->notableAttributes($notableAttributes) as $a)
+	        {
+		        $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
+	        }
+	        $m = implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
+            if ($m !== "") {
+                echo "<span class=\"post-meta\">$m</span>";
+            }
+
+            echo "</div>";
+        }
+        if (count($children) > 0) {
+            echo "</div>";
+        }
+    } ?>
+</article>
\ No newline at end of file

From 77639427af9c91876f778c0418f09d6f8a24d999 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 14 Aug 2024 20:26:59 -0400
Subject: [PATCH 173/423] Fixing a formatting oddity with Python Reports.

---
 src/TouchPoint-WP/Report.php | 66 ++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 254ec8e7..d61cf157 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -305,7 +305,7 @@ public static function reportShortcode($params = [], string $content = ""): stri
 
 		$permalink = esc_attr(get_post_permalink($report->getPost()));
 
-        $rc     = "<figure $idAttr class=\"$class\" data-tp-report=\"$permalink\">\n\t" . str_replace("\n", "\n\t", $rc);
+		$rc     = "<figure $idAttr class=\"$class\" data-tp-report=\"$permalink\">\n\t" . str_replace("\n", "\n\t", $rc);
 
 		// If desired, add a caption that indicates when the table was last updated.
 		if ($params['showupdated']) {
@@ -336,24 +336,24 @@ public function getPost(bool $create = false): ?WP_Post
 	{
 		if ( ! $this->_postLoaded || ($this->post === null && $create)) {
 			$q = new WP_Query([
-				'post_type'   => self::POST_TYPE,
-				'meta_query'  => [
-					'relation' => 'AND',
-					[
-						'key'   => self::TYPE_META_KEY,
-						'value' => $this->type
-					],
-					[
-						'key'   => self::NAME_META_KEY,
-						'value' => $this->name
-					],
-					[
-						'key'   => self::P1_META_KEY,
-						'value' => $this->p1
-					]
-				],
-				'numberposts' => 2  // only need one, but if there's two, there should be an error condition.
-			]);
+				                  'post_type'   => self::POST_TYPE,
+				                  'meta_query'  => [
+					                  'relation' => 'AND',
+					                  [
+						                  'key'   => self::TYPE_META_KEY,
+						                  'value' => $this->type
+					                  ],
+					                  [
+						                  'key'   => self::NAME_META_KEY,
+						                  'value' => $this->name
+					                  ],
+					                  [
+						                  'key'   => self::P1_META_KEY,
+						                  'value' => $this->p1
+					                  ]
+				                  ],
+				                  'numberposts' => 2  // only need one, but if there's two, there should be an error condition.
+			                  ]);
 
 			$reportPosts = $q->get_posts();
 			$counts      = count($reportPosts);
@@ -364,15 +364,15 @@ public function getPost(bool $create = false): ?WP_Post
 				$this->post = reset($reportPosts);
 			} elseif ($create) {
 				$postId = wp_insert_post([
-					'post_type'   => self::POST_TYPE,
-					'post_status' => 'publish',
-					'post_name'   => $this->title() . " " . $this->type,
-					'meta_input'  => [
-						self::NAME_META_KEY => $this->name,
-						self::TYPE_META_KEY => $this->type,
-						self::P1_META_KEY   => $this->p1
-					]
-				]);
+					                         'post_type'   => self::POST_TYPE,
+					                         'post_status' => 'publish',
+					                         'post_name'   => $this->title() . " " . $this->type,
+					                         'meta_input'  => [
+						                         self::NAME_META_KEY => $this->name,
+						                         self::TYPE_META_KEY => $this->type,
+						                         self::P1_META_KEY   => $this->p1
+					                         ]
+				                         ]);
 				if (is_wp_error($postId)) {
 					$this->post = null;
 					new TouchPointWP_WPError($postId);
@@ -490,8 +490,14 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 				continue;
 			}
 
+			$content = $u->result;
+
+			if ($u->type === 'sql') {
+				$content = self::cleanupSqlContent($content);
+			}
+
 			$post               = $report->getPost(true);
-			$post->post_content = self::cleanupContent($u->result);
+			$post->post_content = $content;
 			$submit             = $report->submitUpdate();
 
 			if ( ! in_array($post->ID, $postIdsToNotDelete)) {
@@ -534,7 +540,7 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 	 *
 	 * @return string
 	 */
-	private static function cleanupContent(string $content): string
+	private static function cleanupSqlContent(string $content): string
 	{
 		$closes  = substr($content, strrpos($content, '</tr>') + 5);
 		$content = substr($content, 0, strrpos($content, '<tr'));

From e7a548e421b4d126022e52d61fe4d96eee991311 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 25 Aug 2024 10:16:55 -0400
Subject: [PATCH 174/423] Create a TouchPoint-specific user for updates. 
 Starts #200, closes #199.

---
 src/TouchPoint-WP/Report.php       |  6 ++-
 src/TouchPoint-WP/TouchPointWP.php | 80 ++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index d61cf157..8a32dcc4 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -76,7 +76,7 @@ protected function __construct($params)
 	 *
 	 * @return void
 	 */
-	protected function mergeParams($params)
+	protected function mergeParams($params): void
 	{
 		$this->interval = min($this->interval, $params['interval'] ?? $this->interval);
 	}
@@ -438,6 +438,8 @@ public function content(string $contentIfError = self::DEFAULT_CONTENT): string
 	 */
 	public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): int
 	{
+		TouchPointWP::instance()->setTpWpUserAsCurrent();
+
 		// Find Report Shortcodes in post content and add their involvements to the query.
 		$referencingPosts   = Utilities::getPostContentWithShortcode(self::SHORTCODE_REPORT);
 		$postIdsToNotDelete = [];
@@ -529,6 +531,8 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 			TouchPointWP::instance()->flushRewriteRules();
 		}
 
+		TouchPointWP::instance()->unsetTpWpUserAsCurrent();
+
 		return $updateCount;
 	}
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 26e26924..ebd7e4f3 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -13,6 +13,7 @@
 use WP_Error;
 use WP_Http;
 use WP_Term;
+use WP_User;
 
 
 if ( ! defined('ABSPATH')) {
@@ -2491,4 +2492,83 @@ public static function newQueryObject(): array
 			'context' => null
 		];
 	}
+
+	protected const TPWP_USER = 'touchpoint-wp';
+
+	/**
+	 * @throws TouchPointWP_WPError
+	 */
+	public function validateThatTpWpUserExists(): bool
+	{
+		$displayName = 'TouchPoint-WP Service';
+		$email = 'tpwp@tenth.org';
+
+		// Check if the user already exists
+		if (username_exists(self::TPWP_USER)) {
+			return true; // User already exists, no need to create
+		}
+
+		// Generate a random password
+		$password = wp_generate_password(50, false);
+
+		// Create the user
+		$user_id = wp_create_user(self::TPWP_USER, $password, $email);
+
+		if (is_wp_error($user_id)) {
+			throw new TouchPointWP_WPError($user_id);
+		}
+
+		// Set the role to administrator
+		$user = new WP_User($user_id);
+		$user->set_role('administrator');
+		$user->display_name = $displayName;
+		wp_update_user($user);
+
+		return true;
+	}
+
+	/**
+	 * A variable to hold the actual user, if there is one while we temporarily swap to the TPWP user.
+	 *
+	 * @var WP_User|null
+	 */
+	protected ?WP_User $priorUser = null;
+
+
+	/**
+	 * Make the TPWP user the active one, so permissions are not dependent on whoever happens to be running things
+	 * at the moment. 
+	 *
+	 * @return void
+	 */
+	public function setTpWpUserAsCurrent(): void
+	{
+		try {
+			$this->validateThatTpWpUserExists();
+		} catch (TouchPointWP_WPError) {
+		}
+
+		$priorUser = wp_get_current_user();
+
+		$tpUser = get_user_by('login', 'touchpoint-wp');
+		if ($tpUser && $tpUser !== $priorUser) {
+			$this->priorUser = $priorUser;
+			wp_set_current_user($tpUser->ID, $tpUser->user_login);
+		}
+	}
+
+	/**
+	 * Restore the actual user to the user position.
+	 *
+	 * @return void
+	 */
+	public function unsetTpWpUserAsCurrent(): void
+	{
+		if ($this->priorUser) {
+			wp_set_current_user($this->priorUser->ID, $this->priorUser->user_login);
+			$this->priorUser = null;
+		} else {
+			wp_set_current_user(0);
+		}
+	}
 }
\ No newline at end of file

From c06a16de92f89f17e3141a588af1cabe9cfd817d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 25 Aug 2024 20:25:29 -0400
Subject: [PATCH 175/423] Use a TouchPoint user for updates.  Closes #200.

---
 src/TouchPoint-WP/Involvement.php | 4 ++++
 src/TouchPoint-WP/Partner.php     | 4 ++++
 src/TouchPoint-WP/Person.php      | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 66780052..85fe6ca6 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -381,13 +381,17 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 			}
 
 			// Divisions
+			$update = false;
 			try {
+				TouchPointWP::instance()->setTpWpUserAsCurrent();
 				$update = self::updateInvolvementPostsForType($type, $verbose);
 			} catch (Exception $e) {
 				if ($verbose) {
 					echo "An exception occurred while syncing $type->namePlural: " . $e->getMessage();
 				}
 				continue;
+			} finally {
+				TouchPointWP::instance()->unsetTpWpUserAsCurrent();
 			}
 
 			if ($update === false) {
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 406dd6f1..f9f6fd09 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -292,6 +292,8 @@ public static function updateFromTouchPoint(bool $verbose = false)
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
 
+		TouchPointWP::instance()->setTpWpUserAsCurrent();
+
 		if (TouchPointWP::instance()->settings->enable_global !== 'on') {
 			if ($verbose) {
 				echo "Global is not enabled.";
@@ -545,6 +547,8 @@ public static function updateFromTouchPoint(bool $verbose = false)
 		if ($count > 0) {
 			TouchPointWP::instance()->flushRewriteRules();
 		}
+		
+		TouchPointWP::instance()->unsetTpWpUserAsCurrent();
 
 		return $count;
 	}
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 0675c89d..0eaf1b74 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -678,6 +678,8 @@ protected static function updateFromTouchPoint(bool $verbose = false)
 		$queryNeeded = false;
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
+		
+		TouchPointWP::instance()->setTpWpUserAsCurrent();
 
 		// Existing Users
 		/** @noinspection SqlResolve */
@@ -782,6 +784,8 @@ protected static function updateFromTouchPoint(bool $verbose = false)
 			}
 		}
 
+		TouchPointWP::instance()->unsetTpWpUserAsCurrent();
+
 		return $count;
 	}
 

From 9ae562744d80835ccfe86ea13ed4a3c7b99ff631 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 30 Aug 2024 16:42:50 -0400
Subject: [PATCH 176/423] Prevent Report update from shifting notably later in
 the day.

---
 src/TouchPoint-WP/Report.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 8a32dcc4..83b666bf 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -51,7 +51,7 @@ class Report implements api, module, JsonSerializable, updatesViaCron
 
 	protected string $type;
 	protected string $name;
-	protected float $interval;
+	protected float $interval;  // Hours
 	protected string $p1 = '';
 
 	protected int $status = 0;
@@ -557,12 +557,15 @@ private static function cleanupSqlContent(string $content): string
 	/**
 	 * Get the update Interval as a DateInterval for use with DateTime functions.
 	 *
+	 * @param int $diff Number of minutes to subtract from the interval.  Default is 15.
+	 *
 	 * @return DateInterval
 	 */
-	public function intervalAsDateInterval(): DateInterval
+	protected function intervalAsDateInterval(int $diff = 15): DateInterval
 	{
-		$m = ($this->interval * 60) % 60;
-		$h = $this->interval - ($m / 60);
+		$i = $this->interval - ($diff / 60); // subtract to avoid updates shifting later in the day.
+		$m = ($i * 60) % 60;
+		$h = $i - ($m / 60);
 
 		return new DateInterval("PT{$h}H{$m}M");
 	}

From ce0421bcf336fa421fc7d024612b9db1dde103fd Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 10 Sep 2024 18:04:22 -0400
Subject: [PATCH 177/423] Improvements for python reports that generate SVGs.
 Closes #201 Closes #202

---
 src/TouchPoint-WP/Report.php                  | 79 +++++++++++++++++++
 .../Utilities/ImageConversions.php            | 50 ++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 src/TouchPoint-WP/Utilities/ImageConversions.php

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 83b666bf..3326020d 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -10,6 +10,7 @@
 use Exception;
 use JsonSerializable;
 use tp\TouchPointWP\Utilities\Http;
+use tp\TouchPointWP\Utilities\ImageConversions;
 use WP_Error;
 use WP_Post;
 use WP_Query;
@@ -21,6 +22,8 @@
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "api.php";
 	require_once "updatesViaCron.php";
+	require_once "Utilities/ImageConversions.php";
+	require_once "Utilities/Http.php";
 }
 
 /**
@@ -218,6 +221,77 @@ public static function api(array $uri): bool
 					}
 					exit;
 			}
+		} else if (count($uri['path']) === 4) {
+			[$filename, $ext] = explode(".", $uri['path'][3], 2);
+
+			switch ($uri['path'][2]) {
+				case "py":
+					TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
+
+					$r = Report::fromParams([
+						                        'type'     => 'python',
+						                        'name'     => $filename,
+						                        'p1'       => $_GET['p1'] ?? ''
+					                        ]);
+					$content = $r->content();
+					if ($content === self::DEFAULT_CONTENT) {
+						http_response_code(Http::NOT_FOUND);
+						exit;
+					}
+
+					switch ($ext) {
+						case "svg":
+							header("Content-Type: image/svg+xml");
+							break;
+
+						case "svg.png":
+							$cached = get_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png", true);
+							if ($cached !== '') {
+								$content = base64_decode($cached);
+							} else {
+								try {
+									$content = "";
+									$content = ImageConversions::svgToPng($content);
+									update_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png", base64_encode($content));
+								} catch (TouchPointWP_Exception $e) {
+									http_response_code(Http::SERVICE_UNAVAILABLE);
+									echo $e->getMessage();
+									exit;
+								} catch (Exception $e) {
+									http_response_code(Http::SERVER_ERROR);
+									echo $e->getMessage();
+									exit;
+								}
+							}
+							header("Content-Type: image/png");
+							break;
+
+						default:
+							header("Content-Type: text/plain");
+							break;
+					}
+
+
+					echo $content;
+					exit;
+
+				case "sql":
+					TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
+					header("Cache-Control: max-age=3600, must-revalidate, public");
+					$r = Report::fromParams([
+						                        'type'     => 'sql',
+						                        'name'     => $filename,
+						                        'p1'       => $_GET['p1'] ?? ''
+					                        ]);
+					$content = $r->content();
+					if ($content === self::DEFAULT_CONTENT) {
+						http_response_code(Http::NOT_FOUND);
+						exit;
+					}
+
+					echo $content;
+					exit;
+			}
 		}
 
 		return false;
@@ -406,6 +480,11 @@ protected function submitUpdate()
 			return null;
 		}
 
+		// Clear the cached PNG if it exists.
+		if (get_post_meta($this->post->ID, self::META_PREFIX . "svg_png", true) !== '') {
+			update_post_meta($this->post->ID, self::META_PREFIX . "svg_png", '');
+		}
+
 		return wp_update_post($this->post);
 	}
 
diff --git a/src/TouchPoint-WP/Utilities/ImageConversions.php b/src/TouchPoint-WP/Utilities/ImageConversions.php
new file mode 100644
index 00000000..9ea2b6de
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/ImageConversions.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+use DOMDocument;
+use tp\TouchPointWP\TouchPointWP_Exception;
+
+/**
+ * Utility class for Image Conversions
+ */
+abstract class ImageConversions
+{
+	/**
+	 * @throws \ImagickException
+	 * @throws TouchPointWP_Exception
+	 */
+	public static function svgToPng($svgContent): string
+	{
+		$svg = new DOMDocument();
+		$svg->loadXML($svgContent);
+
+		// won't work without xmlns.  This makes sure it's present.
+		$svg->documentElement->setAttribute('xmlns', 'http://www.w3.org/2000/svg');
+
+		// Test if Imagick is available
+		if (!extension_loaded('imagick')) {
+			throw new TouchPointWP_Exception('Imagick extension is not available');
+		}
+
+		if (count(\Imagick::queryformats('SVG')) < 1) {
+			throw new TouchPointWP_Exception('Imagick on this server does not support SVG');
+		}
+
+		$im = new \Imagick();
+		$im->setResolution(300, 300);
+		$im->setBackgroundColor(new \ImagickPixel('transparent'));
+		$im->readImageBlob($svg->saveXML());
+
+		$im->setImageAlphaChannel(\Imagick::ALPHACHANNEL_ACTIVATE);
+
+		$im = $im->mergeImageLayers(\Imagick::LAYERMETHOD_FLATTEN);
+
+		$im->setImageFormat('png');
+
+		return $im->getImageBlob();
+	}
+}
\ No newline at end of file

From 635dc94d76831360a424e829d9a8fa6fd50119a9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 10 Sep 2024 18:04:50 -0400
Subject: [PATCH 178/423] Adding DOM requirement

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 50bc49f5..eec1aa45 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
     "php": ">=8.0",
     "composer/installers": "~1.0",
     "ext-json": "*",
-    "ext-zip": "*"
+    "ext-zip": "*",
+    "ext-dom": "*"
   },
   "require-dev": {
     "pronamic/wp-documentor": "^1.3",

From 7debc5db9e36b9beac55382458afb099b259a7d5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 10 Sep 2024 18:20:08 -0400
Subject: [PATCH 179/423] Resolving issues with nginx assuming .png files are
 static

---
 src/TouchPoint-WP/Report.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 3326020d..7eb426e4 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -221,8 +221,17 @@ public static function api(array $uri): bool
 					}
 					exit;
 			}
-		} else if (count($uri['path']) === 4) {
-			[$filename, $ext] = explode(".", $uri['path'][3], 2);
+		} else if (count($uri['path']) === 4 || count($uri['path']) === 5) {
+			$parts = explode(".", $uri['path'][3], 2);
+			if (count($parts) === 2) {
+				[$filename, $ext] = $parts;
+			} else {
+				$filename = $parts[0];
+				$ext	  = null;
+				if (isset($uri['path'][4])) {
+					$ext = str_replace("_", '.', $uri['path'][4]) ?? null;
+				}
+			}
 
 			switch ($uri['path'][2]) {
 				case "py":

From fb45fa0ace38294a607aded8fe50385b8c9e87d2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 10 Sep 2024 18:27:17 -0400
Subject: [PATCH 180/423] Typo

---
 src/TouchPoint-WP/Report.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 7eb426e4..19b01069 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -259,7 +259,6 @@ public static function api(array $uri): bool
 								$content = base64_decode($cached);
 							} else {
 								try {
-									$content = "";
 									$content = ImageConversions::svgToPng($content);
 									update_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png", base64_encode($content));
 								} catch (TouchPointWP_Exception $e) {

From 1cd453abf51602107953ce5cf82ebaeca7ff82de Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 11 Sep 2024 12:23:56 -0400
Subject: [PATCH 181/423] Adding a validation step for image conversion.

---
 src/TouchPoint-WP/Utilities/ImageConversions.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities/ImageConversions.php b/src/TouchPoint-WP/Utilities/ImageConversions.php
index 9ea2b6de..637b5d54 100644
--- a/src/TouchPoint-WP/Utilities/ImageConversions.php
+++ b/src/TouchPoint-WP/Utilities/ImageConversions.php
@@ -30,7 +30,7 @@ public static function svgToPng($svgContent): string
 			throw new TouchPointWP_Exception('Imagick extension is not available');
 		}
 
-		if (count(\Imagick::queryformats('SVG')) < 1) {
+		if (count(\Imagick::queryFormats('SVG')) < 1) {
 			throw new TouchPointWP_Exception('Imagick on this server does not support SVG');
 		}
 
@@ -43,7 +43,9 @@ public static function svgToPng($svgContent): string
 
 		$im = $im->mergeImageLayers(\Imagick::LAYERMETHOD_FLATTEN);
 
-		$im->setImageFormat('png');
+		if (!$im->setImageFormat('png')) {
+			throw new TouchPointWP_Exception('Failed to set image format as png');
+		}
 
 		return $im->getImageBlob();
 	}

From a114952dbf20b51e666e2192c024bf7170c67167 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 11 Sep 2024 13:27:09 -0400
Subject: [PATCH 182/423] No longer updating content of past meetings.  Some
 code updates along the way.

---
 src/TouchPoint-WP/Involvement.php             | 62 +++++++++++--------
 src/TouchPoint-WP/Meeting.php                 |  8 ++-
 .../Utilities/StringableArray.php             |  7 ++-
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 85fe6ca6..5a858909 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -23,6 +23,7 @@
 use DateTimeImmutable;
 use DateTimeZone;
 use Exception;
+use JetBrains\PhpStorm\NoReturn;
 use JsonSerializable;
 use stdClass;
 use tp\TouchPointWP\Utilities\DateFormats;
@@ -623,6 +624,7 @@ public function getRegistrationType(): int
 	 * @deprecated 0.0.90  Does not take into account all the possible registration types; will be removed in a future
 	 *     version.
 	 *
+	 * @noinspection PHPUnused
 	 * @return bool
 	 */
 	public function useRegistrationForm(): bool
@@ -744,12 +746,12 @@ protected static function scheduleStrings(int $invId, $inv = null): ?array
 	 * This is separated out to a static method to prevent involvement from being instantiated (with those database
 	 * hits) when the content is cached.  (10x faster or more)
 	 *
-	 * @param int           $invId
-	 * @param ?Involvement  $inv
+	 * @param int          $invId
+	 * @param ?Involvement $inv
 	 *
 	 * @return ?string
 	 */
-	public static function scheduleString(int $invId, $inv = null): ?string
+	public static function scheduleString(int $invId, ?Involvement $inv = null): ?string
 	{
 		$s = self::scheduleStrings($invId, $inv);
 		return $s['combined'];
@@ -1174,6 +1176,7 @@ protected function getDivisions(): array
 	 * Returns an array of the Involvement's Divisions, excluding those that cause it to be included.
 	 *
 	 * @return string[]
+	 * @noinspection PhpUnused
 	 */
 	public function getDivisionsStrings(): array
 	{
@@ -1554,6 +1557,7 @@ private static function getWpPostByInvolvementId($postType, $involvementId): WP_
 	 * @return string
 	 *
 	 * @noinspection PhpUnusedParameterInspection
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	public static function listShortcode($params = [], string $content = ""): string
 	{
@@ -1992,7 +1996,7 @@ public static function api(array $uri): bool
 			case "nearby":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE);
 				self::ajaxNearby();
-				exit;
+//				exit;  ajaxNearby() is no-return.
 
 			case "force-sync":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
@@ -2007,6 +2011,7 @@ public static function api(array $uri): bool
 	/**
 	 * Handles the API call to get nearby involvements (probably small groups)
 	 */
+	#[NoReturn]
 	public static function ajaxNearby(): void
 	{
 		header('Content-Type: application/json');
@@ -2626,6 +2631,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 				$post = wp_insert_post(
 					[ // create new
 						'post_type'  => $typeSets->postType,
+						'post_title' => $inv->titleToUse,
 						'post_name'  => $inv->titleToUse,
 						'post_status' => 'publish',
 						'meta_input' => [
@@ -3010,7 +3016,7 @@ protected static function updateMeetingsForInvolvement(
 
 		// Return if meetings shouldn't be imported at all.
 		if (!$typeSets->importMeetings && !$inv->showInSites) {
-			self::doMeetingMetaUpdates($post, null, false, $imagePostId, $verbose);
+			self::doMeetingMetaUpdates($post, null, false, $verbose);
 			return [$post->ID];
 		}
 
@@ -3018,19 +3024,11 @@ protected static function updateMeetingsForInvolvement(
 		// Determine Strategy //
 		////////////////////////
 
-		switch (count($inv->meetings)) {
-			case 0:
-				$strategy = self::MEETING_STRATEGY_NONE;
-				break;
-
-			case 1:
-				$strategy = self::MEETING_STRATEGY_SINGLE;
-				break;
-
-			default:
-				$strategy = self::MEETING_STRATEGY_MULTIPLE;
-				break;
-		}
+		$strategy = match (count($inv->meetings)) {
+			0 => self::MEETING_STRATEGY_NONE,
+			1 => self::MEETING_STRATEGY_SINGLE,
+			default => self::MEETING_STRATEGY_MULTIPLE,
+		};
 
 		////////////////////
 		// Title and Slug //
@@ -3066,7 +3064,7 @@ protected static function updateMeetingsForInvolvement(
 		if ($strategy === self::MEETING_STRATEGY_MULTIPLE) {
 
 			// If the main post was previously a single, it needs to have the meeting info removed.
-			self::doMeetingMetaUpdates($post, null, false, $imagePostId, $verbose);
+			self::doMeetingMetaUpdates($post, null, false, $verbose);
 
 			foreach ($inv->meetings as $mtgO) {
 
@@ -3118,8 +3116,15 @@ protected static function updateMeetingsForInvolvement(
 					$loops++;
 				} while ($counts > 1 && $loops < 3);
 
+				$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow();
+
 				if ($counts > 0) { // post exists already.
 					$mtgP = reset($mtgP);
+				} elseif ($eventIsPast) {
+					if ($verbose) {
+						echo "<p>Post not found for Meeting $mtgO->mtgId.  As it is in the past, it will not be created.</p>";
+					}
+					continue;
 				} else {
 					if ($verbose) {
 						echo "<p>Post not found for Meeting $mtgO->mtgId.  Creating.</p>";
@@ -3139,10 +3144,12 @@ protected static function updateMeetingsForInvolvement(
 				}
 
 				$mtgP->post_title = $title;
-				$mtgP->post_content = Utilities::standardizeHtml($inv->description, "meeting-import");
+				if (!$eventIsPast) {
+					$mtgP->post_content = Utilities::standardizeHtml($inv->description, "meeting-import");
+				}
 				$mtgP->post_parent = $post->ID;
 
-				self::doMeetingMetaUpdates($mtgP, $mtgO, !!$inv->showInSites, $imagePostId, $verbose);
+				self::doMeetingMetaUpdates($mtgP, $mtgO, !!$inv->showInSites, $verbose);
 
 				wp_update_post($mtgP);
 
@@ -3159,9 +3166,9 @@ protected static function updateMeetingsForInvolvement(
 			// TODO resolve Undefined array key 0 warning
 			// TODO make sure synced
 			if ($strategy === self::MEETING_STRATEGY_SINGLE) {
-				self::doMeetingMetaUpdates($post, $inv->meetings[0], !!$inv->showInSites, $imagePostId, $verbose);
+				self::doMeetingMetaUpdates($post, $inv->meetings[0], !!$inv->showInSites, $verbose);
 			} else { // MEETING_STRATEGY_NONE
-				self::doMeetingMetaUpdates($post, null, false, $imagePostId, $verbose);
+				self::doMeetingMetaUpdates($post, null, false, $verbose);
 			}
 
 			wp_update_post($post);
@@ -3181,12 +3188,11 @@ protected static function updateMeetingsForInvolvement(
 	 * @param WP_Post $mtgP
 	 * @param ?object $mtgO
 	 * @param bool    $feature
-	 * @param int     $imagePostId
 	 * @param bool    $verbose
 	 *
 	 * @return void
 	 */
-	protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, bool $feature, int $imagePostId, bool $verbose = false): void
+	protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, bool $feature, bool $verbose = false): void
 	{
 		// If the main post was previously a single, it needs to have the meeting info removed.
 		if ($mtgO === null) {
@@ -3197,6 +3203,8 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			delete_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY);
 			delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
 		} else {
+			$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow();
+
 			update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId);
 			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, DateFormats::timestampWithoutOffset($mtgO->mtgStartDt));
 			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, DateFormats::timestampWithoutOffset($mtgO->mtgEndDt));
@@ -3204,7 +3212,7 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
 			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
 
-			if ($mtgO->location !== null) {
+			if ($mtgO->location !== null && !$eventIsPast) {
 				update_post_meta($mtgP->ID, Meeting::MEETING_LOCATION_META_KEY, $mtgO->location);
 			}
 
@@ -3757,7 +3765,7 @@ protected function AsAMeeting(): ?Meeting
 		if (Meeting::postIsType($this->post)) {
 			try {
 				return Meeting::fromPost($this->post);
-			} catch (TouchPointWP_Exception $e) {
+			} catch (TouchPointWP_Exception) {
 				return null;
 			}
 		}
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index d2dff664..c34476ca 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -519,10 +519,16 @@ public static function filterThumbnailId(int|false $thumbnail_id, int|WP_Post|nu
 		}
 
 		try {
-			$involvementPostId = Meeting::fromPost($post)->getParent()?->post_id();
+			$meeting = Meeting::fromPost($post);
+			$involvementPostId = $meeting->involvement()?->post_id();
 			if (!$involvementPostId) {
 				return $thumbnail_id;
 			}
+
+			if (get_the_content(post: $involvementPostId) !== get_the_content(post: $meeting->post_id())) {
+				return $thumbnail_id;
+			}
+
 			return get_post_thumbnail_id($involvementPostId);
 		} catch (TouchPointWP_Exception) {
 		}
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index e4f596f6..c3ffc9b7 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -93,12 +93,13 @@ public function join(string $separator = null): string
 	/**
 	 * Convert the array to a list string with ampersands and such.
 	 *
-	 * @param int $limit
+	 * @param int  $limit
+	 * @param bool $andOthers
 	 *
 	 * @return string
 	 */
-	public function toListString(int $limit = PHP_INT_MAX): string
+	public function toListString(int $limit = PHP_INT_MAX, bool $andOthers = false): string
 	{
-		return Utilities::stringArrayToListString($this->getArrayCopy(), $limit);
+		return Utilities::stringArrayToListString($this->getArrayCopy(), $limit, $andOthers);
 	}
 }
\ No newline at end of file

From 758b35f5e42cea359edd4b8352dea280d39f19be Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 11 Sep 2024 22:54:15 -0400
Subject: [PATCH 183/423] Resolving some styling oddities.  Also removing
 duplicate action buttons in some cases.

---
 src/TouchPoint-WP/Involvement.php               | 12 ++++++------
 src/TouchPoint-WP/Meeting.php                   |  8 ++++----
 src/TouchPoint-WP/Partner.php                   |  2 +-
 src/TouchPoint-WP/Utilities/StringableArray.php |  9 +++++++--
 src/templates/parts/meeting-list-item.php       |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 5a858909..40266c98 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3624,17 +3624,17 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		if (self::allowContact($this->invType) && $this->leaders()->count() > 0) {
 			$text  = __("Contact Leaders", 'TouchPoint-WP');
 			if (!$absoluteLinks) {
-				$ret[] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button> ";
+				$ret['contact_leader'] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button> ";
 				TouchPointWP::enqueueActionsStyle('inv-contact');
 			} else {
 				$iid = $this->invId;
-				$ret[] = "<a href=\"$baseLink#tp-contact-i$iid\"$btnClass>$text</a> ";
+				$ret['contact_leader'] = "<a href=\"$baseLink#tp-contact-i$iid\"$btnClass>$text</a> ";
 			}
 		}
 
 		// Register Button
 		if ($includeRegister === true) {
-			$ret[] = $this->getRegisterButton($classesOnly);
+			$ret['register'] = $this->getRegisterButton($classesOnly);
 		}
 
 		// Show on map button.  (Only works if map is called before this is.)
@@ -3642,9 +3642,9 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 			$text = __("Show on Map", 'TouchPoint-WP');
 			if ($ret->count() > 1) {
 				TouchPointWP::requireScript("fontAwesome");
-				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"fa-solid fa-location-pin\"></i></button>");
+				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"fa-solid fa-location-pin\"></i></button>", "map");
 			} else {
-				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>");
+				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>", "map");
 			}
 		}
 
@@ -3653,7 +3653,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 			// Translators: %s is the system name.  "TouchPoint" by default.
 			$title  = wp_sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$logo = TouchPointWP::TouchPointIcon();
-			$ret[]  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
+			$ret['inv_tp']  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
 		}
 
 		/**
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index c34476ca..8783c14c 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -417,14 +417,14 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 
 		if ($this->status() !== self::STATUS_CANCELLED) {
 			if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
-				$ret[] = $inv->getRegisterButton($btnClass, $absoluteLinks);
+				$ret['register'] = $inv->getRegisterButton($btnClass, $absoluteLinks);
 			}
 
 			if ($inv->getRegistrationType() === RegistrationType::RSVP) {
 				if ($absoluteLinks) {
-					$ret[] = $this->getRsvpLink($btnClass);
+					$ret['register'] = $this->getRsvpLink($btnClass);
 				} else {
-					$ret[] = $this->getRsvpButton($btnClass);
+					$ret['register'] = $this->getRsvpButton($btnClass);
 				}
 			}
 		}
@@ -434,7 +434,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 			// Translators: %s is the system name.  "TouchPoint" by default.
 			$title  = wp_sprintf(__("Meeting in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$logo = TouchPointWP::TouchPointIcon();
-			$ret[]  = "<a href=\"$tpHost/Meeting/$this->mtgId\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
+			$ret['mtg_tp']  = "<a href=\"$tpHost/Meeting/$this->mtgId\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
 		}
 
 		/**
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index f9f6fd09..a1158925 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1316,7 +1316,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 		// Show on map button.  (Only works if map is called before this is.)
 		if (self::$_hasArchiveMap && ! $this->decoupleLocation && $this->geo !== null && !$absoluteLinks) {
 			$text = __("Show on Map", "TouchPoint-WP");
-			$ret[] = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
+			$ret['map'] = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
 		}
 
 		// TouchPoint link is excluded for privacy, and because we don't really have People IDs readily available.
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index c3ffc9b7..e8954a1e 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -43,11 +43,16 @@ public function count(): int
 	 * Append to the start of the array.
 	 *
 	 * @param mixed $value
+	 * @param null  $key
 	 */
-	public function prepend($value): void
+	public function prepend(mixed $value, $key = null): void
 	{
 		$array = $this->getArrayCopy();
-		array_unshift($array, $value);
+		if (!is_null($key)) {
+			$array = array_merge([$key => $value], $array);
+		} else {
+			$array = array_merge([$value], $array);
+		}
 		$this->exchangeArray($array);
 	}
 
diff --git a/src/templates/parts/meeting-list-item.php b/src/templates/parts/meeting-list-item.php
index 15494161..291787d8 100644
--- a/src/templates/parts/meeting-list-item.php
+++ b/src/templates/parts/meeting-list-item.php
@@ -14,7 +14,7 @@
 
 $postTypeClass = get_post_type($post);
 $postTypeClass = str_replace(TouchPointWP::HOOK_PREFIX, "", $postTypeClass);
-$postItemClass = $params['itemclass'] ?? "mtg-list-item";
+$postItemClass = $params['itemclass'] ?? "inv-list-item";
 
 ?>
 

From ffb9c7b211ed8daa9b23c06ecff8e5b0e01550ba Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 00:24:43 -0400
Subject: [PATCH 184/423] Resolving schedule-string conflicts

---
 src/TouchPoint-WP/Involvement.php           | 147 ++++++++++----------
 src/TouchPoint-WP/Meeting.php               |  87 ++++++++++--
 src/TouchPoint-WP/Utilities/DateFormats.php |  43 +++---
 src/TouchPoint-WP/scheduled.php             |  24 ++++
 4 files changed, 192 insertions(+), 109 deletions(-)
 create mode 100644 src/TouchPoint-WP/scheduled.php

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 40266c98..49cf15c7 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -14,6 +14,7 @@
 	require_once "jsInstantiation.php";
 	require_once "jsonLd.php";
 	require_once "hierarchical.php";
+	require_once "scheduled.php";
 	require_once "updatesViaCron.php";
 	require_once "Utilities.php";
 	require_once "Involvement_PostTypeSettings.php";
@@ -42,7 +43,7 @@
 /**
  * Fundamental object meant to correspond to an Involvement in TouchPoint
  */
-class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module, hierarchical, JsonSerializable
+class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module, hierarchical, JsonSerializable, scheduled
 {
 	use jsInstantiation;
 	use jsonLd;
@@ -746,14 +747,14 @@ protected static function scheduleStrings(int $invId, $inv = null): ?array
 	 * This is separated out to a static method to prevent involvement from being instantiated (with those database
 	 * hits) when the content is cached.  (10x faster or more)
 	 *
-	 * @param int          $invId
-	 * @param ?Involvement $inv
+	 * @param int          $objId
+	 * @param ?Involvement $obj
 	 *
 	 * @return ?string
 	 */
-	public static function scheduleString(int $invId, ?Involvement $inv = null): ?string
+	public static function scheduleString(int $objId, $obj = null): ?string
 	{
-		$s = self::scheduleStrings($invId, $inv);
+		$s = self::scheduleStrings($objId, $obj);
 		return $s['combined'];
 	}
 
@@ -1045,7 +1046,7 @@ protected function scheduleStrings_calc(): array
 				}
 			} elseif ($this->firstMeeting !== null) {
 				$r['firstLast'] = wp_sprintf(
-					// translators: Starts {start date}  e.g. Starts September 15
+				// translators: Starts {start date}  e.g. Starts September 15
 					__('Starts %1$s', 'TouchPoint-WP'),
 					$this->firstMeeting->format($dateFormat)
 				);
@@ -1106,7 +1107,7 @@ protected function scheduleStrings_calc(): array
 					$dateTimeArr[] = $a['datetime'];
 				} else {
 					$dateTimeArr[] = wp_sprintf(
-						// translators: %1$s is the date(s), %2$s is the time(s).
+					// translators: %1$s is the date(s), %2$s is the time(s).
 						__('%1$s at %2$s', 'TouchPoint-WP'), $a['date'], $a['time']
 					);
 					if ( !$dateArr->contains(['date'])) {
@@ -1130,7 +1131,7 @@ protected function scheduleStrings_calc(): array
 				$r['date'] = $dateStr;
 				$r['time'] = $timeArr[0];
 				$r['combined'] = wp_sprintf(
-					// translators: %1$s is the date(s), %2$s is the time(s).
+				// translators: %1$s is the date(s), %2$s is the time(s).
 					__('%1$s at %2$s', 'TouchPoint-WP'),
 					$dateStr,
 					$timeArr[0]
@@ -1408,8 +1409,8 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 		// CSS
 		/** @noinspection SpellCheckingInspection */
 		$params['includecss'] = ! isset($params['includecss']) ||
-								$params['includecss'] === true ||
-								$params['includecss'] === 'true';
+		                        $params['includecss'] === true ||
+		                        $params['includecss'] === 'true';
 
 		// Only group for single post types.
 		$groupBy = null;
@@ -1423,12 +1424,12 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 
 			if ($groupBy !== "" && taxonomy_exists($groupBy)) {
 				$terms = get_terms([
-									   'taxonomy'   => $groupBy,
-									   'order'      => $groupByOrder,
-									   'orderby'    => 'name',
-									   'hide_empty' => true,
-									   'fields'     => 'id=>name'
-								   ]);
+					                   'taxonomy'   => $groupBy,
+					                   'order'      => $groupByOrder,
+					                   'orderby'    => 'name',
+					                   'hide_empty' => true,
+					                   'fields'     => 'id=>name'
+				                   ]);
 			}
 		}
 
@@ -1529,12 +1530,12 @@ private static function getWpPostByInvolvementId($postType, $involvementId): WP_
 		$involvementId = (string)$involvementId;
 
 		$q      = new WP_Query([
-								   'post_type'   => $postType,
-								   'meta_key'    => TouchPointWP::INVOLVEMENT_META_KEY,
-								   'meta_value'  => $involvementId,
-								   'numberposts' => 2
-								   // only need one, but if there's two, there should be an error condition.
-							   ]);
+			                       'post_type'   => $postType,
+			                       'meta_key'    => TouchPointWP::INVOLVEMENT_META_KEY,
+			                       'meta_value'  => $involvementId,
+			                       'numberposts' => 2
+			                       // only need one, but if there's two, there should be an error condition.
+		                       ]);
 		/** @var $posts WP_Post[] */
 		$posts  = $q->get_posts();
 		$counts = count($posts);
@@ -1744,11 +1745,11 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 			}
 			$dvName = TouchPointWP::instance()->settings->dv_name_singular;
 			$dvList = get_terms([
-									'taxonomy'                              => Taxonomies::TAX_DIV,
-									'hide_empty'                            => true,
-									'meta_query'                            => $mq,
-									TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
-								]);
+				                    'taxonomy'                              => Taxonomies::TAX_DIV,
+				                    'hide_empty'                            => true,
+				                    'meta_query'                            => $mq,
+				                    TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
+			                    ]);
 			$dvList = TouchPointWP::orderHierarchicalTerms($dvList, true);
 			if (count($dvList) > 1) {
 				$content .= "<select class=\"$class-filter\" data-involvement-filter=\"div\">";
@@ -1903,11 +1904,11 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 		if (in_array('agegroup', $filters)) {
 			$agName = __("Age", 'TouchPoint-WP');
 			$agList = get_terms([
-									'taxonomy'                              => Taxonomies::TAX_AGEGROUP,
-									'hide_empty'                            => true,
-									'orderby'                               => 't.id',
-									TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
-								]);
+				                    'taxonomy'                              => Taxonomies::TAX_AGEGROUP,
+				                    'hide_empty'                            => true,
+				                    'orderby'                               => 't.id',
+				                    TouchPointWP::HOOK_PREFIX . 'post_type' => $postType
+			                    ]);
 			if (is_array($agList) && count($agList) > 1) {
 				$content .= "<select class=\"$class-filter\" data-involvement-filter=\"agegroup\">";
 				$content .= "<option disabled selected>$agName</option><option value=\"\">$any</option>";
@@ -2026,40 +2027,40 @@ public static function ajaxNearby(): void
 		if ( ! $settings) {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-								 "invList"    => [],
-								 "error"      => "This involvement type doesn't exist.",
-								 "error_i18n" => __("This involvement type doesn't exist.", 'TouchPoint-WP')
-							 ]);
+				                 "invList"    => [],
+				                 "error"      => "This involvement type doesn't exist.",
+				                 "error_i18n" => __("This involvement type doesn't exist.", 'TouchPoint-WP')
+			                 ]);
 			exit;
 		}
 
 		if ( ! $settings->useGeo) {
 			http_response_code(Http::EXPECTATION_FAILED);
 			echo json_encode([
-								 "invList"    => [],
-								 "error"      => "This involvement type doesn't have geographic locations enabled.",
-								 "error_i18n" => __(
-									 "This involvement type doesn't have geographic locations enabled.",
-									 'TouchPoint-WP'
-								 )
-							 ]);
+				                 "invList"    => [],
+				                 "error"      => "This involvement type doesn't have geographic locations enabled.",
+				                 "error_i18n" => __(
+					                 "This involvement type doesn't have geographic locations enabled.",
+					                 'TouchPoint-WP'
+				                 )
+			                 ]);
 			exit;
 		}
 
 		$r = [];
 
 		if ($lat === "null" || $lng === "null" ||
-			$lat === null || $lng === null) {
+		    $lat === null || $lng === null) {
 			$geoObj = TouchPointWP::instance()->geolocate();
 
 			if ($geoObj === false) {
 				http_response_code(Http::PRECONDITION_FAILED);
 				echo json_encode([
-									 "invList"    => [],
-									 "error"      => "Could not locate.",
-									 "error_i18n" => __("Could not locate.", 'TouchPoint-WP'),
-									 "geo"        => false
-								 ]);
+					                 "invList"    => [],
+					                 "error"      => "Could not locate.",
+					                 "error_i18n" => __("Could not locate.", 'TouchPoint-WP'),
+					                 "geo"        => false
+				                 ]);
 				exit;
 			}
 
@@ -2085,10 +2086,10 @@ public static function ajaxNearby(): void
 		if ($invs === null) {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-								 "invList"    => [],
-								 "error"      => wp_sprintf("No %s Found.", $settings->namePlural),
-								 "error_i18n" => wp_sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural)
-							 ]);
+				                 "invList"    => [],
+				                 "error"      => wp_sprintf("No %s Found.", $settings->namePlural),
+				                 "error_i18n" => wp_sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural)
+			                 ]);
 			exit;
 		}
 
@@ -2285,8 +2286,8 @@ public static function updateCron(): void
 	public function getDistance(bool $useHiForFalse = false)
 	{
 		if ( ! isset(self::$compareGeo->lat) || ! isset(self::$compareGeo->lng) ||
-			 ! isset($this->geo->lat) || ! isset($this->geo->lng) ||
-			 $this->geo->lat === null || $this->geo->lng === null) {
+		     ! isset($this->geo->lat) || ! isset($this->geo->lng) ||
+		     $this->geo->lat === null || $this->geo->lng === null) {
 			return $useHiForFalse ? 25000 : false;
 		}
 
@@ -2594,7 +2595,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			}
 
 			if (in_array("registrationEnded", $typeSets->excludeIf) &&
-				$inv->regEnd !== null && $inv->regEnd < $now) {
+			    $inv->regEnd !== null && $inv->regEnd < $now) {
 				if ($verbose) {
 					echo "<p>Stopping processing because Involvements whose registrations have ended are excluded.  Involvement will be deleted from WordPress.</p>";
 				}
@@ -2660,10 +2661,10 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 
 		// Delete posts that are no longer current
 		$q        = new WP_Query([
-									 'post_type'    => $typeSets->postType,
-									 'nopaging'     => true,
-									 'post__not_in' => $postsToKeep
-								 ]);
+			                         'post_type'    => $typeSets->postType,
+			                         'nopaging'     => true,
+			                         'post__not_in' => $postsToKeep
+		                         ]);
 		$removals = 0;
 		foreach ($q->get_posts() as $post) {
 			set_time_limit(10);
@@ -3328,11 +3329,11 @@ public static function filterPublishDate($theDate, $format, $post = null): strin
 		$invTypes = Involvement_PostTypeSettings::getPostTypes();
 
 		if (in_array(get_post_type($post), $invTypes)) {
-			if (is_numeric($post)) {
-				$post = get_post($post);
+			if (self::postIsType($post)) {
+				$theDate = self::scheduleString(intval($post->{TouchPointWP::INVOLVEMENT_META_KEY})) ?? "";
+			} elseif (Meeting::postIsType($post)) {
+				$theDate = "tbd";
 			}
-
-			$theDate = self::scheduleString(intval($post->{TouchPointWP::INVOLVEMENT_META_KEY})) ?? "";
 		}
 
 		return $theDate;
@@ -3902,9 +3903,9 @@ private static function ajaxContact(): void
 		if (!$validate) {
 			http_response_code(Http::BAD_REQUEST);
 			echo json_encode([
-								 'error'      => $result,
-								 'error_i18n' => __("Contact Blocked for Spam.", 'TouchPoint-WP')
-							 ]);
+				                 'error'      => $result,
+				                 'error_i18n' => __("Contact Blocked for Spam.", 'TouchPoint-WP')
+			                 ]);
 			exit;
 		}
 
@@ -3912,9 +3913,9 @@ private static function ajaxContact(): void
 		if (!!$settings) {
 			if (!self::allowContact($inputData->invType)) {
 				echo json_encode([
-									 'error'      => "Contact Prohibited.",
-									 'error_i18n' => __("Contact Prohibited.", 'TouchPoint-WP')
-								 ]);
+					                 'error'      => "Contact Prohibited.",
+					                 'error_i18n' => __("Contact Prohibited.", 'TouchPoint-WP')
+				                 ]);
 				exit;
 			}
 
@@ -3925,9 +3926,9 @@ private static function ajaxContact(): void
 		} else {
 			http_response_code(Http::NOT_FOUND);
 			echo json_encode([
-								 'error'      => "Invalid Post Type.",
-								 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
-							 ]);
+				                 'error'      => "Invalid Post Type.",
+				                 'error_i18n' => __("Invalid Post Type.", 'TouchPoint-WP')
+			                 ]);
 			exit;
 		}
 
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 8783c14c..0d1ab801 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -12,6 +12,7 @@
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once 'api.php';
 	require_once 'hierarchical.php';
+	require_once 'scheduled.php';
 }
 
 use DateTime;
@@ -21,12 +22,13 @@
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
 use tp\TouchPointWP\Utilities\Http;
+use WP_Query;
 use WP_Term;
 
 /**
  * Handle meeting content, particularly RSVPs.
  */
-class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchical
+class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchical, scheduled
 {
 	use jsInstantiation;
 //	use jsonLd; TODO
@@ -181,7 +183,59 @@ protected function __construct(object $object)
 		$this->registerConstruction();
 	}
 
-	
+
+	/**
+	 * Create a Meeting object from a Meeting ID.  Only Meetings that are already imported as Posts are currently
+	 * available.
+	 *
+	 * @param int $mid A database object from which a Meeting object should be created.
+	 *
+	 * @return ?Meeting  Null if the involvement is not imported/available.
+	 * @throws TouchPointWP_Exception
+	 */
+	private static function fromMtgId(int $mid): ?Meeting
+	{
+		if ( ! isset(self::$_instances[$mid])) {
+			$post                   = self::getWpPostByMeetingId(Involvement::getPostTypes(), $mid);
+			self::$_instances[$mid] = new Meeting($post);
+		}
+
+		return self::$_instances[$mid];
+	}
+
+	/**
+	 * Get a WP_Post by the Meeting ID if it exists.  Return null if it does not.
+	 *
+	 * @param string|string[] $postType
+	 * @param mixed           $meetingId
+	 *
+	 * @return WP_Post|null
+	 */
+	private static function getWpPostByMeetingId($postType, $meetingId): WP_Post|null
+	{
+		$meetingId = (string)$meetingId;
+
+		$q      = new WP_Query([
+			                       'post_type'   => $postType,
+			                       'meta_key'    => self::MEETING_META_KEY,
+			                       'meta_value'  => $meetingId,
+			                       'numberposts' => 2
+			                       // only need one, but if there's two, there should be an error condition.
+		                       ]);
+		/** @var $posts WP_Post[] */
+		$posts  = $q->get_posts();
+		$counts = count($posts);
+		if ($counts > 1) {  // multiple posts match, which isn't great.
+			new TouchPointWP_Exception("Multiple Posts Exist", 170006);
+		}
+		if ($counts > 0) { // post exists already.
+			return reset($posts);
+		} else {
+			return null;
+		}
+	}
+
+
 	/**
 	 * Register scripts and styles to be used on display pages.
 	 */
@@ -299,33 +353,38 @@ public function getParent(): ?Involvement
 		}
 	}
 
+
 	/**
-	 * Get the human-readable schedule for the meeting as a string.  If multiple elements exist, they will be joined by
-	 * $join.  Returns null if the schedule string is unavailable for some reason.
+	 * Get the meeting date/time in human-readable form.
 	 *
-	 * @param string $join
+	 * @param int      $objId
+	 * @param ?Meeting $obj
 	 *
 	 * @return ?string
-	 *
-	 * @since 0.0.90 Added
 	 */
-	public function scheduleString(string $join): ?string
+	public static function scheduleString(int $objId, $obj = null): ?string
 	{
-		$ss = $this->scheduleStringArray();
-		if (count($ss) > 0) {
-			return implode($join, $ss);
+		if (!$obj) {
+			try {
+				$obj = self::fromMtgId($objId);
+			} catch (TouchPointWP_Exception) {
+				return null;
+			}
 		}
-		return null;
+
+		$s = $obj?->scheduleStringArray();
+
+		return $s?->join();
 	}
 
 	/**
 	 * Get the human-readable schedule for the meeting as a string or set of strings in an array.
 	 *
-	 * @return array
+	 * @return StringableArray
 	 *
 	 * @since 0.0.90 Added
 	 */
-	public function scheduleStringArray(): array
+	public function scheduleStringArray(): StringableArray
 	{
 		return DateFormats::DurationToStringArray($this->startDt, $this->endDt, $this->isMultiDay(), $this->isAllDay());
 	}
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 02a4a330..16177069 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -295,12 +295,14 @@ public static function DurationToString(?DateTimeExtended $start, ?DateTimeExten
 	 * @param ?bool              $multiDay
 	 * @param ?bool              $allDay
 	 *
-	 * @return array|string[]
+	 * @return StringableArray
 	 */
-	public static function DurationToStringArray(?DateTimeInterface $start, ?DateTimeInterface $end, ?bool $multiDay = null, ?bool $allDay = null): array
+	public static function DurationToStringArray(?DateTimeInterface $start, ?DateTimeInterface $end, ?bool $multiDay = null, ?bool $allDay = null): StringableArray
 	{
+		$r = new StringableArray();
+
 		if ($start === null) {
-			return [];
+			return $r;
 		}
 
 		if ($multiDay === null) {
@@ -321,18 +323,17 @@ public static function DurationToStringArray(?DateTimeInterface $start, ?DateTim
 				$date2 = self::DateStringFormattedShort($end);
 
 				// Translators: %1$s is the start date, %2$s is the end date.
-				return [
-					'datetime' => wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $date1, $date2)
-				];
+				$r['datetime'] = wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $date1, $date2);
+
 			} else {
 				// 011
 				// 101
 				// 111
 
-				return [
-					'datetime' => self::DateStringFormatted($start)
-				];
+				$r['datetime'] = self::DateStringFormatted($start);
 			}
+
+			return $r;
 		}
 
 		if ($multiDay) {
@@ -341,10 +342,10 @@ public static function DurationToStringArray(?DateTimeInterface $start, ?DateTim
 
 				$date = self::DateStringFormatted($start);
 				$time = self::TimeStringFormatted($start);
+
 				// Translators: %1$s is the start date, %2$s is the start time.
-				return [
-					'datetime' => wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $date, $time)
-				];
+				$r['datetime'] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $date, $time);
+
 			} else {
 				// 100
 
@@ -354,29 +355,27 @@ public static function DurationToStringArray(?DateTimeInterface $start, ?DateTim
 				$time1 = self::TimeStringFormatted($start);
 				$time2 = self::TimeStringFormatted($end);
 
-				return [
-					// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-					'datetime' => wp_sprintf(__('%1$s at %2$s &ndash; %3$s at %4$s', 'TouchPoint-WP'), $date1, $time1, $date2, $time2)
-				];
+				// translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+				$r['datetime'] = wp_sprintf(__('%1$s at %2$s &ndash; %3$s at %4$s', 'TouchPoint-WP'), $date1, $time1, $date2, $time2);
 			}
+
+			return $r;
 		}
 
-		$attrs = [
-			'date' => self::DateStringFormatted($start),
-		];
+		$r['date'] = self::DateStringFormatted($start);
 
 		if ($end === null) {
 			// 010
 
 			$time = self::TimeStringFormatted($start);
-			$attrs['time'] = $time;
+			$r['time'] = $time;
 		} else {
 			// 000
 
-			$attrs['time'] = self::TimeRangeStringFormatted($start, $end);
+			$r['time'] = self::TimeRangeStringFormatted($start, $end);
 		}
 
-		return $attrs;
+		return $r;
 
 	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/scheduled.php b/src/TouchPoint-WP/scheduled.php
new file mode 100644
index 00000000..02b78736
--- /dev/null
+++ b/src/TouchPoint-WP/scheduled.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+/**
+ * This is a base interface for classes that have "schedule" strings.
+ */
+interface scheduled
+{
+	/**
+	 * Get a description of the schedule in a human-friendly phrase, e.g. Sunday, March 31 at 2:00pm.
+	 *
+	 * These strings should be cached.
+	 *
+	 * @param int   $objId
+	 * @param mixed $obj  Needs to be of the type that implements this interface.
+	 *
+	 * @return ?string
+	 */
+	public static function scheduleString(int $objId, $obj = null): ?string;
+}
\ No newline at end of file

From dff006d6dd354b69c7731325e3569ebb1a444e6e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 01:16:45 -0400
Subject: [PATCH 185/423] better handling all-day events

---
 src/TouchPoint-WP/CalendarGrid.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 880fb4ec..383bbc75 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -164,7 +164,12 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 						$hasFirstDays = true;
 						$this->eventCount += $adder;
 						$ts = $m->startTimeString();
-						$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr><span class=\"time\">$ts</span> <span class=\"title\">$e->post_title</span></a>";
+						if ($ts) {
+							$ts = "<span class=\"time\">$ts</span> ";
+						} else {
+							$ts = "";
+						}
+						$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr>$ts<span class=\"title\">$e->post_title</span></a>";
 					}
 				}
 

From f1738f9f00bc326d046d1e6a6f8305b03a7f9c9e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 16:49:08 -0400
Subject: [PATCH 186/423] HUGE performance improvement on the calendar grid by
 reducing db hits.

---
 src/TouchPoint-WP/CalendarGrid.php    | 182 ++++++++++++++++----------
 src/TouchPoint-WP/PostTypeCapable.php |  13 +-
 src/TouchPoint-WP/Report.php          |   3 +-
 src/TouchPoint-WP/storedAsPost.php    |  24 ++++
 4 files changed, 148 insertions(+), 74 deletions(-)
 create mode 100644 src/TouchPoint-WP/storedAsPost.php

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 383bbc75..bb0373aa 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -60,6 +60,8 @@ class CalendarGrid {
 	 * @param WP_Query $q
 	 * @param int|null $month
 	 * @param int|null $year
+	 *
+	 * @return void
 	 */
 	public function __construct(WP_Query $q, int $month = null, int $year = null)
 	{
@@ -89,6 +91,10 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		$d->modify("-$offsetDays days");
 		$r = "";
 
+		// Extra days at the end of the month
+		$daysInMonth = intval($d->format('t'));
+		$daysToShow = ((42 - $daysInMonth - $offsetDays) % 7) + $daysInMonth;
+
 		// Create a table to display the calendar
 		$r .= '<div class="calGrid">';
 		foreach (Utilities::getDaysOfWeekShort() as $dayStr) {
@@ -97,7 +103,34 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 		$isMonthBefore = ($offsetDays !== 0);
 		$isMonthAfter = false;
-		$aDay = new DateInterval("P1D");
+
+		// do a query for the whole range of days in the month
+		$d2 = DateTimeImmutable::createFromMutable($d)->add(new DateInterval("P{$daysToShow}D"));
+		try {
+			$newQ = self::adjustQueryForRange($q, $d, $d2, $tz);
+		} catch (Exception $e) {
+			$this->html = "<!-- Could not create calendar grid because an exception occurred: {$e->getMessage()} -->";
+			return;
+		}
+		unset($d2);
+
+		$monthPosts = $newQ->get_posts();
+		$monthEvents = [];
+		foreach ($monthPosts as $e) {
+			try {
+				$monthEvents[] = Meeting::fromPost($e);
+			} catch (Exception) {
+				// Ignore any exceptions
+			}
+		}
+
+		try {
+			$aDay  = new DateInterval("P1D");
+			$d2359 = new DateTime($d->format('Y-m-d 23:59:59'), $tz);
+		} catch (Exception $e) {
+			$this->html = "<!-- Could not create calendar grid because an exception occurred: {$e->getMessage()} -->";
+			return;
+		}
 
 		// Loop through the days of the month
 		do {
@@ -106,95 +139,96 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 			$fullDay = DateFormats::DateStringFormatted($d);
 			$wd =  wp_date("w", $ts);
 
-			try {
-				$newQ = self::adjustQueryForDay($q, $d, $tz);
+			$cellClass = ["calDay"];
+			if ($isMonthBefore) {
+				$cellClass[] = "before";
+				$adder = 0;
+			} elseif ($isMonthAfter) {
+				$cellClass[] = "after";
+				$adder = 0;
+			} else {
+				$adder = 1;
+			}
 
-				$cellClass = ["calDay"];
-				if ($isMonthBefore) {
-					$cellClass[] = "before";
-					$adder = 0;
-				} elseif ($isMonthAfter) {
-					$cellClass[] = "after";
-					$adder = 0;
-				} else {
-					$adder = 1;
+			$dayEvents = [];
+			foreach ($monthEvents as $m) {
+				if ($m->startDt > $d2359) {
+					break;
 				}
-
-				$calDayPosts = $newQ->get_posts();
-
-				if (count($calDayPosts) === 0) {
-					$cellClass[] = "empty";
+				if ($m->startDt < $d2359 && ($m->endDt ?? $m->startDt) >= $d) {
+					$dayEvents[] = $m;
 				}
+			}
 
-				if ($d < Utilities::dateTimeTodayAtMidnight()) {
-					$cellClass[] = "past";
-				}
+			if (count($dayEvents) === 0) {
+				$cellClass[] = "empty";
+			}
 
-				$cellClass[] = "weekday-$wd";
+			if ($d < Utilities::dateTimeTodayAtMidnight()) {
+				$cellClass[] = "past";
+			}
 
-				$dayHtml = "";
-				$hasFirstDays = false;
+			$cellClass[] = "weekday-$wd";
 
-				foreach ($calDayPosts as $e) {
-					$m = Meeting::fromPost($e);
+			$dayHtml = "";
+			$hasFirstDays = false;
 
-					$link = $m->permalink();
+			foreach ($dayEvents as $k => $m) {
+				$link = $m->permalink();
+				$notFirstDay = $m->startDt < $d;
 
-					$notFirstDay = $m->startDt < $d;
+				$attr = "";
+				$status = $m->status();
 
-					$attr = "";
-					$status = $m->status();
+				if ($status === Meeting::STATUS_CANCELLED) {
+					// Translators: %s is the singular name of the of a Meeting, such as "Event".
+					$title = wp_sprintf(__("%s is cancelled.", "TouchPoint-WP"), TouchPointWP::instance()->settings->mc_name_singular);
+					$attr = "title=\"$title\"";
+				}
 
-					if ($status === Meeting::STATUS_CANCELLED) {
-						// Translators: %s is the singular name of the of a Meeting, such as "Event".
-						$title = wp_sprintf(__("%s is cancelled.", "TouchPoint-WP"), TouchPointWP::instance()->settings->mc_name_singular);
-						$attr = "title=\"$title\"";
-					}
+				$e = $m->getPost();
 
-					$classes = "event ";
-					$classes .= $status . " ";
-					$classes .= $m->tense();
-					if ($m->isFeatured() && !$notFirstDay) {
-						$classes .= " feat";
-					}
-					if ($notFirstDay) {
-						$classes .= " notFirstDay";
-						$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr><span class=\"title\">$e->post_title</span></a>";
+				$classes = "event ";
+				$classes .= $status . " ";
+				$classes .= $m->tense();
+				if ($m->isFeatured() && !$notFirstDay) {
+					$classes .= " feat";
+				}
+				if ($notFirstDay) {
+					$classes .= " notFirstDay";
+					$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr><span class=\"title\">$e->post_title</span></a>";
+				} else {
+					$hasFirstDays = true;
+					$this->eventCount += $adder;
+					$ts = $m->startTimeString();
+					if ($ts) {
+						$ts = "<span class=\"time\">$ts</span> ";
 					} else {
-						$hasFirstDays = true;
-						$this->eventCount += $adder;
-						$ts = $m->startTimeString();
-						if ($ts) {
-							$ts = "<span class=\"time\">$ts</span> ";
-						} else {
-							$ts = "";
-						}
-						$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr>$ts<span class=\"title\">$e->post_title</span></a>";
+						$ts = "";
 					}
+					$dayHtml .= "<a href=\"$link\" class=\"$classes\" $attr>$ts<span class=\"title\">$e->post_title</span></a>";
 				}
+			}
 
-				if (!$hasFirstDays) {
-					$cellClass[] = "noFirstDays";
-				}
-
-				$cellClass = implode(" ", $cellClass);
+			if (!$hasFirstDays) {
+				$cellClass[] = "noFirstDays";
+			}
 
-				// Print the cell
-				$r .= "<div class=\"$cellClass\">";
-				$r .= "<h3 class=\"calDayHead\">$fullDay</h3>";
-				$r .= "<span class=\"calDayNum\">$day</span>";
+			$cellClass = implode(" ", $cellClass);
 
-				$r .= $dayHtml;
+			// Print the cell
+			$r .= "<div class=\"$cellClass\">";
+			$r .= "<h3 class=\"calDayHead\">$fullDay</h3>";
+			$r .= "<span class=\"calDayNum\">$day</span>";
 
-				$r .= "</div>";
+			$r .= $dayHtml;
 
-			} catch (Exception $e) {
-				$r .= "<!-- An Exception occurred: {$e->getMessage()} -->";
-			}
+			$r .= "</div>";
 
 			// Increment days
 			$mo1 = $d->format('n');
 			$d->add($aDay);
+			$d2359->add($aDay);
 			$mo2 = $d->format('n');
 
 			if ($mo1 !== $mo2) {
@@ -278,19 +312,20 @@ public function navBar(bool $withMonthName = false): string
 	/**
 	 * Adjust a WP_Query object to filter only to events that overlap with the given day.
 	 *
-	 * @param WP_Query          $q  The original query object.
-	 * @param DateTimeInterface $d  The day to filter down to.  Only events on this day will be included.
-	 * @param DateTimeZone      $tz The timezone to use.
+	 * @param WP_Query          $q   The original query object.
+	 * @param DateTimeInterface $d1  The first day of the range.
+	 * @param DateTimeInterface $d2  The last day of the range.
+	 * @param DateTimeZone      $tz  The timezone to use.
 	 *
 	 * @return WP_Query
 	 * @throws Exception
 	 */
-	private static function adjustQueryForDay(WP_Query $q, DateTimeInterface $d, DateTimeZone $tz): WP_Query
+	private static function adjustQueryForRange(WP_Query $q, DateTimeInterface $d1, DateTimeInterface $d2, DateTimeZone $tz): WP_Query
 	{
 		$q = clone $q;
 
-		$dStart = new DateTime($d->format('Y-m-d 00:00:00'), $tz);
-		$dEnd   = new DateTime($d->format('Y-m-d 23:59:59'), $tz);
+		$dStart = new DateTime($d1->format('Y-m-d 00:00:00'), $tz);
+		$dEnd   = new DateTime($d2->format('Y-m-d 23:59:59'), $tz);
 
 		$existingMq = $q->get('meta_query');
 
@@ -343,6 +378,9 @@ private static function adjustQueryForDay(WP_Query $q, DateTimeInterface $d, Dat
 		$q->set('orderby', 'meta_value');
 		$q->set('order', 'ASC');
 
+		$q->set('posts_per_page', 100000);
+		$q->set('posts_per_archive_page', 100000);
+
 		$q->set('post_type', Involvement_PostTypeSettings::getPostTypes());
 
 		return $q;
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 072a7512..8128e413 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -9,10 +9,13 @@
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
 
+require_once 'module.php';
+require_once 'storedAsPost.php';
+
 /**
  * This is a base class for those objects that can be derived from a Post.
  */
-abstract class PostTypeCapable implements module
+abstract class PostTypeCapable implements module, storedAsPost
 {
 
 	protected int $post_id;
@@ -29,6 +32,14 @@ public function post_id(): int
 		return $this->post_id;
 	}
 
+	public function getPost(bool $create = false): ?WP_Post
+	{
+		if ($this->post === null) {
+			$this->post = get_post($this->post_id);
+		}
+		return $this->post;
+	}
+
 	/**
 	 * Create relevant objects from a given post
 	 *
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 19b01069..54ac51a4 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -22,6 +22,7 @@
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "api.php";
 	require_once "updatesViaCron.php";
+	require_once "storedAsPost.php";
 	require_once "Utilities/ImageConversions.php";
 	require_once "Utilities/Http.php";
 }
@@ -29,7 +30,7 @@
 /**
  * The Report class gets and processes a SQL or Python report from TouchPoint and presents it in the UX.
  */
-class Report implements api, module, JsonSerializable, updatesViaCron
+class Report implements api, module, JsonSerializable, updatesViaCron, storedAsPost
 {
 	public const SHORTCODE_REPORT = TouchPointWP::SHORTCODE_PREFIX . "Report";
 	public const POST_TYPE = TouchPointWP::HOOK_PREFIX . "report";
diff --git a/src/TouchPoint-WP/storedAsPost.php b/src/TouchPoint-WP/storedAsPost.php
new file mode 100644
index 00000000..2d587268
--- /dev/null
+++ b/src/TouchPoint-WP/storedAsPost.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use WP_Post;
+
+/**
+ * This is a base interface for classes that have "schedule" strings.
+ */
+interface storedAsPost
+{
+	/**
+	 * Get the WP_Post object corresponding to the object.
+	 *
+	 * @param bool $create Set true if the post should be created if it doesn't exist.  This would need to be
+	 * implemented in each module, and is not implemented in most.
+	 *
+	 * @return WP_Post|null
+	 */
+	public function getPost(bool $create = false): ?WP_Post;
+}
\ No newline at end of file

From 1528f48867dc2519c84a3ce642e3a1d098cda541 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 16:52:39 -0400
Subject: [PATCH 187/423] i18n updates

---
 i18n/TouchPoint-WP-es_ES.po | 219 +++++++++++++++++++-----------------
 1 file changed, 113 insertions(+), 106 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index c0bb63e1..2a19921c 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:293
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:673
+#: src/TouchPoint-WP/Meeting.php:740
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:213
-#: src/TouchPoint-WP/Involvement.php:1825
+#: src/TouchPoint-WP/Involvement.php:1845
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:217
-#: src/TouchPoint-WP/Involvement.php:1851
+#: src/TouchPoint-WP/Involvement.php:1871
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +173,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2071
+#: src/TouchPoint-WP/Involvement.php:2092
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -208,90 +208,90 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:489
+#: src/TouchPoint-WP/Involvement.php:495
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:494
+#: src/TouchPoint-WP/Involvement.php:500
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:501
+#: src/TouchPoint-WP/Involvement.php:507
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:507
+#: src/TouchPoint-WP/Involvement.php:513
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1700
-#: src/TouchPoint-WP/Partner.php:810
+#: src/TouchPoint-WP/Involvement.php:1720
+#: src/TouchPoint-WP/Partner.php:814
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1908
-#: src/TouchPoint-WP/Partner.php:834
+#: src/TouchPoint-WP/Involvement.php:1928
+#: src/TouchPoint-WP/Partner.php:838
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3523
+#: src/TouchPoint-WP/Involvement.php:3547
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3526
+#: src/TouchPoint-WP/Involvement.php:3550
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3603
+#: src/TouchPoint-WP/Involvement.php:3627
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3672
-#: src/TouchPoint-WP/Involvement.php:3714
+#: src/TouchPoint-WP/Involvement.php:3696
+#: src/TouchPoint-WP/Involvement.php:3738
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3677
+#: src/TouchPoint-WP/Involvement.php:3701
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3681
+#: src/TouchPoint-WP/Involvement.php:3705
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3686
+#: src/TouchPoint-WP/Involvement.php:3710
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3689
+#: src/TouchPoint-WP/Involvement.php:3713
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3692
+#: src/TouchPoint-WP/Involvement.php:3716
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3695
+#: src/TouchPoint-WP/Involvement.php:3719
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3705
+#: src/TouchPoint-WP/Involvement.php:3729
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3620
-#: src/TouchPoint-WP/Partner.php:1314
+#: src/TouchPoint-WP/Involvement.php:3644
+#: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:841
+#: src/TouchPoint-WP/Partner.php:845
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1255
+#: src/TouchPoint-WP/Partner.php:1259
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -303,48 +303,48 @@ msgstr "No se proporcionó una identificación de usuario de WordPress para inic
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1188
+#: src/TouchPoint-WP/Person.php:1192
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/Meeting.php:692
+#: src/TouchPoint-WP/Meeting.php:739
+#: src/TouchPoint-WP/Meeting.php:759
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1947
+#: src/TouchPoint-WP/TouchPointWP.php:1948
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2004
+#: src/TouchPoint-WP/TouchPointWP.php:2005
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2007
+#: src/TouchPoint-WP/TouchPointWP.php:2008
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2010
+#: src/TouchPoint-WP/TouchPointWP.php:2011
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2015
 #: src/TouchPoint-WP/TouchPointWP.php:2016
+#: src/TouchPoint-WP/TouchPointWP.php:2017
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2133
-#: src/TouchPoint-WP/TouchPointWP.php:2169
+#: src/TouchPoint-WP/TouchPointWP.php:2134
+#: src/TouchPoint-WP/TouchPointWP.php:2170
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2183
-#: src/TouchPoint-WP/TouchPointWP.php:2227
+#: src/TouchPoint-WP/TouchPointWP.php:2184
+#: src/TouchPoint-WP/TouchPointWP.php:2228
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2359
+#: src/TouchPoint-WP/TouchPointWP.php:2360
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -807,8 +807,8 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1445
-#: src/TouchPoint-WP/Utilities.php:264
+#: src/TouchPoint-WP/Person.php:1451
+#: src/TouchPoint-WP/Utilities.php:271
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
@@ -971,7 +971,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2300
+#: src/TouchPoint-WP/TouchPointWP.php:2301
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1026,16 +1026,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1873
+#: src/TouchPoint-WP/Involvement.php:1893
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1886
+#: src/TouchPoint-WP/Involvement.php:1906
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1757
+#: src/TouchPoint-WP/Involvement.php:1777
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1197,71 +1197,72 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1874
+#: src/TouchPoint-WP/Involvement.php:1894
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1875
+#: src/TouchPoint-WP/Involvement.php:1895
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1916
-#: src/TouchPoint-WP/Partner.php:850
+#: src/TouchPoint-WP/Involvement.php:1936
+#: src/TouchPoint-WP/Partner.php:854
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1919
-#: src/TouchPoint-WP/Partner.php:853
+#: src/TouchPoint-WP/Involvement.php:1939
+#: src/TouchPoint-WP/Partner.php:857
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:984
-#: src/TouchPoint-WP/Involvement.php:1016
-#: src/TouchPoint-WP/Involvement.php:1094
-#: src/TouchPoint-WP/Involvement.php:1118
+#. Translators: %1$s is the start date, %2$s is the start time.
+#: src/TouchPoint-WP/Involvement.php:991
+#: src/TouchPoint-WP/Involvement.php:1023
+#: src/TouchPoint-WP/Involvement.php:1112
+#: src/TouchPoint-WP/Involvement.php:1136
 #: src/TouchPoint-WP/Utilities/DateFormats.php:283
-#: src/TouchPoint-WP/Utilities/DateFormats.php:346
+#: src/TouchPoint-WP/Utilities/DateFormats.php:347
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1025
+#: src/TouchPoint-WP/Involvement.php:1032
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1034
+#: src/TouchPoint-WP/Involvement.php:1041
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1043
+#: src/TouchPoint-WP/Involvement.php:1050
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1051
+#: src/TouchPoint-WP/Involvement.php:1058
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1059
+#: src/TouchPoint-WP/Involvement.php:1066
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1067
+#: src/TouchPoint-WP/Involvement.php:1074
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3544
+#: src/TouchPoint-WP/Involvement.php:3568
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1278,35 +1279,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2012
+#: src/TouchPoint-WP/Involvement.php:2033
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2022
+#: src/TouchPoint-WP/Involvement.php:2043
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2041
+#: src/TouchPoint-WP/Involvement.php:2062
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:605
-#: src/TouchPoint-WP/TouchPointWP.php:970
+#: src/TouchPoint-WP/Meeting.php:672
+#: src/TouchPoint-WP/TouchPointWP.php:971
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:633
-#: src/TouchPoint-WP/TouchPointWP.php:353
+#: src/TouchPoint-WP/Meeting.php:700
+#: src/TouchPoint-WP/TouchPointWP.php:354
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:643
-#: src/TouchPoint-WP/TouchPointWP.php:362
+#: src/TouchPoint-WP/Meeting.php:710
+#: src/TouchPoint-WP/TouchPointWP.php:363
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3810
-#: src/TouchPoint-WP/Involvement.php:3907
+#: src/TouchPoint-WP/Involvement.php:3834
+#: src/TouchPoint-WP/Involvement.php:3931
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1409,24 +1410,24 @@ msgstr "Agregar Nuevo %s"
 msgid "New %s"
 msgstr "Nuevo %s"
 
-#: src/TouchPoint-WP/Report.php:172
+#: src/TouchPoint-WP/Report.php:176
 msgid "TouchPoint Reports"
 msgstr "Informes de TouchPoint"
 
-#: src/TouchPoint-WP/Report.php:173
+#: src/TouchPoint-WP/Report.php:177
 msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:311
+#: src/TouchPoint-WP/Report.php:397
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:259
+#: src/TouchPoint-WP/TouchPointWP.php:260
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1800
+#: src/TouchPoint-WP/Involvement.php:1820
 msgid "Language"
 msgstr "Idioma"
 
@@ -1438,7 +1439,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1452
+#: src/TouchPoint-WP/Person.php:1458
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1479,8 +1480,8 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3894
-#: src/TouchPoint-WP/Person.php:1821
+#: src/TouchPoint-WP/Involvement.php:3918
+#: src/TouchPoint-WP/Person.php:1827
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1500,26 +1501,26 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1676
+#: src/TouchPoint-WP/Person.php:1682
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3884
-#: src/TouchPoint-WP/Person.php:1838
+#: src/TouchPoint-WP/Involvement.php:3908
+#: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1591
+#: src/TouchPoint-WP/Person.php:1597
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:215
+#: src/TouchPoint-WP/Meeting.php:269
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:216
+#: src/TouchPoint-WP/Meeting.php:270
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1588,15 +1589,15 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:471
+#: src/TouchPoint-WP/Utilities.php:482
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:488
+#: src/TouchPoint-WP/Meeting.php:549
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:489
+#: src/TouchPoint-WP/Meeting.php:550
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1625,26 +1626,26 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:150
+#: src/TouchPoint-WP/CalendarGrid.php:185
 msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3632
+#: src/TouchPoint-WP/Involvement.php:3656
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:363
+#: src/TouchPoint-WP/Meeting.php:422
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:433
+#: src/TouchPoint-WP/Meeting.php:494
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1196
+#: src/TouchPoint-WP/Person.php:1200
 msgid "Person in %s"
 msgstr "Persona en %s"
 
@@ -1704,28 +1705,29 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:490
+#: src/TouchPoint-WP/Meeting.php:551
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:134
+#: src/TouchPoint-WP/Involvement.php:136
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:987
-#: src/TouchPoint-WP/Involvement.php:1010
+#: src/TouchPoint-WP/Involvement.php:994
+#: src/TouchPoint-WP/Involvement.php:1017
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:92
+#: src/TouchPoint-WP/Meeting.php:94
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
 #. translators: %1$s is the start time, %2$s is the end time.
+#. Translators: %1$s is the start date, %2$s is the end date.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
-#: src/TouchPoint-WP/Utilities/DateFormats.php:325
+#: src/TouchPoint-WP/Utilities/DateFormats.php:326
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
@@ -1779,7 +1781,7 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:213
+#: src/TouchPoint-WP/CalendarGrid.php:252
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
 
@@ -1832,6 +1834,11 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1011
+#: src/TouchPoint-WP/Involvement.php:1018
 msgid "All Day"
 msgstr "todo el dia"
+
+#: src/TouchPoint-WP/Utilities.php:276
+msgctxt "list of items, and *others*"
+msgid "others"
+msgstr "otros"

From 217e1961308bfe2492a978ff4d21a9501ca9e29d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 16:52:44 -0400
Subject: [PATCH 188/423] i18n updates

---
 i18n/TouchPoint-WP.pot | 223 +++++++++++++++++++++--------------------
 1 file changed, 115 insertions(+), 108 deletions(-)

diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index f83ba54a..ffa5bb98 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.91\n"
+"Project-Id-Version: TouchPoint WP 0.0.92\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-08T21:34:45+00:00\n"
+"POT-Creation-Date: 2024-09-12T20:51:39+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:293
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:673
+#: src/TouchPoint-WP/Meeting.php:740
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -170,13 +170,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:213
-#: src/TouchPoint-WP/Involvement.php:1825
+#: src/TouchPoint-WP/Involvement.php:1845
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:217
-#: src/TouchPoint-WP/Involvement.php:1851
+#: src/TouchPoint-WP/Involvement.php:1871
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -264,14 +264,14 @@ msgid "This %s has been Cancelled."
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:215
+#: src/TouchPoint-WP/Meeting.php:269
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2071
+#: src/TouchPoint-WP/Involvement.php:2092
 msgid "No %s Found."
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3544
+#: src/TouchPoint-WP/Involvement.php:3568
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -305,12 +305,12 @@ msgid "Session could not be validated."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:150
+#: src/TouchPoint-WP/CalendarGrid.php:185
 msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:213
+#: src/TouchPoint-WP/CalendarGrid.php:252
 msgid "There are no %s published for this month."
 msgstr ""
 
@@ -323,267 +323,268 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:134
+#: src/TouchPoint-WP/Involvement.php:136
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:489
+#: src/TouchPoint-WP/Involvement.php:495
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:494
+#: src/TouchPoint-WP/Involvement.php:500
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:501
+#: src/TouchPoint-WP/Involvement.php:507
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:507
+#: src/TouchPoint-WP/Involvement.php:513
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:984
-#: src/TouchPoint-WP/Involvement.php:1016
-#: src/TouchPoint-WP/Involvement.php:1094
-#: src/TouchPoint-WP/Involvement.php:1118
+#. Translators: %1$s is the start date, %2$s is the start time.
+#: src/TouchPoint-WP/Involvement.php:991
+#: src/TouchPoint-WP/Involvement.php:1023
+#: src/TouchPoint-WP/Involvement.php:1112
+#: src/TouchPoint-WP/Involvement.php:1136
 #: src/TouchPoint-WP/Utilities/DateFormats.php:283
-#: src/TouchPoint-WP/Utilities/DateFormats.php:346
+#: src/TouchPoint-WP/Utilities/DateFormats.php:347
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:987
-#: src/TouchPoint-WP/Involvement.php:1010
+#: src/TouchPoint-WP/Involvement.php:994
+#: src/TouchPoint-WP/Involvement.php:1017
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1011
+#: src/TouchPoint-WP/Involvement.php:1018
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1025
+#: src/TouchPoint-WP/Involvement.php:1032
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1034
+#: src/TouchPoint-WP/Involvement.php:1041
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1043
+#: src/TouchPoint-WP/Involvement.php:1050
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1051
+#: src/TouchPoint-WP/Involvement.php:1058
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1059
+#: src/TouchPoint-WP/Involvement.php:1066
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1067
+#: src/TouchPoint-WP/Involvement.php:1074
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1700
-#: src/TouchPoint-WP/Partner.php:810
+#: src/TouchPoint-WP/Involvement.php:1720
+#: src/TouchPoint-WP/Partner.php:814
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1757
+#: src/TouchPoint-WP/Involvement.php:1777
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1800
+#: src/TouchPoint-WP/Involvement.php:1820
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1873
+#: src/TouchPoint-WP/Involvement.php:1893
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1874
+#: src/TouchPoint-WP/Involvement.php:1894
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1875
+#: src/TouchPoint-WP/Involvement.php:1895
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1886
+#: src/TouchPoint-WP/Involvement.php:1906
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1908
-#: src/TouchPoint-WP/Partner.php:834
+#: src/TouchPoint-WP/Involvement.php:1928
+#: src/TouchPoint-WP/Partner.php:838
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1916
-#: src/TouchPoint-WP/Partner.php:850
+#: src/TouchPoint-WP/Involvement.php:1936
+#: src/TouchPoint-WP/Partner.php:854
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1919
-#: src/TouchPoint-WP/Partner.php:853
+#: src/TouchPoint-WP/Involvement.php:1939
+#: src/TouchPoint-WP/Partner.php:857
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2012
+#: src/TouchPoint-WP/Involvement.php:2033
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2022
+#: src/TouchPoint-WP/Involvement.php:2043
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2041
+#: src/TouchPoint-WP/Involvement.php:2062
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3523
+#: src/TouchPoint-WP/Involvement.php:3547
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3526
+#: src/TouchPoint-WP/Involvement.php:3550
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3603
+#: src/TouchPoint-WP/Involvement.php:3627
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3620
-#: src/TouchPoint-WP/Partner.php:1314
+#: src/TouchPoint-WP/Involvement.php:3644
+#: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3632
+#: src/TouchPoint-WP/Involvement.php:3656
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3672
-#: src/TouchPoint-WP/Involvement.php:3714
+#: src/TouchPoint-WP/Involvement.php:3696
+#: src/TouchPoint-WP/Involvement.php:3738
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3677
+#: src/TouchPoint-WP/Involvement.php:3701
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3681
+#: src/TouchPoint-WP/Involvement.php:3705
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3686
+#: src/TouchPoint-WP/Involvement.php:3710
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3689
+#: src/TouchPoint-WP/Involvement.php:3713
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3692
+#: src/TouchPoint-WP/Involvement.php:3716
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3695
+#: src/TouchPoint-WP/Involvement.php:3719
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3705
+#: src/TouchPoint-WP/Involvement.php:3729
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3810
-#: src/TouchPoint-WP/Involvement.php:3907
+#: src/TouchPoint-WP/Involvement.php:3834
+#: src/TouchPoint-WP/Involvement.php:3931
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3884
-#: src/TouchPoint-WP/Person.php:1838
+#: src/TouchPoint-WP/Involvement.php:3908
+#: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3894
-#: src/TouchPoint-WP/Person.php:1821
+#: src/TouchPoint-WP/Involvement.php:3918
+#: src/TouchPoint-WP/Person.php:1827
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:92
+#: src/TouchPoint-WP/Meeting.php:94
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:216
+#: src/TouchPoint-WP/Meeting.php:270
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:363
+#: src/TouchPoint-WP/Meeting.php:422
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:433
+#: src/TouchPoint-WP/Meeting.php:494
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:488
+#: src/TouchPoint-WP/Meeting.php:549
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:489
+#: src/TouchPoint-WP/Meeting.php:550
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:490
+#: src/TouchPoint-WP/Meeting.php:551
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:605
-#: src/TouchPoint-WP/TouchPointWP.php:970
+#: src/TouchPoint-WP/Meeting.php:672
+#: src/TouchPoint-WP/TouchPointWP.php:971
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:633
-#: src/TouchPoint-WP/TouchPointWP.php:353
+#: src/TouchPoint-WP/Meeting.php:700
+#: src/TouchPoint-WP/TouchPointWP.php:354
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:643
-#: src/TouchPoint-WP/TouchPointWP.php:362
+#: src/TouchPoint-WP/Meeting.php:710
+#: src/TouchPoint-WP/TouchPointWP.php:363
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/Meeting.php:692
+#: src/TouchPoint-WP/Meeting.php:739
+#: src/TouchPoint-WP/Meeting.php:759
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:841
+#: src/TouchPoint-WP/Partner.php:845
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1255
+#: src/TouchPoint-WP/Partner.php:1259
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -595,44 +596,44 @@ msgstr ""
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1188
+#: src/TouchPoint-WP/Person.php:1192
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1196
+#: src/TouchPoint-WP/Person.php:1200
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1445
-#: src/TouchPoint-WP/Utilities.php:264
+#: src/TouchPoint-WP/Person.php:1451
+#: src/TouchPoint-WP/Utilities.php:271
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1452
+#: src/TouchPoint-WP/Person.php:1458
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1591
+#: src/TouchPoint-WP/Person.php:1597
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1676
+#: src/TouchPoint-WP/Person.php:1682
 msgid "You may need to sign in."
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:172
+#: src/TouchPoint-WP/Report.php:176
 msgid "TouchPoint Reports"
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:173
+#: src/TouchPoint-WP/Report.php:177
 msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:311
+#: src/TouchPoint-WP/Report.php:397
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
@@ -727,46 +728,46 @@ msgstr ""
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:259
+#: src/TouchPoint-WP/TouchPointWP.php:260
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1947
+#: src/TouchPoint-WP/TouchPointWP.php:1948
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2004
+#: src/TouchPoint-WP/TouchPointWP.php:2005
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2007
+#: src/TouchPoint-WP/TouchPointWP.php:2008
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2010
+#: src/TouchPoint-WP/TouchPointWP.php:2011
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2015
 #: src/TouchPoint-WP/TouchPointWP.php:2016
+#: src/TouchPoint-WP/TouchPointWP.php:2017
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2133
-#: src/TouchPoint-WP/TouchPointWP.php:2169
+#: src/TouchPoint-WP/TouchPointWP.php:2134
+#: src/TouchPoint-WP/TouchPointWP.php:2170
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2183
-#: src/TouchPoint-WP/TouchPointWP.php:2227
+#: src/TouchPoint-WP/TouchPointWP.php:2184
+#: src/TouchPoint-WP/TouchPointWP.php:2228
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2300
+#: src/TouchPoint-WP/TouchPointWP.php:2301
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2359
+#: src/TouchPoint-WP/TouchPointWP.php:2360
 msgid "People Query Failed"
 msgstr ""
 
@@ -1508,13 +1509,19 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:471
+#: src/TouchPoint-WP/Utilities.php:276
+msgctxt "list of items, and *others*"
+msgid "others"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities.php:482
 msgid "Expand"
 msgstr ""
 
 #. translators: %1$s is the start time, %2$s is the end time.
+#. Translators: %1$s is the start date, %2$s is the end date.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
-#: src/TouchPoint-WP/Utilities/DateFormats.php:325
+#: src/TouchPoint-WP/Utilities/DateFormats.php:326
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 

From 86d46b5b46f20bf5a2762fdadc3dcbe578cc59d5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 18:11:18 -0400
Subject: [PATCH 189/423] Resolve an issue where meetings were sometimes
 returned multiple times by the API.  Closes #204.  Should help #198.

---
 src/TouchPoint-WP/Involvement.php | 7 ++++++-
 src/python/WebApi.py              | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 49cf15c7..805b775f 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -56,6 +56,7 @@ class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo
 
 	protected const SCHEDULE_STRING_CACHE_EXPIRATION = 3600 * 8; // 8 hours.  Automatically deleted during sync.
 	protected const SCHEDULE_STRING_CACHE_GROUP = TouchPointWP::HOOK_PREFIX . "inv_schedule_string";
+	protected const ENABLE_SCHEDULE_STRING_CACHE = true;
 
 	protected const MEETING_STRATEGY_NONE = 0;
 	protected const MEETING_STRATEGY_SINGLE = 1;
@@ -654,6 +655,10 @@ protected function meetings(): array
 			if ($m === "") {
 				$m = [];
 			}
+
+			// Make sure items are unique.  #204
+			$m = array_unique($m, SORT_REGULAR);
+
 			$this->_meetings = $m;
 		}
 
@@ -719,7 +724,7 @@ protected static function scheduleStrings(int $invId, $inv = null): ?array
 
 		$cacheKey = $invId . "_" . get_locale() . "_v2";
 		$schStr = wp_cache_get($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP);
-		if (!! $schStr) {
+		if (!! $schStr && self::ENABLE_SCHEDULE_STRING_CACHE) {
 			return $schStr;
 		}
 		if (! $inv) {
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 3295316e..a32a4cc1 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -333,7 +333,7 @@ def get_person_info_for_sync(person_obj):
         (
             SELECT cto.OrganizationId,
                 (
-                    SELECT om.MeetingId as mtgId,
+                    SELECT DISTINCT om.MeetingId as mtgId,
                         FORMAT(om.MeetingDate, 'yyyy-MM-ddTHH:mm:ss') as mtgStartDt,
                         FORMAT(om.MeetingEnd, 'yyyy-MM-ddTHH:mm:ss') as mtgEndDt,
                         om.Location as location,

From 73df9cd2e3d1a583f0a63f5624a36fc01dfd10aa Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 18:19:32 -0400
Subject: [PATCH 190/423] Improving performance.  Vaguely related to #204

---
 src/python/WebApi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index a32a4cc1..1a481e81 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -357,7 +357,7 @@ def get_person_info_for_sync(person_obj):
         cteSchedule AS
         (SELECT cto.OrganizationId, 
             (
-            SELECT FORMAT(os.NextMeetingDate, 'yyyy-MM-ddTHH:mm:ss') as nextStartDt,
+            SELECT DISTINCT FORMAT(os.NextMeetingDate, 'yyyy-MM-ddTHH:mm:ss') as nextStartDt,
                 FORMAT(DATEADD(minute, os.DurationMins, os.NextMeetingDate), 'yyyy-MM-ddTHH:mm:ss') as nextEndDt
             FROM dbo.OrgSchedule os WITH(NOLOCK)
                 INNER JOIN cteTargetOrgs o

From a40d8825f616c4a50d43cf7485b2a8c0dd3f85c7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 18:34:53 -0400
Subject: [PATCH 191/423] Resolving some confusion around "& others" on
 involvement schedules where historical meetings exist.

---
 src/TouchPoint-WP/Involvement.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 805b775f..59b4c49f 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1097,12 +1097,17 @@ protected function scheduleStrings_calc(): array
 			$now = Utilities::dateTimeNow();
 
 			// filter meetings to only those not past
-			$originalMeetingCount = count($this->meetings());
-			$meetings = array_filter($this->meetings(), fn($m) => $m->mtgEndDt > $now);
-			if (count($meetings) === 0) {
-				$meetings = $this->meetings();
-			}
-			$andOthers = (count($meetings) !== $originalMeetingCount);
+			$meetings = $this->meetings();
+			$meetings = array_filter($meetings, fn($m) => $m->status == 1);
+			$uncancelledMeetings = $meetings; // includes historical
+//			$originalMeetingCount = count($meetings);
+			$meetings = array_filter($meetings, fn($m) => $m->mtgEndDt > $now);
+			if (count($meetings) === 0) { // if no future, revert to historical.
+				$meetings = $uncancelledMeetings;
+			}
+//			$andOthers = (count($meetings) !== $originalMeetingCount);  This, when fed to the ->toListString methods
+//			below can be used to add "and others" to the list of dates/times to indicate that there are historical
+//			meetings that are not being shown.  However, this currently seems more confusing than helpful.
 
 			foreach ($meetings as $m) {
 				$a = DateFormats::DurationToStringArray($m->mtgStartDt, $m->mtgEndDt, null, $m->mtgStartDt->isAllDay);
@@ -1128,10 +1133,10 @@ protected function scheduleStrings_calc(): array
 			}
 
 			if ($forceDateTime) {
-				$r['datetime'] = $dateTimeArr->toListString(2, $andOthers);
+				$r['datetime'] = $dateTimeArr->toListString(2);
 				$r['combined'] = $r['datetime'];
 			} else {
-				$dateStr = $dateArr->toListString(2, $andOthers);
+				$dateStr = $dateArr->toListString(2);
 
 				$r['date'] = $dateStr;
 				$r['time'] = $timeArr[0];
@@ -3337,7 +3342,7 @@ public static function filterPublishDate($theDate, $format, $post = null): strin
 			if (self::postIsType($post)) {
 				$theDate = self::scheduleString(intval($post->{TouchPointWP::INVOLVEMENT_META_KEY})) ?? "";
 			} elseif (Meeting::postIsType($post)) {
-				$theDate = "tbd";
+				$theDate = Meeting::scheduleString(intval($post->{Meeting::MEETING_META_KEY})) ?? "";
 			}
 		}
 

From 0131cb70db62e45338185a00bae7794273da2d71 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 12 Sep 2024 21:30:07 -0400
Subject: [PATCH 192/423] Resolving an issue with calendar navigation.

---
 assets/template/calendar-grid-style.css |  8 ++++++++
 src/TouchPoint-WP/CalendarGrid.php      | 13 +++++++------
 src/templates/meeting-archive.php       |  3 +++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/assets/template/calendar-grid-style.css b/assets/template/calendar-grid-style.css
index 50f22b6a..d84a14bc 100644
--- a/assets/template/calendar-grid-style.css
+++ b/assets/template/calendar-grid-style.css
@@ -46,6 +46,10 @@ div.calGrid div.calDay.after {
     background: #0001;
 }
 
+div.calGridNav.bottom {
+    display: none;
+}
+
 @media screen and (max-width: 1000px) {
     div.calGrid {
         display: grid;
@@ -78,6 +82,10 @@ div.calGrid div.calDay.after {
     div.calGrid div.calDay > h3.calDayHead {
         display:block;
     }
+
+    div.calGridNav.bottom {
+        display: flex;
+    }
 }
 
 div.calGridNav {
diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index bb0373aa..8c3d21e3 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -173,7 +173,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 			$dayHtml = "";
 			$hasFirstDays = false;
 
-			foreach ($dayEvents as $k => $m) {
+			foreach ($dayEvents as $m) {
 				$link = $m->permalink();
 				$notFirstDay = $m->startDt < $d;
 
@@ -239,7 +239,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 				}
 			} else {
 				if (!$isMonthAfter && $day > 27) {
-					$lastDayOfMonth = DateTimeImmutable::createFromMutable($d);
+					$lastDayOfMonth = $d;
 				}
 			}
 		} while (!$isMonthAfter || $d->format('w') !== '0');
@@ -253,7 +253,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 			$this->html = "<div class=\"calGrid noEvents\">$message</div>";
 		}
 
-		$this->next = $lastDayOfMonth->add($aDay);
+		$this->next = DateTimeImmutable::createFromMutable($lastDayOfMonth->add($aDay));
 		$this->prev = $firstDayOfMonth->sub($aDay);
 	}
 
@@ -284,13 +284,14 @@ public static function enqueueCalendarStyle(): void
 	/**
 	 * This method returns a navigation bar for the calendar grid with simply next/prev month links.
 	 *
-	 * @param bool $withMonthName
+	 * @param bool   $withMonthName
+	 * @param string $class
 	 *
 	 * @return string
 	 */
-	public function navBar(bool $withMonthName = false): string
+	public function navBar(bool $withMonthName = false, string $class=""): string
 	{
-		$r = "<div class=\"calGridNav\">";
+		$r = "<div class=\"calGridNav $class\">";
 		$r .= "<div class=\"prev\">";
 		$r .= $this->getPrevLink();
 		$r .= "</div>";
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
index 9b24c18e..7d62f5d5 100644
--- a/src/templates/meeting-archive.php
+++ b/src/templates/meeting-archive.php
@@ -47,6 +47,9 @@
 
 	echo $grid->navBar(true);
     echo $grid;
+    if ($grid->eventCount > 0) {
+	    echo $grid->navBar(false, 'bottom');
+    }
 
     wp_reset_query();
     $taxQuery = [[]];

From 1e882b3633056c9427874b19f220491dfe0f3f06 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 1 Oct 2024 22:52:10 -0500
Subject: [PATCH 193/423] adding inline report parameter

---
 docs                         |  2 +-
 src/TouchPoint-WP/Report.php | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs b/docs
index 0bda5ee9..248c392c 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 0bda5ee9dbbc66865ebbe502d24d282124836059
+Subproject commit 248c392c67910e62cb5626077e75e5ac8cb5890f
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 54ac51a4..ce34ec3c 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -350,13 +350,17 @@ public static function reportShortcode($params = [], string $content = ""): stri
 				'name'        => '',
 				'interval'    => 24,
 				'p1'          => '',
-				'showupdated' => 'true'
+				'showupdated' => 'true',
+				'inline'      => 'false'
 			],
 			$params,
 			self::SHORTCODE_REPORT
 		);
 
 		$params['showupdated'] = (strtolower($params['showupdated']) === 'true' || $params['showupdated'] === 1);
+		$params['inline'] = (strtolower($params['inline']) === 'true' || $params['inline'] === 1);
+
+		$params['showupdated'] = $params['showupdated'] && !$params['inline'];
 
 		try {
 			$report = self::fromParams($params);
@@ -388,7 +392,11 @@ public static function reportShortcode($params = [], string $content = ""): stri
 
 		$permalink = esc_attr(get_post_permalink($report->getPost()));
 
-		$rc     = "<figure $idAttr class=\"$class\" data-tp-report=\"$permalink\">\n\t" . str_replace("\n", "\n\t", $rc);
+		$elt = $params['inline'] ? "span" : "figure";
+		$nt  = $params['inline'] ? "" : "\n\t";
+		$n   = $params['inline'] ? "" : "\n";
+
+		$rc = "<$elt $idAttr class=\"$class\" data-tp-report=\"$permalink\">$nt" . str_replace("\n", $nt, $rc);
 
 		// If desired, add a caption that indicates when the table was last updated.
 		if ($params['showupdated']) {
@@ -399,10 +407,10 @@ public static function reportShortcode($params = [], string $content = ""): stri
 				get_the_modified_time('', $report->getPost())
 			);
 
-			$rc .= "\n\t<figcaption class='tp-report-updated'>$updatedS</figcaption>";
+			$rc .= "$nt<figcaption class='tp-report-updated'>$updatedS</figcaption>";
 		}
 
-		$rc .= "\n</figure>";
+		$rc .= "$n</$elt>";
 
 		return $rc;
 	}

From 2691ddc26ebfb18b202a389d66de21458d399d6b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 8 Oct 2024 08:10:09 -0400
Subject: [PATCH 194/423] Resolve an issue with DST starting and ending. Closes
 #207.

---
 src/TouchPoint-WP/CalendarGrid.php | 34 +++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 8c3d21e3..fd2e27cc 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -72,7 +72,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 			$year  = intval($year);
 			if ($month < 1 || $month > 12 || $year < 2020 || $year > 2100) {
 				$d = new DateTime('now', $tz);
-				$d = new DateTime($d->format('Y-m-01'), $tz);
+				$d = new DateTime($d->format('Y-m-01 00:00:00'), $tz);
 			} else {
 				$d = new DateTime("$year-$month-01", $tz);
 			}
@@ -88,7 +88,11 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
 		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
-		$d->modify("-$offsetDays days");
+		try {
+			$d->modify("-$offsetDays days");
+		} catch (Exception) { // Exception is not feasible.
+		}
+		$d->setTimezone($tz);
 		$r = "";
 
 		// Extra days at the end of the month
@@ -227,8 +231,24 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 			// Increment days
 			$mo1 = $d->format('n');
+			$oldDd = $d->format('d');
 			$d->add($aDay);
-			$d2359->add($aDay);
+			$d->setTimezone($tz);
+
+			// handle fall DST transitions.
+			while ($d->format('d') == $oldDd) {
+				$d->add($aDay);
+				$d->setTimezone($tz);
+			}
+
+			try {
+				$d     = new DateTime($d->format('Y-m-d 00:00:00'), $tz);
+				$d2359 = new DateTime($d->format('Y-m-d 23:59:59'), $tz);
+			} catch (Exception) {
+				// unlikely to ever run, since the format is provided.
+				$d2359->add($aDay);
+				$d2359->setTimezone($tz);
+			}
 			$mo2 = $d->format('n');
 
 			if ($mo1 !== $mo2) {
@@ -253,8 +273,12 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 			$this->html = "<div class=\"calGrid noEvents\">$message</div>";
 		}
 
-		$this->next = DateTimeImmutable::createFromMutable($lastDayOfMonth->add($aDay));
-		$this->prev = $firstDayOfMonth->sub($aDay);
+		$this->next = DateTimeImmutable::createFromMutable($lastDayOfMonth->add($aDay)->setTimezone($tz));
+		try {
+			$this->prev = $firstDayOfMonth->sub($aDay)->setTimezone($tz);
+		} catch (Exception) {
+			$this->prev = null;
+		}
 	}
 
 	/**

From 60e28324b028e52293f4e22341b3f0df8568f9cc Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 9 Oct 2024 21:57:43 -0400
Subject: [PATCH 195/423] Version bump.

---
 composer.json                      |   2 +-
 docs                               |   2 +-
 i18n/TouchPoint-WP-es_ES.po        | 112 ++++++++++++++--------------
 i18n/TouchPoint-WP.pot             | 116 ++++++++++++++---------------
 package.json                       |   2 +-
 src/TouchPoint-WP/TouchPointWP.php |   2 +-
 src/python/WebApi.py               |   2 +-
 touchpoint-wp.php                  |   2 +-
 8 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/composer.json b/composer.json
index eec1aa45..d85ebd44 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.92",
+  "version": "0.0.93",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/docs b/docs
index 248c392c..0d854550 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 248c392c67910e62cb5626077e75e5ac8cb5890f
+Subproject commit 0d854550b75f6f46b4a1666dd812358ec4381ca4
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 2a19921c..cc7bc332 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:213
-#: src/TouchPoint-WP/Involvement.php:1845
+#: src/TouchPoint-WP/Involvement.php:1854
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:217
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1880
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +173,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2092
+#: src/TouchPoint-WP/Involvement.php:2101
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -208,80 +208,80 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:495
+#: src/TouchPoint-WP/Involvement.php:496
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:500
+#: src/TouchPoint-WP/Involvement.php:501
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:507
+#: src/TouchPoint-WP/Involvement.php:508
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:513
+#: src/TouchPoint-WP/Involvement.php:514
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1720
+#: src/TouchPoint-WP/Involvement.php:1729
 #: src/TouchPoint-WP/Partner.php:814
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1928
+#: src/TouchPoint-WP/Involvement.php:1937
 #: src/TouchPoint-WP/Partner.php:838
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3547
+#: src/TouchPoint-WP/Involvement.php:3556
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3550
+#: src/TouchPoint-WP/Involvement.php:3559
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3627
+#: src/TouchPoint-WP/Involvement.php:3636
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3696
-#: src/TouchPoint-WP/Involvement.php:3738
+#: src/TouchPoint-WP/Involvement.php:3705
+#: src/TouchPoint-WP/Involvement.php:3747
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3701
+#: src/TouchPoint-WP/Involvement.php:3710
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3705
+#: src/TouchPoint-WP/Involvement.php:3714
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3710
+#: src/TouchPoint-WP/Involvement.php:3719
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3713
+#: src/TouchPoint-WP/Involvement.php:3722
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3716
+#: src/TouchPoint-WP/Involvement.php:3725
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3719
+#: src/TouchPoint-WP/Involvement.php:3728
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3729
+#: src/TouchPoint-WP/Involvement.php:3738
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3644
+#: src/TouchPoint-WP/Involvement.php:3653
 #: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -1026,16 +1026,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1893
+#: src/TouchPoint-WP/Involvement.php:1902
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1906
+#: src/TouchPoint-WP/Involvement.php:1915
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1777
+#: src/TouchPoint-WP/Involvement.php:1786
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1197,23 +1197,23 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1894
+#: src/TouchPoint-WP/Involvement.php:1903
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1895
+#: src/TouchPoint-WP/Involvement.php:1904
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1936
+#: src/TouchPoint-WP/Involvement.php:1945
 #: src/TouchPoint-WP/Partner.php:854
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1939
+#: src/TouchPoint-WP/Involvement.php:1948
 #: src/TouchPoint-WP/Partner.php:857
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
@@ -1221,48 +1221,48 @@ msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
 #. Translators: %1$s is the start date, %2$s is the start time.
-#: src/TouchPoint-WP/Involvement.php:991
-#: src/TouchPoint-WP/Involvement.php:1023
-#: src/TouchPoint-WP/Involvement.php:1112
-#: src/TouchPoint-WP/Involvement.php:1136
+#: src/TouchPoint-WP/Involvement.php:996
+#: src/TouchPoint-WP/Involvement.php:1028
+#: src/TouchPoint-WP/Involvement.php:1121
+#: src/TouchPoint-WP/Involvement.php:1145
 #: src/TouchPoint-WP/Utilities/DateFormats.php:283
 #: src/TouchPoint-WP/Utilities/DateFormats.php:347
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1032
+#: src/TouchPoint-WP/Involvement.php:1037
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1041
+#: src/TouchPoint-WP/Involvement.php:1046
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1050
+#: src/TouchPoint-WP/Involvement.php:1055
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1058
+#: src/TouchPoint-WP/Involvement.php:1063
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1066
+#: src/TouchPoint-WP/Involvement.php:1071
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1074
+#: src/TouchPoint-WP/Involvement.php:1079
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3568
+#: src/TouchPoint-WP/Involvement.php:3577
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1279,15 +1279,15 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2033
+#: src/TouchPoint-WP/Involvement.php:2042
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2043
+#: src/TouchPoint-WP/Involvement.php:2052
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2062
+#: src/TouchPoint-WP/Involvement.php:2071
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
@@ -1306,8 +1306,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3834
-#: src/TouchPoint-WP/Involvement.php:3931
+#: src/TouchPoint-WP/Involvement.php:3843
+#: src/TouchPoint-WP/Involvement.php:3940
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1419,7 +1419,7 @@ msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:397
+#: src/TouchPoint-WP/Report.php:405
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
@@ -1427,7 +1427,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1820
+#: src/TouchPoint-WP/Involvement.php:1829
 msgid "Language"
 msgstr "Idioma"
 
@@ -1480,7 +1480,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3918
+#: src/TouchPoint-WP/Involvement.php:3927
 #: src/TouchPoint-WP/Person.php:1827
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1505,7 +1505,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3908
+#: src/TouchPoint-WP/Involvement.php:3917
 #: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1626,12 +1626,12 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:185
+#: src/TouchPoint-WP/CalendarGrid.php:189
 msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3656
+#: src/TouchPoint-WP/Involvement.php:3665
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1710,13 +1710,13 @@ msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:136
+#: src/TouchPoint-WP/Involvement.php:137
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:994
-#: src/TouchPoint-WP/Involvement.php:1017
+#: src/TouchPoint-WP/Involvement.php:999
+#: src/TouchPoint-WP/Involvement.php:1022
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
@@ -1781,7 +1781,7 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:252
+#: src/TouchPoint-WP/CalendarGrid.php:272
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
 
@@ -1834,7 +1834,7 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1018
+#: src/TouchPoint-WP/Involvement.php:1023
 msgid "All Day"
 msgstr "todo el dia"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index ffa5bb98..e28dbddf 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.92\n"
+"Project-Id-Version: TouchPoint WP 0.0.93\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-09-12T20:51:39+00:00\n"
+"POT-Creation-Date: 2024-10-10T01:55:33+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -170,13 +170,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:213
-#: src/TouchPoint-WP/Involvement.php:1845
+#: src/TouchPoint-WP/Involvement.php:1854
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:217
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1880
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2092
+#: src/TouchPoint-WP/Involvement.php:2101
 msgid "No %s Found."
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3568
+#: src/TouchPoint-WP/Involvement.php:3577
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -305,12 +305,12 @@ msgid "Session could not be validated."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:185
+#: src/TouchPoint-WP/CalendarGrid.php:189
 msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:252
+#: src/TouchPoint-WP/CalendarGrid.php:272
 msgid "There are no %s published for this month."
 msgstr ""
 
@@ -323,206 +323,206 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:136
+#: src/TouchPoint-WP/Involvement.php:137
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:495
+#: src/TouchPoint-WP/Involvement.php:496
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:500
+#: src/TouchPoint-WP/Involvement.php:501
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:507
+#: src/TouchPoint-WP/Involvement.php:508
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:513
+#: src/TouchPoint-WP/Involvement.php:514
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
 #. Translators: %1$s is the start date, %2$s is the start time.
-#: src/TouchPoint-WP/Involvement.php:991
-#: src/TouchPoint-WP/Involvement.php:1023
-#: src/TouchPoint-WP/Involvement.php:1112
-#: src/TouchPoint-WP/Involvement.php:1136
+#: src/TouchPoint-WP/Involvement.php:996
+#: src/TouchPoint-WP/Involvement.php:1028
+#: src/TouchPoint-WP/Involvement.php:1121
+#: src/TouchPoint-WP/Involvement.php:1145
 #: src/TouchPoint-WP/Utilities/DateFormats.php:283
 #: src/TouchPoint-WP/Utilities/DateFormats.php:347
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:994
-#: src/TouchPoint-WP/Involvement.php:1017
+#: src/TouchPoint-WP/Involvement.php:999
+#: src/TouchPoint-WP/Involvement.php:1022
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1018
+#: src/TouchPoint-WP/Involvement.php:1023
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1032
+#: src/TouchPoint-WP/Involvement.php:1037
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1041
+#: src/TouchPoint-WP/Involvement.php:1046
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1050
+#: src/TouchPoint-WP/Involvement.php:1055
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1058
+#: src/TouchPoint-WP/Involvement.php:1063
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1066
+#: src/TouchPoint-WP/Involvement.php:1071
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1074
+#: src/TouchPoint-WP/Involvement.php:1079
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1720
+#: src/TouchPoint-WP/Involvement.php:1729
 #: src/TouchPoint-WP/Partner.php:814
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1777
+#: src/TouchPoint-WP/Involvement.php:1786
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1820
+#: src/TouchPoint-WP/Involvement.php:1829
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1893
+#: src/TouchPoint-WP/Involvement.php:1902
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1894
+#: src/TouchPoint-WP/Involvement.php:1903
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1895
+#: src/TouchPoint-WP/Involvement.php:1904
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1906
+#: src/TouchPoint-WP/Involvement.php:1915
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1928
+#: src/TouchPoint-WP/Involvement.php:1937
 #: src/TouchPoint-WP/Partner.php:838
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1936
+#: src/TouchPoint-WP/Involvement.php:1945
 #: src/TouchPoint-WP/Partner.php:854
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1939
+#: src/TouchPoint-WP/Involvement.php:1948
 #: src/TouchPoint-WP/Partner.php:857
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2033
+#: src/TouchPoint-WP/Involvement.php:2042
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2043
+#: src/TouchPoint-WP/Involvement.php:2052
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2062
+#: src/TouchPoint-WP/Involvement.php:2071
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3547
+#: src/TouchPoint-WP/Involvement.php:3556
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3550
+#: src/TouchPoint-WP/Involvement.php:3559
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3627
+#: src/TouchPoint-WP/Involvement.php:3636
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3644
+#: src/TouchPoint-WP/Involvement.php:3653
 #: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3656
+#: src/TouchPoint-WP/Involvement.php:3665
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3696
-#: src/TouchPoint-WP/Involvement.php:3738
+#: src/TouchPoint-WP/Involvement.php:3705
+#: src/TouchPoint-WP/Involvement.php:3747
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3701
+#: src/TouchPoint-WP/Involvement.php:3710
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3705
+#: src/TouchPoint-WP/Involvement.php:3714
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3710
+#: src/TouchPoint-WP/Involvement.php:3719
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3713
+#: src/TouchPoint-WP/Involvement.php:3722
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3716
+#: src/TouchPoint-WP/Involvement.php:3725
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3719
+#: src/TouchPoint-WP/Involvement.php:3728
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3729
+#: src/TouchPoint-WP/Involvement.php:3738
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3834
-#: src/TouchPoint-WP/Involvement.php:3931
+#: src/TouchPoint-WP/Involvement.php:3843
+#: src/TouchPoint-WP/Involvement.php:3940
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3908
+#: src/TouchPoint-WP/Involvement.php:3917
 #: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3918
+#: src/TouchPoint-WP/Involvement.php:3927
 #: src/TouchPoint-WP/Person.php:1827
 msgid "Contact Prohibited."
 msgstr ""
@@ -633,7 +633,7 @@ msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:397
+#: src/TouchPoint-WP/Report.php:405
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
diff --git a/package.json b/package.json
index 0bdc17f4..a9c78e7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.92",
+  "version": "0.0.93",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index ebd7e4f3..fb6312b6 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -33,7 +33,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.92";
+	public const VERSION = "0.0.93";
 
 	/**
 	 * The Token
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 1a481e81..7059917e 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "0.0.92"
+VERSION = "0.0.93"
 
 sgContactEvName = "Contact"
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index d3fa636e..ce5877c4 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.92
+Version:            0.0.93
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From 28fb01f4abf83fc5961ef161e1d2f7a6c6c405a2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 4 Nov 2024 13:54:17 -0500
Subject: [PATCH 196/423] Adding ipapi key option, cleanup functions and
 related items. Also, version bump.

---
 composer.json                               |  2 +-
 docs                                        |  2 +-
 package.json                                |  2 +-
 src/TouchPoint-WP/Involvement.php           |  2 +-
 src/TouchPoint-WP/TouchPointWP.php          | 26 +++++++++++++++++++--
 src/TouchPoint-WP/TouchPointWP_Settings.php | 17 ++++++++++++++
 src/python/WebApi.py                        |  2 +-
 touchpoint-wp.php                           |  2 +-
 8 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index d85ebd44..42c30436 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/docs b/docs
index 0d854550..bd2afd5a 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 0d854550b75f6f46b4a1666dd812358ec4381ca4
+Subproject commit bd2afd5ab03a5ee5ae0a77754f96516c3e211835
diff --git a/package.json b/package.json
index a9c78e7c..06a92658 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 59b4c49f..c5e6605b 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2030,7 +2030,7 @@ public static function ajaxNearby(): void
 		$type  = $_GET['type'] ?? "";
 		$lat   = $_GET['lat'] ?? null;
 		$lng   = $_GET['lng'] ?? null;
-		$limit = $_GET['limit'] ?? null;
+		$limit = $_GET['limit'] ?? 10;
 
 		$settings = self::getSettingsForPostType($type);
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index fb6312b6..929270d4 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -5,6 +5,7 @@
 
 namespace tp\TouchPointWP;
 
+use JsonException;
 use stdClass;
 use tp\TouchPointWP\Utilities\Cleanup;
 use tp\TouchPointWP\Utilities\Http;
@@ -33,7 +34,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.93";
+	public const VERSION = "0.0.94";
 
 	/**
 	 * The Token
@@ -84,6 +85,8 @@ class TouchPointWP
 	 */
 	public const CACHE_TTL = 8;
 
+	public const TTL_IP_GEO = 5;  // years
+
 	/**
 	 * Caching
 	 */
@@ -1169,10 +1172,29 @@ protected function getIpData(string $ip, bool $useApi = true)
 			return false;
 		}
 
-		$return = self::instance()->extGet("https://ipapi.co/" . $ip . "/json/"); // Exceptions thrown here.
+		$ipapi_key = $this->settings->ipapi_key;
+		if ($ipapi_key !== "") {
+			$ipapi_key = [
+				'key' => $ipapi_key
+			];
+		} else {
+			$ipapi_key = [];
+		}
+
+		$return = self::instance()->extGet("https://ipapi.co/" . $ip . "/json/", $ipapi_key); // Exceptions thrown here.
 
 		$return = $return['body'];
 
+		if (str_contains($return, 'Too many rapid requests')) {
+			throw new TouchPointWP_Exception("IP Geolocation Error: Too many requests", 178001);
+		}
+
+		try {
+			json_decode($return, flags: JSON_THROW_ON_ERROR);
+		} catch (JsonException) {
+			throw new TouchPointWP_Exception("IP Geolocation Error: Invalid JSON", 178001);
+		}
+
 		if (property_exists($return, 'error')) {
 			throw new TouchPointWP_Exception("IP Geolocation Error: " . $return->error . " " . $return->reason ?? "", 178001);
 		}
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 1fc438da..b57b1eae 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -31,6 +31,7 @@
  * @property-read string       api_script_name    The name of the script loaded into TouchPoint for API Interfacing
  * @property-read string       google_maps_api_key Google Maps API Key for embedded maps
  * @property-read string       google_geo_api_key Google Maps API Key for geocoding
+ * @property-read string       ipapi_key          The API key for ipapi.co for geolocation.
  *
  * @property-read array        people_contact_keywords Keywords to use for the generic Contact person button.
  * @property-read string       people_ev_bio      Extra Value field that should be imported as a User bio.
@@ -426,6 +427,17 @@ private function settingsFields(bool|string $includeDetail = false): array
 					'default'     => '',
 					'placeholder' => '',
 				],
+				[
+					'id'          => 'ipapi_key',
+					'label'       => __('ipapi.co API Key', 'TouchPoint-WP'),
+					'description' => __(
+						'Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited.',
+						'TouchPoint-WP'
+					),
+					'type'        => 'text',
+					'default'     => '',
+					'placeholder' => '',
+				],
 			],
 		];
 
@@ -1587,6 +1599,11 @@ public function migrate(): void
 		// 0.0.90 - Remove an option that was only briefly used.
 		delete_option(TouchPointWP::SETTINGS_PREFIX . 'mc_cron_last_run');
 
+		// 0.0.94 - Cleanup old IP Geo data
+		$tableName = $wpdb->base_prefix . TouchPointWP::TABLE_IP_GEO;
+		$years = TouchPointWP::TTL_IP_GEO;
+		$wpdb->query("DELETE FROM $tableName WHERE `updatedDT` < NOW() - INTERVAL $years YEAR OR `data` LIKE 'Too many rapid requests.%';");
+
 		// Update version string
 		$this->set('version', TouchPointWP::VERSION);
 	}
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 7059917e..b281fa4d 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "0.0.93"
+VERSION = "0.0.94"
 
 sgContactEvName = "Contact"
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index ce5877c4..081460b0 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.93
+Version:            0.0.94
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From 8864173963222eff9e7c22a7e17fbdf39fccf24d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 16 Nov 2024 09:34:13 -0500
Subject: [PATCH 197/423] WordPress tested version bump

---
 touchpoint-wp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 081460b0..785860a0 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -20,7 +20,7 @@
 License:            AGPLv3+
 Text Domain:        TouchPoint-WP
 Requires at least:  6.0
-Tested up to:       6.5
+Tested up to:       6.7
 Requires PHP:       8.0
 Release Asset:      true
 */

From 0499005c3151ef0b1b7fa8351ff848ed5c1122b4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 16 Nov 2024 09:49:15 -0500
Subject: [PATCH 198/423] Fix cal grid incrementing issue. Closes #207 again.

---
 src/TouchPoint-WP/CalendarGrid.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index fd2e27cc..ff2aabac 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -256,9 +256,6 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 					$isMonthBefore = false;
 				} else {
 					$isMonthAfter = true;
-				}
-			} else {
-				if (!$isMonthAfter && $day > 27) {
 					$lastDayOfMonth = $d;
 				}
 			}
@@ -273,7 +270,7 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 			$this->html = "<div class=\"calGrid noEvents\">$message</div>";
 		}
 
-		$this->next = DateTimeImmutable::createFromMutable($lastDayOfMonth->add($aDay)->setTimezone($tz));
+		$this->next = DateTimeImmutable::createFromMutable($lastDayOfMonth);
 		try {
 			$this->prev = $firstDayOfMonth->sub($aDay)->setTimezone($tz);
 		} catch (Exception) {

From 631c7bbccd18829cfa7337df5e68de2d6c448a58 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 16 Nov 2024 10:11:30 -0500
Subject: [PATCH 199/423] Only show some registration buttons for meetings if
 they're relevant in time.  Closes #205

---
 src/TouchPoint-WP/Involvement.php | 26 ++++++++++++++++++++++----
 src/TouchPoint-WP/Meeting.php     |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index c5e6605b..f910c04b 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3688,13 +3688,14 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 	/**
 	 * Get the HTML for the register button.  Labels depend on several settings within TouchPoint.
 	 *
-	 * @param string $btnClass  Class names
-	 * @param bool   $absoluteLinks  Whether only absolute links should be provided that can be used in emails, apps,
+	 * @param string   $btnClass  Class names
+	 * @param bool     $absoluteLinks  Whether only absolute links should be provided that can be used in emails, apps,
 	 *     etc.
+	 * @param ?Meeting $forMeeting  If these buttons are for a meeting, pass the meeting
 	 *
 	 * @return ?string HTML for the registration button, whatever that should be. Null if nothing to return.
 	 */
-	public function getRegisterButton(string $btnClass, bool $absoluteLinks = false): ?string
+	public function getRegisterButton(string $btnClass, bool $absoluteLinks = false, ?Meeting $forMeeting = null): ?string
 	{
 		if ($btnClass !== "") {
 			$btnClass = " class=\"$btnClass\"";
@@ -3703,7 +3704,8 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false)
 		switch ($this->getRegistrationType()) {
 			case RegistrationType::FORM:
 				$text = __('Register', 'TouchPoint-WP');
-				switch (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) {
+				$regTypeId = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true);
+				switch ($regTypeId) {
 					case 1:  // Join Involvement (skip other options because this option is common)
 						break;
 					case 5:  // Create Account
@@ -3728,6 +3730,22 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false)
 						$text = __('Get Tickets', 'TouchPoint-WP');
 						break;
 				}
+
+				// If this is a meeting with record attendance type, don't show unless the meeting is within an hour.
+				if ($forMeeting !== null && $regTypeId == 18) {
+					if ($forMeeting->startDt > Utilities::dateTimeNow()->modify('+1 hour') ||
+					    ($forMeeting->endDt ?? $forMeeting->startDt) < Utilities::dateTimeNow()->modify('-1 hour')) {
+						return null;
+					}
+				}
+
+				// If this is a meeting with tickets, don't show unless the meeting is in the present or future.
+				if ($forMeeting !== null && $regTypeId == 21) {
+					if (($forMeeting->endDt ?? $forMeeting->startDt->modify('+1 hour')) < Utilities::dateTimeNow()) {
+						return null;
+					}
+				}
+
 				$link  = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
 				if (!$absoluteLinks) {
 					TouchPointWP::enqueueActionsStyle('inv-register');
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 0d1ab801..785a2532 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -476,7 +476,7 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 
 		if ($this->status() !== self::STATUS_CANCELLED) {
 			if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
-				$ret['register'] = $inv->getRegisterButton($btnClass, $absoluteLinks);
+				$ret['register'] = $inv->getRegisterButton($btnClass, $absoluteLinks, $this);
 			}
 
 			if ($inv->getRegistrationType() === RegistrationType::RSVP) {

From 8ea9692814e906d9dedcd15aa4021ce355032566 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 16 Nov 2024 10:16:10 -0500
Subject: [PATCH 200/423] Improving a label.

---
 src/TouchPoint-WP/Meeting.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 785a2532..19567a81 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -748,7 +748,8 @@ public function getRsvpButton(string $btnClass = ""): string
 	}
 
 	/**
-	 * Get a link to RSVP for the meeting that can be used in emails, apps, or other contexts.
+	 * Get a link to RSVP for the meeting that can be used in emails, apps, or other contexts.  This is a link to the
+	 * RSVP function in WordPress, not an RSVP magic link used in TouchPoint emails.
 	 *
 	 * @param string $btnClass
 	 *

From 5de3f0fea0558d63d196d972ea37f833524c75ba Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 16 Nov 2024 12:42:34 -0500
Subject: [PATCH 201/423] docs update

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index bd2afd5a..5a910bf2 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit bd2afd5ab03a5ee5ae0a77754f96516c3e211835
+Subproject commit 5a910bf25a4c0f33996ed097f8f3bc5d09a9ea3a

From d4202d1181bb095aa3c80ffab867c8ec937cc86c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 16 Nov 2024 14:06:24 -0500
Subject: [PATCH 202/423] Rename process in build yml

---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 5d75a89c..67751958 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -6,7 +6,7 @@ on:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
 jobs:
-  build:
+  release:
     name: Create Release
     runs-on: ubuntu-latest
     steps:

From 97e748bc68e497eda3bd39c41daefde4ed457fd8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 18 Nov 2024 08:52:11 -0500
Subject: [PATCH 203/423] Removing noreturn that probably never should have
 been committed.

---
 src/TouchPoint-WP/Involvement.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index f910c04b..c6c33522 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -24,7 +24,6 @@
 use DateTimeImmutable;
 use DateTimeZone;
 use Exception;
-use JetBrains\PhpStorm\NoReturn;
 use JsonSerializable;
 use stdClass;
 use tp\TouchPointWP\Utilities\DateFormats;
@@ -2022,7 +2021,6 @@ public static function api(array $uri): bool
 	/**
 	 * Handles the API call to get nearby involvements (probably small groups)
 	 */
-	#[NoReturn]
 	public static function ajaxNearby(): void
 	{
 		header('Content-Type: application/json');

From 26a61c8616d8a079a5b280c8c2612e6161a43989 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 18 Nov 2024 18:13:47 -0500
Subject: [PATCH 204/423] Starting #209.

---
 src/TouchPoint-WP/Auth.php         |   6 +
 src/TouchPoint-WP/Involvement.php  |  10 +
 src/TouchPoint-WP/Meeting.php      |   5 +
 src/TouchPoint-WP/Person.php       |   5 +
 src/TouchPoint-WP/Stats.php        | 327 +++++++++++++++++++++++++++++
 src/TouchPoint-WP/TouchPointWP.php |  47 +++++
 6 files changed, 400 insertions(+)
 create mode 100644 src/TouchPoint-WP/Stats.php

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 9ba3167c..03433d54 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -5,6 +5,7 @@
 
 namespace tp\TouchPointWP;
 
+use Exception;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonQuery;
 use tp\TouchPointWP\Utilities\Session;
@@ -442,6 +443,11 @@ public static function authenticate($user, $username, $password)
 
 			$user = $p->toNewWpUser();
 
+			try {
+				$stats = Stats::instance();
+				$stats->userAuths += 1;
+			} catch (Exception) {}
+
 			// Preload Ident people for potential use with InformalAuth.  Skip if family is already loaded.
 			if ( ! in_array($p->familyId, $s->primaryFam ?? [])) {
 				Person::ident((object)[
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index c6c33522..3fa8eadd 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3869,6 +3869,11 @@ private static function ajaxInvJoin(): void
 			exit;
 		}
 
+		try {
+			$stats = Stats::instance();
+			$stats->involvementJoins += count($data->success);
+		} catch (Exception) {}
+
 		echo json_encode(['success' => $data->success]);
 		exit;
 	}
@@ -3967,6 +3972,11 @@ private static function ajaxContact(): void
 			exit;
 		}
 
+		try {
+			$stats = Stats::instance();
+			$stats->involvementContacts += count($data->success);
+		} catch (Exception) {}
+
 		echo json_encode(['success' => $data->success]);
 		exit;
 	}
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 19567a81..669b7d18 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -720,6 +720,11 @@ private static function ajaxSubmitRsvps(): void
 			exit;
 		}
 
+		try {
+			$stats = Stats::instance();
+			$stats->rsvps += count($data->success);
+		} catch (Exception) {}
+
 		echo json_encode(['success' => $data->success]);
 		exit;
 	}
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 0eaf1b74..7b0dfbb2 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1632,6 +1632,11 @@ public static function ident($inputData): array
 
 		$s = Session::instance();
 
+		try {
+			$stats = Stats::instance();
+			$stats->softAuths += count($people);
+		} catch (Exception) {}
+
 		$ret          = [];
 		$primaryFam   = $s->primaryFam ?? [];
 		$secondaryFam = $s->secondaryFam ?? [];
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
new file mode 100644
index 00000000..32ba1187
--- /dev/null
+++ b/src/TouchPoint-WP/Stats.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use InvalidArgumentException;
+use tp\TouchPointWP\Utilities\Http;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+	require_once "api.php";
+}
+
+/**
+ * Keep track of some basic stats that are helpful for Tenth to support other churches using the plugin.
+ *
+ * @property int $involvementJoins
+ * @property int $involvementContacts
+ * @property int $involvementPosts
+ * @property int $meetings
+ * @property int $rsvps
+ * @property int $people
+ * @property int $partnerPosts
+ * @property int $userAuths
+ * @property int $softAuths
+ */
+class Stats implements api, \JsonSerializable
+{
+	protected static ?self $instance = null;
+
+	private bool $_dirty = false;
+
+	protected int $involvementJoins = 0;
+	protected int $involvementContacts = 0;
+	protected int $involvementPosts = 0;  // updated by query
+	protected int $meetings = 0;  // updated by query
+	protected int $rsvps = 0;
+	protected int $people = 0; // updated by query
+	protected int $partnerPosts = 0; // updated by query
+	protected int $userAuths = 0;
+	protected int $softAuths = 0;
+
+	/**
+	 * @var string A GUID representing the installation of this plugin.  A site with multiple Tenth plugins may have one
+	 * of these for each.
+	 */
+	private string $installId;
+
+	/**
+	 * @var string A GUID for validating incoming requests from the validation server. Never post this publicly, as in
+	 * the future it may be used to transmit some diagnostic information.
+	 */
+	private string $privateKey;
+
+	/**
+	 * @var string A GUID unique to the site.  A site with multiple Tenth plugins would all have this same GUID.
+	 */
+	private string $siteId;
+
+	const SUBMISSION_ENDPOINT = 'https://www.tenth.org/touchpoint-api/stats/submit';
+
+	/**
+	 * Get the instance of the Stats class, loading relevant info from the database.
+	 */
+	protected function __construct()
+	{
+		$data = get_option('tp_wp_stats');
+
+		if ($data !== false) {
+			$data = json_decode($data, true);
+			if ($data !== null) {
+				foreach ($data as $key => $value) {
+					if (property_exists($this, $key)) {
+						$this->$key = $value;
+					}
+				}
+			}
+		}
+
+		if (empty($this->installId) || empty($this->privateKey)) {
+			$this->privateKey = Utilities::createGuid();
+			$this->installId  = Utilities::createGuid();
+			$this->_dirty     = true;
+		}
+
+		$sid = get_option('tp_siteId', null);
+		if (empty($sid)) {
+			$sid = Utilities::createGuid();
+			update_option('tp_siteId', $sid);
+		}
+		$this->siteId = $sid;
+
+		$this->updateDb();
+	}
+
+	/**
+	 * Attempt to save on destruct.
+	 */
+	protected function __destruct()
+	{
+		try {
+			$this->updateDb();
+		} catch (\Exception $e) {
+			// ignore
+		}
+	}
+
+	/**
+	 * Save the stats to the database.
+	 *
+	 * @return bool true on success (or if an update wasn't needed), false on failure.
+	 */
+	public function updateDb(): bool
+	{
+		if ($this->_dirty) {
+			$d = $this->jsonSerialize();
+			unset($d['siteId']);
+			$r = update_option('tp_wp_stats', json_encode($d));
+			if ($r) {
+				$this->_dirty = false;
+			}
+			return $r;
+		}
+		return true;
+	}
+
+	/**
+	 * Setter.  Allows particular statistics to be set.
+	 * 
+	 * @param $name
+	 * @param $value
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	public function __set($name, $value)
+	{
+		if (in_array($name, ['privateKey', 'siteId', 'installId'])) {
+			throw new InvalidArgumentException("Cannot set $name directly.");
+		}
+
+		if (property_exists($this, $name)) {
+			if ($this->$name !== $value) {
+				$this->$name = $value;
+				$this->_dirty = true;
+			}
+		}
+	}
+
+	/**
+	 * @param string $name
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __get(string $name)
+	{
+		if (property_exists($this, $name) && !str_starts_with($name, '_')) {
+			return $this->$name;
+		}
+	}
+
+	/**
+	 * Assemble the information that's submitted.
+	 *
+	 * @return array
+	 */
+	public function getStatsForSubmission(): array
+	{
+		$data = $this->jsonSerialize();
+
+		$data['site'] = get_site_url();
+		$data['plugin'] = 'TouchPointWP';
+		$data['version'] = TouchPointWP::VERSION;
+		$data['php'] = phpversion();
+		$data['wp'] = get_bloginfo('version');
+		$data['wpLocale'] = get_locale();
+		$data['wpTimezone'] = get_option('timezone_string');
+		$data['adminEmail'] = get_option('admin_email');
+		$data['siteName'] = get_bloginfo('name');
+		$data['installId'] = $this->installId;
+		$data['privateKey'] = $this->privateKey;
+		$data['endpoint'] = TouchPointWP::API_ENDPOINT;
+
+		return $data;
+	}
+
+	/**
+	 * Submit stats to Tenth.
+	 *
+	 * @return void
+	 */
+	protected function submitStats(): void
+	{
+		$this->updateQueriedStats();
+
+		$data = $this->getStatsForSubmission();
+
+		wp_remote_post(self::SUBMISSION_ENDPOINT, [
+			'body' => $data,
+			'timeout' => 10,
+			'blocking' => false,
+		]);
+	}
+
+	/**
+	 * Assemble the object into a format that can be serialized to JSON.  Only includes
+	 * the parameters that are part of this class, not those that are loaded from the database separately,
+	 * such as version numbers.
+	 * 
+	 * @inheritDoc
+	 */
+	public function jsonSerialize()
+	{
+		$r = [];
+
+		// all properties that don't start with an underscore
+		foreach (get_object_vars($this) as $key => $value) {
+			if ( ! str_starts_with($key, '_')) {
+				$r[$key] = $value;
+			}
+		}
+
+		return $r;
+	}
+
+	/**
+	 * Update the stats that are determined from queries.
+	 * 
+	 * @return void
+	 */
+	protected function updateQueriedStats(): void
+	{
+		global $wpdb;
+
+		$this->involvementPosts = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_invId'") ?? -1;
+		$this->meetings = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_mtgId'") ?? -1;
+		$this->people = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->usermeta WHERE meta_key = 'tp_peopleId';") ?? -1;
+		$this->partnerPosts = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
+
+		$this->_dirty = true;
+	}
+
+	/**
+	 * Get the singleton.
+	 *
+	 * @return Stats
+	 */
+	public static function instance(): Stats
+	{
+		if (self::$instance === null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
+
+	/**
+	 * Handle API requests
+	 *
+	 * @param array $uri The request URI already parsed by parse_url()
+	 *
+	 * @return bool False if endpoint is not found.  Should print the result.
+	 */
+	public static function api(array $uri): bool
+	{
+		if (count($uri['path']) !== 3) {
+			return false;
+		}
+
+		switch (strtolower($uri['path'][2])) {
+			case "get":
+				$s = self::instance();
+				if (strtolower($_GET['key']) == strtolower($s->privateKey) ||
+				current_user_can('manage_options')) {
+					header('Content-Type: application/json');
+					$s->updateQueriedStats();
+					echo json_encode($s->getStatsForSubmission());
+					exit;
+				}
+
+			case "submit":
+				return self::handleSubmission();
+
+		}
+
+		return false;
+	}
+	
+	public static function handleSubmission() {
+		if ($_SERVER['REQUEST_METHOD'] !== "POST") {
+			http_response_code(Http::METHOD_NOT_ALLOWED);
+			return false;
+		}
+
+		$data = json_decode(file_get_contents('php://input'), true);
+
+		if ($data === null) {
+			http_response_code(Http::BAD_REQUEST);
+			return false;
+		}
+
+		// validate that privateKey, installId, and siteId are all included.
+		if ( ! isset($data['privateKey']) || ! isset($data['installId']) || ! isset($data['siteId'])) {
+			http_response_code(Http::BAD_REQUEST);
+			return false;
+		}
+
+		// upsert the data into the database into the stats table.
+		global $wpdb;
+		$r = $wpdb->replace($wpdb->prefix . TouchPointWP::TABLE_STATS, $data);
+
+		if ($r === false) {
+			http_response_code(Http::SERVER_ERROR);
+			return false;
+		}
+
+		echo $r;
+		exit;
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 929270d4..44cbab1b 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -23,6 +23,7 @@
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "Utilities.php";
+	require_once "Stats.php";
 }
 
 
@@ -51,6 +52,7 @@ class TouchPointWP
 	public const API_ENDPOINT_PERSON = "person";
 	public const API_ENDPOINT_MEETING = "mtg";
 	public const API_ENDPOINT_ADMIN = "admin";
+	public const API_ENDPOINT_STATS = "stats";
 	public const API_ENDPOINT_AUTH = "auth";
 	public const API_ENDPOINT_REPORT = "report";
 	public const API_ENDPOINT_ADMIN_SCRIPTZIP = "admin/scriptzip";
@@ -79,6 +81,7 @@ class TouchPointWP
 	 */
 	public const TABLE_PREFIX = "tp_";
 	public const TABLE_IP_GEO = self::TABLE_PREFIX . "ipGeo";
+	public const TABLE_STATS = self::TABLE_PREFIX . "stats";
 
 	/**
 	 * Typical amount of time in hours for metadata to last (e.g. genders and resCodes).
@@ -493,6 +496,13 @@ public function parseRequest($continue, $wp, $extraVars): bool
 				}
 			}
 
+			// Stats endpoints
+			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_STATS) {
+				if ( ! Stats::api($reqUri)) {
+					return $continue;
+				}
+			}
+
 			// Cleanup endpoints
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_CLEANUP) {
 				if ( ! Cleanup::api($reqUri)) {
@@ -638,6 +648,43 @@ protected function createTables(): void
 			PRIMARY KEY  (id)
 		)";
 		dbDelta($sql);
+
+		// Table for receiving info from other sites that use this plugin
+		if (site_url() === "https://www.tenth.org") {
+			$tableName = $wpdb->base_prefix . TouchPointWP::TABLE_STATS;
+			$sql = "CREATE TABLE $tableName (
+				intallId varchar(36) NOT NULL,
+				privateKey varchar(36) NOT NULL,
+				siteId varchar(36) NOT NULL,
+				site varchar(255) NOT NULL,
+				plugin varchar(255) NOT NULL,
+				version varchar(10) NOT NULL,
+				php varchar(10) NOT NULL,
+				wp varchar(10) NOT NULL,
+				wpLocale varchar(10) NOT NULL,
+				wpTimezone varchar(50) NOT NULL,
+				adminEmail varchar(255) NOT NULL,
+				siteName varchar(255) NOT NULL,
+				createdDT datetime DEFAULT NOW(),
+				updatedDT datetime DEFAULT NOW() ON UPDATE NOW(),
+				
+				lastQueryDt datetime DEFAULT NULL,
+				lastQueryStatus int(3) DEFAULT NULL,
+				
+				involvementJoins int(10) DEFAULT 0,
+				involvementContacts int(10) DEFAULT 0,
+				involvementPosts int(10) DEFAULT 0,
+				meetings int(10) DEFAULT 0,
+				rsvps int(10) DEFAULT 0,
+				people int(10) DEFAULT 0,
+				partnerPosts int(10) DEFAULT 0,
+				userAuths int(10) DEFAULT 0,
+				softAuths int(10) DEFAULT 0,
+				
+				PRIMARY KEY  (installId)
+			)";
+			dbDelta($sql);
+		}
 	}
 
 	/**

From cb3838276c430ee3fdd022d06ff3885a0fdfca0f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 18 Nov 2024 23:22:37 -0500
Subject: [PATCH 205/423] Progress on #209.

---
 src/TouchPoint-WP/Stats.php        | 63 +++++++++++++++++++++---------
 src/TouchPoint-WP/TouchPointWP.php | 19 +++++----
 2 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 32ba1187..03dc0851 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -131,7 +131,7 @@ public function updateDb(): bool
 
 	/**
 	 * Setter.  Allows particular statistics to be set.
-	 * 
+	 *
 	 * @param $name
 	 * @param $value
 	 *
@@ -187,7 +187,7 @@ public function getStatsForSubmission(): array
 		$data['siteName'] = get_bloginfo('name');
 		$data['installId'] = $this->installId;
 		$data['privateKey'] = $this->privateKey;
-		$data['endpoint'] = TouchPointWP::API_ENDPOINT;
+		$data['updatedDT'] = date('Y-m-d H:i:s'); // needs to be forced or update may not happen, which would make insert fail.
 
 		return $data;
 	}
@@ -204,7 +204,7 @@ protected function submitStats(): void
 		$data = $this->getStatsForSubmission();
 
 		wp_remote_post(self::SUBMISSION_ENDPOINT, [
-			'body' => $data,
+			'body' => ['data' => $data],
 			'timeout' => 10,
 			'blocking' => false,
 		]);
@@ -214,7 +214,7 @@ protected function submitStats(): void
 	 * Assemble the object into a format that can be serialized to JSON.  Only includes
 	 * the parameters that are part of this class, not those that are loaded from the database separately,
 	 * such as version numbers.
-	 * 
+	 *
 	 * @inheritDoc
 	 */
 	public function jsonSerialize()
@@ -233,7 +233,7 @@ public function jsonSerialize()
 
 	/**
 	 * Update the stats that are determined from queries.
-	 * 
+	 *
 	 * @return void
 	 */
 	protected function updateQueriedStats(): void
@@ -274,11 +274,12 @@ public static function api(array $uri): bool
 			return false;
 		}
 
+		$s = self::instance();
+
 		switch (strtolower($uri['path'][2])) {
 			case "get":
-				$s = self::instance();
 				if (strtolower($_GET['key']) == strtolower($s->privateKey) ||
-				current_user_can('manage_options')) {
+				    current_user_can('manage_options')) {
 					header('Content-Type: application/json');
 					$s->updateQueriedStats();
 					echo json_encode($s->getStatsForSubmission());
@@ -286,42 +287,66 @@ public static function api(array $uri): bool
 				}
 
 			case "submit":
-				return self::handleSubmission();
+				if ($_SERVER['REQUEST_METHOD'] === "POST") {
+					self::handleSubmission();
+				} else {
+					$s->submitStats();
+				}
+				exit;
 
 		}
 
 		return false;
 	}
-	
-	public static function handleSubmission() {
+
+	/**
+	 * Handle submissions received to this site (presumably tenth.org) from other users of the plugin.
+	 *
+	 * @return void
+	 */
+	public static function handleSubmission(): void
+	{
+
 		if ($_SERVER['REQUEST_METHOD'] !== "POST") {
 			http_response_code(Http::METHOD_NOT_ALLOWED);
-			return false;
+			echo "Only POST requests are allowed.";
+			exit;
 		}
 
-		$data = json_decode(file_get_contents('php://input'), true);
+		$data = $_POST['data'] ?? null;
 
-		if ($data === null) {
+		if (empty($data)) {
 			http_response_code(Http::BAD_REQUEST);
-			return false;
+			echo "No data was submitted.";
+			exit;
 		}
 
 		// validate that privateKey, installId, and siteId are all included.
 		if ( ! isset($data['privateKey']) || ! isset($data['installId']) || ! isset($data['siteId'])) {
 			http_response_code(Http::BAD_REQUEST);
-			return false;
+			echo "Keys not provided.";
+			exit;
 		}
 
-		// upsert the data into the database into the stats table.
+		// remove any fields that are not part of the stats object.
+		$s = self::instance();
+		$data = array_intersect_key($data, $s->getStatsForSubmission());
+
+		// upsert the data into the database into the stats table without destructive replace function
 		global $wpdb;
-		$r = $wpdb->replace($wpdb->prefix . TouchPointWP::TABLE_STATS, $data);
+		$r = $wpdb->update($wpdb->prefix . TouchPointWP::TABLE_STATS, $data, ['installId' => $data['installId']]);
+		if ($r < 1) {
+			$r = $wpdb->insert($wpdb->prefix . TouchPointWP::TABLE_STATS, $data);
+		}
 
 		if ($r === false) {
 			http_response_code(Http::SERVER_ERROR);
-			return false;
+			echo "Server error.";
+			echo $wpdb->last_error;
+			exit;
 		}
 
-		echo $r;
+//        echo $r;
 		exit;
 	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 44cbab1b..e203be6d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -409,7 +409,7 @@ public function parseRequest($continue, $wp, $extraVars): bool
 			if (str_ends_with($reqUri['path'], '/')) {
 				$reqUri['path'] = substr($reqUri['path'], 0, -1);
 			}
-			
+
 			if (isset($_GET['locale']) && strlen($_GET['locale']) > 1) {
 				$l = $_GET['locale'];
 				add_filter('locale', fn() => $l, 1);
@@ -630,6 +630,11 @@ public function loadLocalizations(): void
 		load_plugin_textdomain('TouchPoint-WP', false, $dir . '/i18n/');
 	}
 
+	public static function isTenth()
+	{
+		return site_url() === "https://www.tenth.org";
+	}
+
 	/**
 	 * Create or update database tables
 	 */
@@ -650,10 +655,10 @@ protected function createTables(): void
 		dbDelta($sql);
 
 		// Table for receiving info from other sites that use this plugin
-		if (site_url() === "https://www.tenth.org") {
+		if (self::isTenth()) {
 			$tableName = $wpdb->base_prefix . TouchPointWP::TABLE_STATS;
 			$sql = "CREATE TABLE $tableName (
-				intallId varchar(36) NOT NULL,
+				installId varchar(36) NOT NULL,
 				privateKey varchar(36) NOT NULL,
 				siteId varchar(36) NOT NULL,
 				site varchar(255) NOT NULL,
@@ -668,7 +673,7 @@ protected function createTables(): void
 				createdDT datetime DEFAULT NOW(),
 				updatedDT datetime DEFAULT NOW() ON UPDATE NOW(),
 				
-				lastQueryDt datetime DEFAULT NULL,
+				lastQueryDT datetime DEFAULT NULL,
 				lastQueryStatus int(3) DEFAULT NULL,
 				
 				involvementJoins int(10) DEFAULT 0,
@@ -1379,7 +1384,7 @@ protected static function clearScheduledHooks(): void
 		wp_clear_scheduled_hook(Report::CRON_HOOK);
 	}
 
-    /**
+	/**
 	 * Drop database tables at uninstallation.
 	 */
 	protected static function dropTables(): void
@@ -2257,7 +2262,7 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 		       $this->settings->api_script_name . "?" . http_build_query($parameters);
 
 		self::$apiCallLog[] = $url;
-		
+
 		if ($verbose) {
 			echo "<p>Request to $url</p>";
 		}
@@ -2606,7 +2611,7 @@ public function validateThatTpWpUserExists(): bool
 
 	/**
 	 * Make the TPWP user the active one, so permissions are not dependent on whoever happens to be running things
-	 * at the moment. 
+	 * at the moment.
 	 *
 	 * @return void
 	 */

From 21d9ae631c0cf510624cea2e83d39c6323281377 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 18 Nov 2024 23:29:47 -0500
Subject: [PATCH 206/423] Moving updatedDT to server-side only, where it
 belongs.

---
 src/TouchPoint-WP/Stats.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 03dc0851..4e935c7e 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -187,7 +187,6 @@ public function getStatsForSubmission(): array
 		$data['siteName'] = get_bloginfo('name');
 		$data['installId'] = $this->installId;
 		$data['privateKey'] = $this->privateKey;
-		$data['updatedDT'] = date('Y-m-d H:i:s'); // needs to be forced or update may not happen, which would make insert fail.
 
 		return $data;
 	}
@@ -302,15 +301,15 @@ public static function api(array $uri): bool
 	/**
 	 * Handle submissions received to this site (presumably tenth.org) from other users of the plugin.
 	 *
-	 * @return void
+	 * @return bool True on success
 	 */
-	public static function handleSubmission(): void
+	public static function handleSubmission(): bool
 	{
 
 		if ($_SERVER['REQUEST_METHOD'] !== "POST") {
 			http_response_code(Http::METHOD_NOT_ALLOWED);
 			echo "Only POST requests are allowed.";
-			exit;
+			return false;
 		}
 
 		$data = $_POST['data'] ?? null;
@@ -318,19 +317,20 @@ public static function handleSubmission(): void
 		if (empty($data)) {
 			http_response_code(Http::BAD_REQUEST);
 			echo "No data was submitted.";
-			exit;
+			return false;
 		}
 
 		// validate that privateKey, installId, and siteId are all included.
 		if ( ! isset($data['privateKey']) || ! isset($data['installId']) || ! isset($data['siteId'])) {
 			http_response_code(Http::BAD_REQUEST);
 			echo "Keys not provided.";
-			exit;
+			return false;
 		}
 
 		// remove any fields that are not part of the stats object.
 		$s = self::instance();
 		$data = array_intersect_key($data, $s->getStatsForSubmission());
+		$data['updatedDT'] = date('Y-m-d H:i:s');
 
 		// upsert the data into the database into the stats table without destructive replace function
 		global $wpdb;
@@ -343,10 +343,10 @@ public static function handleSubmission(): void
 			http_response_code(Http::SERVER_ERROR);
 			echo "Server error.";
 			echo $wpdb->last_error;
-			exit;
+			return false;
 		}
 
-//        echo $r;
-		exit;
+        echo $r;
+		return true;
 	}
 }
\ No newline at end of file

From 393674ea1b60c6afabb7396829cbdffc94a2a15f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 18 Nov 2024 23:31:06 -0500
Subject: [PATCH 207/423] remove explicit server error

---
 src/TouchPoint-WP/Stats.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 4e935c7e..cf67e9d9 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -342,7 +342,6 @@ public static function handleSubmission(): bool
 		if ($r === false) {
 			http_response_code(Http::SERVER_ERROR);
 			echo "Server error.";
-			echo $wpdb->last_error;
 			return false;
 		}
 

From 0597e00130930d52c4210e12c13a30cc98cc20ee Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 19 Nov 2024 08:12:22 -0500
Subject: [PATCH 208/423] Resolve issue where destruct is getting called to
 late for saves by saving manually in each location. Also making siteId truly
 global across sites.

---
 src/TouchPoint-WP/Auth.php        |  1 +
 src/TouchPoint-WP/Involvement.php |  2 ++
 src/TouchPoint-WP/Meeting.php     |  1 +
 src/TouchPoint-WP/Person.php      |  1 +
 src/TouchPoint-WP/Stats.php       | 15 ++++++++-------
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 03433d54..5c9c11b5 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -446,6 +446,7 @@ public static function authenticate($user, $username, $password)
 			try {
 				$stats = Stats::instance();
 				$stats->userAuths += 1;
+				$stats->updateDb();
 			} catch (Exception) {}
 
 			// Preload Ident people for potential use with InformalAuth.  Skip if family is already loaded.
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 3fa8eadd..6928a63d 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3872,6 +3872,7 @@ private static function ajaxInvJoin(): void
 		try {
 			$stats = Stats::instance();
 			$stats->involvementJoins += count($data->success);
+			$stats->updateDb();
 		} catch (Exception) {}
 
 		echo json_encode(['success' => $data->success]);
@@ -3975,6 +3976,7 @@ private static function ajaxContact(): void
 		try {
 			$stats = Stats::instance();
 			$stats->involvementContacts += count($data->success);
+			$stats->updateDb();
 		} catch (Exception) {}
 
 		echo json_encode(['success' => $data->success]);
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 669b7d18..df97ecf5 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -723,6 +723,7 @@ private static function ajaxSubmitRsvps(): void
 		try {
 			$stats = Stats::instance();
 			$stats->rsvps += count($data->success);
+			$stats->updateDb();
 		} catch (Exception) {}
 
 		echo json_encode(['success' => $data->success]);
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 7b0dfbb2..8182216b 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1635,6 +1635,7 @@ public static function ident($inputData): array
 		try {
 			$stats = Stats::instance();
 			$stats->softAuths += count($people);
+			$stats->updateDb();
 		} catch (Exception) {}
 
 		$ret          = [];
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index cf67e9d9..386d6e11 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -5,6 +5,7 @@
 
 namespace tp\TouchPointWP;
 
+use Exception;
 use InvalidArgumentException;
 use tp\TouchPointWP\Utilities\Http;
 
@@ -88,10 +89,10 @@ protected function __construct()
 			$this->_dirty     = true;
 		}
 
-		$sid = get_option('tp_siteId', null);
+		$sid = get_site_option('tp_siteId', null);
 		if (empty($sid)) {
 			$sid = Utilities::createGuid();
-			update_option('tp_siteId', $sid);
+			update_site_option('tp_siteId', $sid);
 		}
 		$this->siteId = $sid;
 
@@ -99,14 +100,14 @@ protected function __construct()
 	}
 
 	/**
-	 * Attempt to save on destruct.
+	 * Make sure saves have happened before the object is destroyed.
+	 *
+	 * @throws Exception
 	 */
 	protected function __destruct()
 	{
-		try {
-			$this->updateDb();
-		} catch (\Exception $e) {
-			// ignore
+		if ($this->_dirty) {
+			throw new Exception("Stats object was not saved.");
 		}
 	}
 

From ef1131b765deeda8268d09306361df3bc4267036 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 19 Nov 2024 08:51:07 -0500
Subject: [PATCH 209/423] Add setting to allow site owners to determine whether
 their site/church is using the plugin. Also i18n.

---
 i18n/TouchPoint-WP-es_ES.po                 | 496 +++++++++----------
 i18n/TouchPoint-WP.pot                      | 500 ++++++++++----------
 src/TouchPoint-WP/Stats.php                 |   3 +
 src/TouchPoint-WP/TouchPointWP.php          |   1 +
 src/TouchPoint-WP/TouchPointWP_Settings.php |  13 +
 5 files changed, 531 insertions(+), 482 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index cc7bc332..775cffb9 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:992
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -87,7 +87,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:293
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:740
+#: src/TouchPoint-WP/Meeting.php:746
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -123,13 +123,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:213
-#: src/TouchPoint-WP/Involvement.php:1854
+#: src/TouchPoint-WP/Involvement.php:1853
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:217
-#: src/TouchPoint-WP/Involvement.php:1880
+#: src/TouchPoint-WP/Involvement.php:1879
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -173,7 +173,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2101
+#: src/TouchPoint-WP/Involvement.php:2099
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -183,19 +183,19 @@ msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:141
+#: src/TouchPoint-WP/Auth.php:142
 msgid "Sign in with your %s account"
 msgstr "Inicie sesión con su cuenta de %s"
 
-#: src/TouchPoint-WP/Auth.php:409
+#: src/TouchPoint-WP/Auth.php:410
 msgid "Your login token expired."
 msgstr "Su token de inicio de sesión caducó."
 
-#: src/TouchPoint-WP/Auth.php:424
+#: src/TouchPoint-WP/Auth.php:425
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
-#: src/TouchPoint-WP/Auth.php:436
+#: src/TouchPoint-WP/Auth.php:437
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
@@ -208,47 +208,47 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:496
+#: src/TouchPoint-WP/Involvement.php:495
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:501
+#: src/TouchPoint-WP/Involvement.php:500
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:508
+#: src/TouchPoint-WP/Involvement.php:507
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:514
+#: src/TouchPoint-WP/Involvement.php:513
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1729
+#: src/TouchPoint-WP/Involvement.php:1728
 #: src/TouchPoint-WP/Partner.php:814
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1937
+#: src/TouchPoint-WP/Involvement.php:1936
 #: src/TouchPoint-WP/Partner.php:838
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3556
+#: src/TouchPoint-WP/Involvement.php:3554
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3559
+#: src/TouchPoint-WP/Involvement.php:3557
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3636
+#: src/TouchPoint-WP/Involvement.php:3634
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3705
-#: src/TouchPoint-WP/Involvement.php:3747
+#: src/TouchPoint-WP/Involvement.php:3704
+#: src/TouchPoint-WP/Involvement.php:3763
 msgid "Register"
 msgstr "Regístrate ahora"
 
@@ -276,12 +276,12 @@ msgstr "Registre su asistencia"
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3738
+#: src/TouchPoint-WP/Involvement.php:3754
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3653
+#: src/TouchPoint-WP/Involvement.php:3651
 #: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -307,503 +307,503 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:739
-#: src/TouchPoint-WP/Meeting.php:759
+#: src/TouchPoint-WP/Meeting.php:745
+#: src/TouchPoint-WP/Meeting.php:766
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:1948
+#: src/TouchPoint-WP/TouchPointWP.php:2023
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2005
+#: src/TouchPoint-WP/TouchPointWP.php:2080
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2008
+#: src/TouchPoint-WP/TouchPointWP.php:2083
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2011
+#: src/TouchPoint-WP/TouchPointWP.php:2086
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2016
-#: src/TouchPoint-WP/TouchPointWP.php:2017
+#: src/TouchPoint-WP/TouchPointWP.php:2091
+#: src/TouchPoint-WP/TouchPointWP.php:2092
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2134
-#: src/TouchPoint-WP/TouchPointWP.php:2170
+#: src/TouchPoint-WP/TouchPointWP.php:2209
+#: src/TouchPoint-WP/TouchPointWP.php:2245
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2184
-#: src/TouchPoint-WP/TouchPointWP.php:2228
+#: src/TouchPoint-WP/TouchPointWP.php:2259
+#: src/TouchPoint-WP/TouchPointWP.php:2303
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2360
+#: src/TouchPoint-WP/TouchPointWP.php:2435
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:256
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:261
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:273
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:281
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:303
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:314
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:336
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:347
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:384
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:397
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:409
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:421
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:461
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:478
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:517
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:532
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:552
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:559
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:574
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:579
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:610
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:615
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:626
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:637
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:648
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:659
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:694
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:705
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:716
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:727
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:738
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:793
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:798
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:950
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:926
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:943
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:993
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1044
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1027
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1053
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1064
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1040
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1065
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1076
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1077
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1093
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1069
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1094
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1073
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1099
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1086
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1123
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1274
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1299
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1328
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1329
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1353
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1377
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1402
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1639
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1731
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1761
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1782
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1812
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -971,7 +971,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2301
+#: src/TouchPoint-WP/TouchPointWP.php:2376
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1026,16 +1026,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1902
+#: src/TouchPoint-WP/Involvement.php:1901
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1915
+#: src/TouchPoint-WP/Involvement.php:1914
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1786
+#: src/TouchPoint-WP/Involvement.php:1785
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1153,12 +1153,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:994
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1000
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:995
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1197,23 +1197,23 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1903
+#: src/TouchPoint-WP/Involvement.php:1902
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1904
+#: src/TouchPoint-WP/Involvement.php:1903
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1945
+#: src/TouchPoint-WP/Involvement.php:1944
 #: src/TouchPoint-WP/Partner.php:854
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1948
+#: src/TouchPoint-WP/Involvement.php:1947
 #: src/TouchPoint-WP/Partner.php:857
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
@@ -1221,53 +1221,53 @@ msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
 #. Translators: %1$s is the start date, %2$s is the start time.
-#: src/TouchPoint-WP/Involvement.php:996
-#: src/TouchPoint-WP/Involvement.php:1028
-#: src/TouchPoint-WP/Involvement.php:1121
-#: src/TouchPoint-WP/Involvement.php:1145
+#: src/TouchPoint-WP/Involvement.php:995
+#: src/TouchPoint-WP/Involvement.php:1027
+#: src/TouchPoint-WP/Involvement.php:1120
+#: src/TouchPoint-WP/Involvement.php:1144
 #: src/TouchPoint-WP/Utilities/DateFormats.php:283
 #: src/TouchPoint-WP/Utilities/DateFormats.php:347
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1037
+#: src/TouchPoint-WP/Involvement.php:1036
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1046
+#: src/TouchPoint-WP/Involvement.php:1045
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1055
+#: src/TouchPoint-WP/Involvement.php:1054
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1063
+#: src/TouchPoint-WP/Involvement.php:1062
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1071
+#: src/TouchPoint-WP/Involvement.php:1070
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1079
+#: src/TouchPoint-WP/Involvement.php:1078
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3577
+#: src/TouchPoint-WP/Involvement.php:3575
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:372
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1279,39 +1279,39 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2042
+#: src/TouchPoint-WP/Involvement.php:2040
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2052
+#: src/TouchPoint-WP/Involvement.php:2050
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2071
+#: src/TouchPoint-WP/Involvement.php:2069
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:971
+#: src/TouchPoint-WP/TouchPointWP.php:1027
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
 #: src/TouchPoint-WP/Meeting.php:700
-#: src/TouchPoint-WP/TouchPointWP.php:354
+#: src/TouchPoint-WP/TouchPointWP.php:360
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
 #: src/TouchPoint-WP/Meeting.php:710
-#: src/TouchPoint-WP/TouchPointWP.php:363
+#: src/TouchPoint-WP/TouchPointWP.php:369
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3843
-#: src/TouchPoint-WP/Involvement.php:3940
+#: src/TouchPoint-WP/Involvement.php:3859
+#: src/TouchPoint-WP/Involvement.php:3962
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1376,7 +1376,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:325
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1423,11 +1423,11 @@ msgstr "Informe de TouchPoint"
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:260
+#: src/TouchPoint-WP/TouchPointWP.php:266
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1829
+#: src/TouchPoint-WP/Involvement.php:1828
 msgid "Language"
 msgstr "Idioma"
 
@@ -1444,11 +1444,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:827
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1456,44 +1456,44 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
 msgid "Meeting Deletion Handling"
 msgstr "Manejo de eliminación de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:933
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:914
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:939
 msgid "Always delete from WordPress"
 msgstr "Eliminar siempre de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:915
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3927
-#: src/TouchPoint-WP/Person.php:1827
+#: src/TouchPoint-WP/Involvement.php:3949
+#: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:522
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:360
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1501,12 +1501,12 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1682
+#: src/TouchPoint-WP/Person.php:1688
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3917
-#: src/TouchPoint-WP/Person.php:1844
+#: src/TouchPoint-WP/Involvement.php:3939
+#: src/TouchPoint-WP/Person.php:1850
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
@@ -1525,48 +1525,48 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:292
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr "Las reuniones que hayan transcurrido más de esta cantidad de días pasados se trasladarán al Archivo de eventos. Una vez que pase esta fecha, la información de la reunión ya no se actualizará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:895
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan transcurrido tantos días desde el evento."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1135
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1136
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1631,7 +1631,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3665
+#: src/TouchPoint-WP/Involvement.php:3663
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1649,39 +1649,39 @@ msgstr "Reunión en %s"
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:831
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:843
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:844
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Event"
 msgstr "Evento"
 
@@ -1710,13 +1710,13 @@ msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:137
+#: src/TouchPoint-WP/Involvement.php:136
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:999
-#: src/TouchPoint-WP/Involvement.php:1022
+#: src/TouchPoint-WP/Involvement.php:998
+#: src/TouchPoint-WP/Involvement.php:1021
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
@@ -1781,7 +1781,7 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:272
+#: src/TouchPoint-WP/CalendarGrid.php:269
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
 
@@ -1789,31 +1789,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:767
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:782
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:783
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:778
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1834,7 +1834,7 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1023
+#: src/TouchPoint-WP/Involvement.php:1022
 msgid "All Day"
 msgstr "todo el dia"
 
@@ -1842,3 +1842,19 @@ msgstr "todo el dia"
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+msgid "ipapi.co API Key"
+msgstr "Clave API de ipapi.co"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
+msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
+msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP"
+msgstr "Permitir que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio/iglesia como usuarios de TouchPoint-WP"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
+msgstr "Ayuda a otras iglesias potenciales a ver lo que se puede hacer combinando WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index e28dbddf..58dfbe9d 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.93\n"
+"Project-Id-Version: TouchPoint WP 0.0.94\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-10-10T01:55:33+00:00\n"
+"POT-Creation-Date: 2024-11-19T13:48:25+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:47
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:992
 msgid "Divisions to Import"
 msgstr ""
 
@@ -122,7 +122,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:141
 #: src/templates/admin/invKoForm.php:293
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:740
+#: src/TouchPoint-WP/Meeting.php:746
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -170,13 +170,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:213
-#: src/TouchPoint-WP/Involvement.php:1854
+#: src/TouchPoint-WP/Involvement.php:1853
 #: src/TouchPoint-WP/Taxonomies.php:744
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:217
-#: src/TouchPoint-WP/Involvement.php:1880
+#: src/TouchPoint-WP/Involvement.php:1879
 #: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Time of Day"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2101
+#: src/TouchPoint-WP/Involvement.php:2099
 msgid "No %s Found."
 msgstr ""
 
@@ -282,25 +282,25 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3577
+#: src/TouchPoint-WP/Involvement.php:3575
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:141
+#: src/TouchPoint-WP/Auth.php:142
 msgid "Sign in with your %s account"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:409
+#: src/TouchPoint-WP/Auth.php:410
 msgid "Your login token expired."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:424
+#: src/TouchPoint-WP/Auth.php:425
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:436
+#: src/TouchPoint-WP/Auth.php:437
 msgid "Session could not be validated."
 msgstr ""
 
@@ -310,7 +310,7 @@ msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:272
+#: src/TouchPoint-WP/CalendarGrid.php:269
 msgid "There are no %s published for this month."
 msgstr ""
 
@@ -323,163 +323,163 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:137
+#: src/TouchPoint-WP/Involvement.php:136
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:496
+#: src/TouchPoint-WP/Involvement.php:495
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:501
+#: src/TouchPoint-WP/Involvement.php:500
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:508
+#: src/TouchPoint-WP/Involvement.php:507
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:514
+#: src/TouchPoint-WP/Involvement.php:513
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
 #. Translators: %1$s is the start date, %2$s is the start time.
-#: src/TouchPoint-WP/Involvement.php:996
-#: src/TouchPoint-WP/Involvement.php:1028
-#: src/TouchPoint-WP/Involvement.php:1121
-#: src/TouchPoint-WP/Involvement.php:1145
+#: src/TouchPoint-WP/Involvement.php:995
+#: src/TouchPoint-WP/Involvement.php:1027
+#: src/TouchPoint-WP/Involvement.php:1120
+#: src/TouchPoint-WP/Involvement.php:1144
 #: src/TouchPoint-WP/Utilities/DateFormats.php:283
 #: src/TouchPoint-WP/Utilities/DateFormats.php:347
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:999
-#: src/TouchPoint-WP/Involvement.php:1022
+#: src/TouchPoint-WP/Involvement.php:998
+#: src/TouchPoint-WP/Involvement.php:1021
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1023
+#: src/TouchPoint-WP/Involvement.php:1022
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1037
+#: src/TouchPoint-WP/Involvement.php:1036
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1046
+#: src/TouchPoint-WP/Involvement.php:1045
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1055
+#: src/TouchPoint-WP/Involvement.php:1054
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1063
+#: src/TouchPoint-WP/Involvement.php:1062
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1071
+#: src/TouchPoint-WP/Involvement.php:1070
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1079
+#: src/TouchPoint-WP/Involvement.php:1078
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1729
+#: src/TouchPoint-WP/Involvement.php:1728
 #: src/TouchPoint-WP/Partner.php:814
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1786
+#: src/TouchPoint-WP/Involvement.php:1785
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1829
+#: src/TouchPoint-WP/Involvement.php:1828
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1902
+#: src/TouchPoint-WP/Involvement.php:1901
 #: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1903
+#: src/TouchPoint-WP/Involvement.php:1902
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1904
+#: src/TouchPoint-WP/Involvement.php:1903
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1915
+#: src/TouchPoint-WP/Involvement.php:1914
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1937
+#: src/TouchPoint-WP/Involvement.php:1936
 #: src/TouchPoint-WP/Partner.php:838
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1945
+#: src/TouchPoint-WP/Involvement.php:1944
 #: src/TouchPoint-WP/Partner.php:854
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1948
+#: src/TouchPoint-WP/Involvement.php:1947
 #: src/TouchPoint-WP/Partner.php:857
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2042
+#: src/TouchPoint-WP/Involvement.php:2040
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2052
+#: src/TouchPoint-WP/Involvement.php:2050
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2071
+#: src/TouchPoint-WP/Involvement.php:2069
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3556
+#: src/TouchPoint-WP/Involvement.php:3554
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3559
+#: src/TouchPoint-WP/Involvement.php:3557
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3636
+#: src/TouchPoint-WP/Involvement.php:3634
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3653
+#: src/TouchPoint-WP/Involvement.php:3651
 #: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3665
+#: src/TouchPoint-WP/Involvement.php:3663
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3705
-#: src/TouchPoint-WP/Involvement.php:3747
+#: src/TouchPoint-WP/Involvement.php:3704
+#: src/TouchPoint-WP/Involvement.php:3763
 msgid "Register"
 msgstr ""
 
@@ -507,23 +507,23 @@ msgstr ""
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3738
+#: src/TouchPoint-WP/Involvement.php:3754
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3843
-#: src/TouchPoint-WP/Involvement.php:3940
+#: src/TouchPoint-WP/Involvement.php:3859
+#: src/TouchPoint-WP/Involvement.php:3962
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3917
-#: src/TouchPoint-WP/Person.php:1844
+#: src/TouchPoint-WP/Involvement.php:3939
+#: src/TouchPoint-WP/Person.php:1850
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3927
-#: src/TouchPoint-WP/Person.php:1827
+#: src/TouchPoint-WP/Involvement.php:3949
+#: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -559,22 +559,22 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:971
+#: src/TouchPoint-WP/TouchPointWP.php:1027
 msgid "Only GET requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:700
-#: src/TouchPoint-WP/TouchPointWP.php:354
+#: src/TouchPoint-WP/TouchPointWP.php:360
 msgid "Only POST requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:710
-#: src/TouchPoint-WP/TouchPointWP.php:363
+#: src/TouchPoint-WP/TouchPointWP.php:369
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:739
-#: src/TouchPoint-WP/Meeting.php:759
+#: src/TouchPoint-WP/Meeting.php:745
+#: src/TouchPoint-WP/Meeting.php:766
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1682
+#: src/TouchPoint-WP/Person.php:1688
 msgid "You may need to sign in."
 msgstr ""
 
@@ -728,679 +728,695 @@ msgstr ""
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:260
+#: src/TouchPoint-WP/TouchPointWP.php:266
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:1948
+#: src/TouchPoint-WP/TouchPointWP.php:2023
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2005
+#: src/TouchPoint-WP/TouchPointWP.php:2080
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2008
+#: src/TouchPoint-WP/TouchPointWP.php:2083
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2011
+#: src/TouchPoint-WP/TouchPointWP.php:2086
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2016
-#: src/TouchPoint-WP/TouchPointWP.php:2017
+#: src/TouchPoint-WP/TouchPointWP.php:2091
+#: src/TouchPoint-WP/TouchPointWP.php:2092
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2134
-#: src/TouchPoint-WP/TouchPointWP.php:2170
+#: src/TouchPoint-WP/TouchPointWP.php:2209
+#: src/TouchPoint-WP/TouchPointWP.php:2245
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2184
-#: src/TouchPoint-WP/TouchPointWP.php:2228
+#: src/TouchPoint-WP/TouchPointWP.php:2259
+#: src/TouchPoint-WP/TouchPointWP.php:2303
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2301
+#: src/TouchPoint-WP/TouchPointWP.php:2376
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2360
+#: src/TouchPoint-WP/TouchPointWP.php:2435
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:255
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:256
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:260
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:261
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:272
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:273
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:280
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:281
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:291
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:292
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:302
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:303
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:313
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:314
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:324
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:325
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:335
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:336
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:346
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:347
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:359
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:360
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:371
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:372
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:383
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:384
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:396
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:397
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:408
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:409
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:420
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:421
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:439
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+msgid "ipapi.co API Key"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
+msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:442
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:443
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:460
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:461
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:465
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:477
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:478
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:488
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:499
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:737
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:500
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:516
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:517
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:521
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:522
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:531
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:532
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:551
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:552
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:558
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:559
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:573
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:574
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:579
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:610
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:614
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:615
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:625
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:626
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:636
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:637
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:647
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:648
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:658
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:659
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:693
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:694
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:704
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:705
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:716
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:727
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:738
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:749
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:767
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:771
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:777
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:778
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:782
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:783
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:793
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:798
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:814
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:826
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:827
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:831
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:832
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:843
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:844
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:882
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:895
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
 msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
 msgid "Meeting Deletion Handling"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:908
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:933
 msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:914
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:939
 msgid "Always delete from WordPress"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:915
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
 msgid "Mark the occurrence as cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:925
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:950
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:926
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:930
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:931
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:943
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:993
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1135
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:994
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1000
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:995
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1044
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1027
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1028
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1053
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1064
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1040
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1065
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1076
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1077
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1068
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1093
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1069
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1094
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1073
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1074
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1099
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1086
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1123
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1136
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1274
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1299
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1328
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1329
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1353
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1377
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1402
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1609
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1639
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1731
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1761
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1782
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1812
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 386d6e11..f6380b84 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -177,6 +177,8 @@ public function getStatsForSubmission(): array
 	{
 		$data = $this->jsonSerialize();
 
+		$sets = TouchPointWP::instance()->settings;
+
 		$data['site'] = get_site_url();
 		$data['plugin'] = 'TouchPointWP';
 		$data['version'] = TouchPointWP::VERSION;
@@ -186,6 +188,7 @@ public function getStatsForSubmission(): array
 		$data['wpTimezone'] = get_option('timezone_string');
 		$data['adminEmail'] = get_option('admin_email');
 		$data['siteName'] = get_bloginfo('name');
+		$data['listPublicly'] = $sets->enable_public_listing === 'on';
 		$data['installId'] = $this->installId;
 		$data['privateKey'] = $this->privateKey;
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index e203be6d..c9ab56aa 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -673,6 +673,7 @@ protected function createTables(): void
 				createdDT datetime DEFAULT NOW(),
 				updatedDT datetime DEFAULT NOW() ON UPDATE NOW(),
 				
+				listPublicly tinyint(1) DEFAULT 1,
 				lastQueryDT datetime DEFAULT NULL,
 				lastQueryStatus int(3) DEFAULT NULL,
 				
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index b57b1eae..54ea88e1 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -33,6 +33,8 @@
  * @property-read string       google_geo_api_key Google Maps API Key for geocoding
  * @property-read string       ipapi_key          The API key for ipapi.co for geolocation.
  *
+ * @property-read string 	   enable_public_listing Whether to allow the site to be listed as using TouchPoint-WP
+ *
  * @property-read array        people_contact_keywords Keywords to use for the generic Contact person button.
  * @property-read string       people_ev_bio      Extra Value field that should be imported as a User bio.
  * @property-read string       people_ev_wpId     The name of the extra value field where the WordPress User ID will be stored.
@@ -438,6 +440,17 @@ private function settingsFields(bool|string $includeDetail = false): array
 					'default'     => '',
 					'placeholder' => '',
 				],
+				[
+					'id'          => 'enable_public_listing',
+					'label'       => __('Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP', 'TouchPoint-WP'),
+					'description' => __(
+						"Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet.",
+						'TouchPoint-WP'
+					),
+					'type'        => 'checkbox',
+					'default'     => 'on',
+					'autoload'    => false,
+				],
 			],
 		];
 

From bcdb84bda0c007ad236bb32fd7495fadee28f71c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 19 Nov 2024 08:56:20 -0500
Subject: [PATCH 210/423] make list publicly an int

---
 src/TouchPoint-WP/Stats.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index f6380b84..4f88dfd5 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -188,7 +188,7 @@ public function getStatsForSubmission(): array
 		$data['wpTimezone'] = get_option('timezone_string');
 		$data['adminEmail'] = get_option('admin_email');
 		$data['siteName'] = get_bloginfo('name');
-		$data['listPublicly'] = $sets->enable_public_listing === 'on';
+		$data['listPublicly'] = 1 * ($sets->enable_public_listing === 'on');
 		$data['installId'] = $this->installId;
 		$data['privateKey'] = $this->privateKey;
 

From 3ec316545d76aea373088b197c8fe4e4c77a7924 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 19 Nov 2024 10:54:23 -0500
Subject: [PATCH 211/423] Fix a semantic error with jsonSerialize

---
 src/TouchPoint-WP/Stats.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 4f88dfd5..a3e41c21 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -220,7 +220,7 @@ protected function submitStats(): void
 	 *
 	 * @inheritDoc
 	 */
-	public function jsonSerialize()
+	public function jsonSerialize(): array
 	{
 		$r = [];
 

From 7aa24949b5c463736211ee54ea7966b6c822ddce Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 19 Nov 2024 10:54:37 -0500
Subject: [PATCH 212/423] Updating readme about Events and stats

---
 README.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index edada27e..b2427661 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,11 @@ If you're a developer looking to leverage this for a church, you're welcome to b
 [Small Groups Example.](https://www.tenth.org/smallgroups)
 [Classes Example.](https://www.tenth.org/abs)
 
+### Event Calendar
+Automatically sync meetings from TouchPoint to your WordPress site, with details and images imported from their
+involvements. 
+[Example.](https://www.tenth.org/events)
+
 ### Crazy-Simple RSVP interface
 Let folks RSVP for an event for each member in their family in just a few clicks.
 No login required, just an email address and zip code.
@@ -33,19 +38,20 @@ Show your Staff members, Elders, or other collections of people, automatically k
 ### Embedded Reports
 Any SQL or Python report generated in TouchPoint can be embedded into your website and automatically updated.  For example,
 we have a financial update chart that is automatically updated to reflect giving. 
+[Example (the bar graph on this page).](https://www.tenth.org/give)
 
 ### Outreach Partners
 Automatically import partner bios and info from TouchPoint for display on your public website, with 
 appropriate care for their security.
 [Example.](https://www.tenth.org/outreach/partners)
 
-### Events
-Improve display of events in the TouchPoint Custom Mobile App by providing content from [The Events Calendar Plugin by
-Modern Tribe](https://theeventscalendar.com/).  This is compatible with both the free and "Pro" versions.
-
 ### Authentication (Beta)
 Authenticate TouchPoint users to WordPress, so you can know your website users. 
 
+### Old App Calendar (Deprecated)
+Improve display of events in the TouchPoint Custom Mobile App by providing content from [The Events Calendar Plugin by
+Modern Tribe](https://theeventscalendar.com/).  This is compatible with both the free and "Pro" versions.
+
 ## Costs & Considerations
 
 **This plugin is FREE!**  We developed this plugin for us, but want to share it with any other churches that would
@@ -65,12 +71,16 @@ If you're not sure whether WordPress is the right tool for you, feel free to get
 relationships with several firms who could help with the setup and technical maintenance if you're interested.  But,
 it's probably not the right tool for every church.
 
+We do collect some basic usage data when you use this plugin, including the admin email address configured in WordPress,
+the site address, and the name of the site. We use this data to understand how the plugin is being used and to improve 
+it.  You can choose in the plugin settings whether to allow us to list your site publicly as a reference, including some
+basic anonymous statistics such as the number of involvements you have synced or the number of people who have RSVPed to
+meetings through the plugin. 
+
 ## Future Features
 - Authenticate
     - Track viewership of webpages and web resources non-anonymously.  (Know who attended your virtual worship service.)
     - Sync WordPress Permissions with TouchPoint involvements or roles.
-- Events
-    - Sync TouchPoint Meetings with events on your public web calendar.
 - Small Groups
     - Suggest demographically-targeted small groups.
 - Integrated Directory

From 701eb35bc846cb97880d33972e59d09673ad75c7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 20 Nov 2024 22:51:04 -0500
Subject: [PATCH 213/423] Cron to submit stats.  Theoretically closes #209

---
 src/TouchPoint-WP/Stats.php        | 66 +++++++++++++++++++++++++++++-
 src/TouchPoint-WP/TouchPointWP.php |  8 ++++
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index a3e41c21..d118f882 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -30,8 +30,10 @@
  * @property int $userAuths
  * @property int $softAuths
  */
-class Stats implements api, \JsonSerializable
+class Stats implements api, \JsonSerializable, updatesViaCron
 {
+	public const CRON_HOOK = TouchPointWP::HOOK_PREFIX . 'stats_submit';
+
 	protected static ?self $instance = null;
 
 	private bool $_dirty = false;
@@ -111,6 +113,68 @@ protected function __destruct()
 		}
 	}
 
+	/**
+	 * Loads the module and initializes the other actions.
+	 *
+	 * @return bool
+	 */
+	public static function load(): bool
+	{
+		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']);
+
+		//////////////////
+		/// Shortcodes ///
+		//////////////////
+
+
+		///////////////
+		/// Syncing ///
+		///////////////
+
+		// Setup cron for calling home weekly.
+		add_action(self::CRON_HOOK, [self::class, 'updateCron']);
+		if ( ! wp_next_scheduled(self::CRON_HOOK)) {
+			// Runs at 4am EST (9am UTC)
+			wp_schedule_event(
+				date('U', strtotime('tomorrow') + 3600 * 9),
+				'weekly',
+				self::CRON_HOOK
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Call home, triggered by migration.
+	 *
+	 * @return void
+	 */
+	public static function migrate(): void
+	{
+		self::instance()->submitStats();
+	}
+
+	/**
+	 * Call home, triggered by cron.
+	 *
+	 * @return void
+	 */
+	public static function updateCron(): void
+	{
+		self::instance()->submitStats();
+	}
+
+	/**
+	 * Check to see if a cron run is needed, and run it if so.  Connected to an init function.
+	 *
+	 * @return void
+	 */
+	public static function checkUpdates()
+	{
+		// This method does nothing because the overhead is relatively great, and should not be hooked to every page load.
+	}
+
 	/**
 	 * Save the stats to the database.
 	 *
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index c9ab56aa..d5ad9e9f 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -731,6 +731,8 @@ public static function load($file): TouchPointWP
 			}
 		}
 
+		Stats::load();
+
 		// Load Auth tool if enabled.
 		if ($instance->settings->enable_authentication === "on") {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
@@ -1344,6 +1346,8 @@ public function activation(): void
 		self::queueFlushRewriteRules();
 
 		$this->migrate(true);
+
+		Stats::migrate();
 	}
 
 	/**
@@ -1353,6 +1357,8 @@ public function deactivation(): void
 	{
 		$this->logVersion();
 
+		Stats::migrate();
+
 		self::clearScheduledHooks();
 
 		self::flushRewriteRules();
@@ -1367,6 +1373,8 @@ public static function uninstall(): void
 		// TODO remove all taxonomies (maybe)
 		// TODO remove all posts
 
+		Stats::migrate();
+
 		self::clearScheduledHooks();
 
 		self::dropTables();

From e9a5ee56c61e5521efcf56b03c39ec37e6ea83a0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 21 Nov 2024 19:02:57 -0500
Subject: [PATCH 214/423] Correct missing references

---
 src/TouchPoint-WP/Stats.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index d118f882..ad7202fe 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -15,6 +15,7 @@
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "api.php";
+	require_once "updatesViaCron.php";
 }
 
 /**
@@ -120,8 +121,6 @@ protected function __destruct()
 	 */
 	public static function load(): bool
 	{
-		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']);
-
 		//////////////////
 		/// Shortcodes ///
 		//////////////////

From c8c3d8ab54061eb2b3a7cbc3815d4673420bb467 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 21 Nov 2024 20:00:17 -0500
Subject: [PATCH 215/423] Add ability to limit involvement import to a given
 campus.  Closes #208

---
 src/TouchPoint-WP/Involvement.php             |  2 +
 .../Involvement_PostTypeSettings.php          |  2 +
 src/TouchPoint-WP/Taxonomies.php              |  8 +++-
 src/TouchPoint-WP/TouchPointWP.php            |  4 --
 src/python/WebApi.py                          |  8 +++-
 src/templates/admin/invKoForm.php             | 41 ++++++++++++++++++-
 6 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 6928a63d..7d1b242c 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2490,6 +2490,8 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		}
 
 		try {
+			$qOpts['camps'] = Utilities::idArrayToIntArray($typeSets->importCampuses, false);
+
 			if ($typeSets->postType === Meeting::POST_TYPE) {
 				$qOpts['featMtgs'] = 1;
 				$qOpts['exDivs'] = Utilities::idArrayToIntArray(Involvement_PostTypeSettings::getAllDivs(), false);
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index 480b0b84..1c3aa0cf 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -19,6 +19,7 @@
  * @property-read string   $namePlural
  * @property-read string   $slug
  * @property-read string[] $importDivs
+ * @property-read string[] $importCampuses
  * @property-read bool     $useImages
  * @property-read bool     $useGeo
  * @property-read bool     $hierarchical
@@ -43,6 +44,7 @@ class Involvement_PostTypeSettings
 	protected string $namePlural;
 	protected string $slug;
 	protected array $importDivs = [];
+	protected array $importCampuses = [];
 	protected bool $useImages = false;
 	protected bool $useGeo = false;
 	protected bool $hierarchical = false;
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 12f79cd2..a0569bc5 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -281,8 +281,14 @@ public static function insertTerms($instance = null): void
 		// Campuses
 		$types = self::getPostTypesForTaxonomy($instance, self::TAX_CAMPUS);
 		if (count($types) > 0) {
+			if ($instance->settings->enable_campuses == "on") {
+				$campuses = $instance->getCampuses();
+			} else {
+				$campuses = [];
+			}
+
 			self::insertTermsForLookupBasedTaxonomy(
-				$instance->getCampuses(),
+				$campuses,
 				self::TAX_CAMPUS,
 				self::$forceTermLookupIdUpdate
 			);
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index d5ad9e9f..e00a1ed8 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1689,10 +1689,6 @@ public function getResCodes(): array
 	 */
 	public function getCampuses(): array
 	{
-		if ($this->settings->enable_campuses !== "on") {
-			return [];
-		}
-
 		$cObj = $this->settings->get('meta_campuses');
 
 		$needsUpdate = false;
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index c7fcae1d..a0824092 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -193,10 +193,14 @@ def get_person_info_for_sync(person_obj):
     regex = re.compile('[^0-9,]')
     divs = regex.sub('', Data.divs)
     exDivs = regex.sub('', Data.exDivs)
+    camps = regex.sub('', Data.camps)
+
     if (len(divs)) < 1:
         divs = '0'
     if (len(exDivs)) < 1:
         exDivs = '-1'
+    if (len(camps)) < 1:
+        camps = '-1'
 
     mtgHist = -int(Data.mtgHist) if Data.mtgHist != "" else 0
     mtgFuture = int(Data.mtgFuture) if Data.mtgFuture != "" else 365
@@ -226,6 +230,7 @@ def get_person_info_for_sync(person_obj):
                 LEFT JOIN Organizations o3 ON o2.ParentOrgId = o3.OrganizationId
             WHERE m.OrganizationId = o.OrganizationId
                 AND o.ShowInSites = {2}
+                AND (o.CampusId IN ({6}) OR -1 IN ({6}) OR (o.CampusId IS NULL AND 0 IN ({6})))
                 AND m.MeetingDate > DATEADD(day, {3}, GETDATE())
                 AND m.MeetingDate < DATEADD(day, {4}, GETDATE())
             GROUP BY m.OrganizationId, o2.OrganizationId, o3.OrganizationId, o3.ParentOrgId
@@ -463,7 +468,7 @@ def get_person_info_for_sync(person_obj):
             LEFT JOIN lookup.Campus c
                 ON o.CampusId = c.Id
         ORDER BY o.parentInvId ASC, o.OrganizationId ASC''').
-              format(divs, hostMemTypes, featMtgs, mtgHist, mtgFuture, exDivs))
+              format(divs, hostMemTypes, featMtgs, mtgHist, mtgFuture, exDivs, camps))
 
     groups = model.SqlListDynamicData(invSql)
 
@@ -1143,6 +1148,7 @@ def get_person_info_for_sync(person_obj):
 
         # noinspection SqlResolve,SqlConstantCondition,SqlConstantExpression
         sqlReportsQ = 'SELECT Id, Name, Body, TypeId FROM Content WHERE 1=0'
+        # noinspection SqlResolve,SqlConstantCondition,SqlConstantExpression
         pyReportsQ = 'SELECT Id, Name, Body, TypeId FROM Content WHERE 1=0'
         sqlPs = {}
         pyPs = {}
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 5ed1be59..9e46d491 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -5,8 +5,9 @@
 
 $divs = json_encode($this->parent->getDivisions());
 $kws = json_encode($this->parent->getKeywords());
+$camps = json_encode($this->parent->getCampuses());
 /** @noinspection CommaExpressionJS */
-echo "<script type=\"text/javascript\">tpvm._vmContext = {divs: $divs, kws: $kws }</script>";
+echo "<script type=\"text/javascript\">tpvm._vmContext = {divs: $divs, kws: $kws, campuses: $camps }</script>";
 ?>
 <form>
 <div data-bind="foreach: invTypes, visible: invTypes().length > 0" style="display:none;">
@@ -55,6 +56,29 @@
             </td>
         </tr>
 
+        <tr>
+            <th><?php _e("Import Campuses", "TouchPoint-WP"); ?></th>
+            <td colspan="2">
+                <!-- ko if: $root.campuses.length < 1 -->
+                <p><?php _e("Loading...", "TouchPoint-WP"); ?></p>
+                <!-- /ko -->
+                <p>
+                    <input id="it-campus-all" type="checkbox" data-bind="checked: $data._importCampusesAll, attr: {id: 'it-' + $data.slug() + '-campus-all'}" />
+                    <label for="it-campus-all" data-bind="attr: {for: 'it-' + $data.slug() + '-campus-all'}"><?php _e("All Campuses", "TouchPoint-WP"); ?></label>
+                </p>
+                <p>
+                    <input id="it-campus-no" type="checkbox" value="c0" data-bind="checked: $data.importCampuses, attr: {id: 'it-' + $data.slug() + '-campus-no'}" />
+                    <label for="it-campus-no" data-bind="attr: {for: 'it-' + $data.slug() + '-campus-no'}"><?php _e("(No Campus)", "TouchPoint-WP"); ?></label>
+                </p>
+                <!-- ko foreach: $root.campuses -->
+                <p>
+                    <input id="it-campus" type="checkbox" data-bind="value: 'c' + id, checked: $parent.importCampuses, attr: {id: 'it-' + $parent.slug() + '-campus-' + id}" />
+                    <label for="it-campus" data-bind="text: $data.name, attr: {for: 'it-' + $parent.slug() + '-campus-' + id}"></label>
+                </p>
+                <!-- /ko -->
+            </td>
+        </tr>
+
         <tr>
             <th>
                 <label for="it-hierarchical" data-bind="attr: { for: 'it-' + slug() + '-hierarchical'}"><?php _e("Import Hierarchically (Parent-Child Relationships)", "TouchPoint-WP"); ?></label>
@@ -272,6 +296,7 @@ function InvType(data) {
         this.namePlural = ko.observable(data.namePlural ?? "<?php _e("Small Groups", "TouchPoint-WP"); ?>");
         this.slug = ko.observable(data.slug ?? "smallgroup").extend({slug: 0});
         this.importDivs = ko.observable(data.importDivs ?? []);
+        this.importCampuses = ko.observable(data.importCampuses ?? []);
         this.useGeo = ko.observable(data.useGeo ?? false);
         this.useImages = ko.observable(data.useImages ?? true);
         this.excludeIf = ko.observable(data.excludeIf ?? []);
@@ -302,6 +327,19 @@ function InvType(data) {
             }
         })
 
+        this._importCampusesAll = ko.pureComputed({
+            read: function() {
+                return self.importCampuses().length === 0;
+            },
+            write: function(value) {
+                if (value) {
+                    self.importCampuses([]);
+                } else if (self.importCampuses().length === 0) {
+                    self.importCampuses(['c0']);
+                }
+            }
+        });
+
         // operations
         this.toggleVisibility = function() {
             self._visible(! self._visible())
@@ -321,6 +359,7 @@ function InvTypeVM(invData) {
         self.invTypes = ko.observableArray(invInits);
         self.divisions = tpvm._vmContext.divs;
         self.keywords = tpvm._vmContext.kws;
+        self.campuses = tpvm._vmContext.campuses;
 
         // Operations
         self.addInvType = function() {

From 38e79b50cf771ccb5d2625a56e02db079f698bd4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 21 Nov 2024 20:13:36 -0500
Subject: [PATCH 216/423] Automatically update private key periodically.

---
 src/TouchPoint-WP/Stats.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index ad7202fe..24a9cbb9 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -161,7 +161,9 @@ public static function migrate(): void
 	 */
 	public static function updateCron(): void
 	{
-		self::instance()->submitStats();
+		$i = self::instance();
+		$i->replacePrivateKey();
+		$i->submitStats();
 	}
 
 	/**
@@ -297,6 +299,18 @@ public function jsonSerialize(): array
 		return $r;
 	}
 
+	/**
+	 * Replace the private key with a new one.  Should be done periodically.
+	 *
+	 * @return void
+	 */
+	protected function replacePrivateKey(): void
+	{
+		$this->privateKey = Utilities::createGuid();
+		$this->_dirty = true;
+		$this->updateDb();
+	}
+
 	/**
 	 * Update the stats that are determined from queries.
 	 *

From 99362cd14d428b48f6f09b72686d9ecb6b6ac321 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 21 Nov 2024 20:14:55 -0500
Subject: [PATCH 217/423] Version bump and translation updates

---
 composer.json                               |   2 +-
 docs                                        |   2 +-
 i18n/TouchPoint-WP-es_ES.po                 | 207 +++++++++---------
 i18n/TouchPoint-WP.pot                      | 225 ++++++++++----------
 package.json                                |   2 +-
 src/TouchPoint-WP/TouchPointWP.php          |   2 +-
 src/TouchPoint-WP/Utilities/DateFormats.php |   6 +-
 src/python/WebApi.py                        |   2 +-
 touchpoint-wp.php                           |   2 +-
 9 files changed, 236 insertions(+), 214 deletions(-)

diff --git a/composer.json b/composer.json
index 42c30436..cc55b172 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/docs b/docs
index 5a910bf2..e53d723f 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 5a910bf25a4c0f33996ed097f8f3bc5d09a9ea3a
+Subproject commit e53d723f44bfc397d48a2707d8a9d2567762ff56
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 775cffb9..7cd03594 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -36,56 +36,57 @@ msgstr "James K"
 msgid "https://github.com/jkrrv"
 msgstr "https://github.com/jkrrv"
 
-#: src/templates/admin/invKoForm.php:17
+#: src/templates/admin/invKoForm.php:18
 #: src/templates/admin/locationsKoForm.php:13
 #: src/templates/admin/locationsKoForm.php:58
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/templates/admin/invKoForm.php:23
+#: src/templates/admin/invKoForm.php:24
 msgid "Singular Name"
 msgstr "Nombre singular"
 
-#: src/templates/admin/invKoForm.php:31
+#: src/templates/admin/invKoForm.php:32
 msgid "Plural Name"
 msgstr "Nombre Plural"
 
-#: src/templates/admin/invKoForm.php:39
+#: src/templates/admin/invKoForm.php:40
 msgid "Slug"
 msgstr "Slug"
 
-#: src/templates/admin/invKoForm.php:47
+#: src/templates/admin/invKoForm.php:48
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:992
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
-#: src/templates/admin/invKoForm.php:60
+#: src/templates/admin/invKoForm.php:84
 msgid "Import Hierarchically (Parent-Child Relationships)"
 msgstr "Importar jerárquicamente (relaciones padre-hijo)"
 
-#: src/templates/admin/invKoForm.php:86
+#: src/templates/admin/invKoForm.php:110
 msgid "Use Geographic Location"
 msgstr "Usar ubicación geográfica"
 
-#: src/templates/admin/invKoForm.php:92
+#: src/templates/admin/invKoForm.php:116
 msgid "Exclude Involvements if"
 msgstr "Excluir participaciones si"
 
-#: src/templates/admin/invKoForm.php:96
+#: src/templates/admin/invKoForm.php:120
 msgid "Involvement is Closed"
 msgstr "La participación está cerrada"
 
-#: src/templates/admin/invKoForm.php:100
+#: src/templates/admin/invKoForm.php:124
 msgid "Involvement is a Child Involvement"
 msgstr "La participación es una participación infantil"
 
-#: src/templates/admin/invKoForm.php:122
+#: src/templates/admin/invKoForm.php:146
 msgid "Leader Member Types"
 msgstr "Tipos de miembros de líder"
 
-#: src/templates/admin/invKoForm.php:125
-#: src/templates/admin/invKoForm.php:141
-#: src/templates/admin/invKoForm.php:293
+#: src/templates/admin/invKoForm.php:63
+#: src/templates/admin/invKoForm.php:149
+#: src/templates/admin/invKoForm.php:165
+#: src/templates/admin/invKoForm.php:318
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Meeting.php:746
 #: src/TouchPoint-WP/Rsvp.php:75
@@ -94,80 +95,80 @@ msgstr "Tipos de miembros de líder"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/templates/admin/invKoForm.php:137
+#: src/templates/admin/invKoForm.php:161
 msgid "Host Member Types"
 msgstr "Tipos de miembros anfitriones"
 
-#: src/templates/admin/invKoForm.php:153
+#: src/templates/admin/invKoForm.php:177
 msgid "Default Grouping"
 msgstr "Agrupación Predeterminada"
 
-#: src/templates/admin/invKoForm.php:157
+#: src/templates/admin/invKoForm.php:181
 msgid "No Grouping"
 msgstr "Sin agrupar"
 
-#: src/templates/admin/invKoForm.php:158
+#: src/templates/admin/invKoForm.php:182
 msgid "Upcoming / Current"
 msgstr "Próximo / Actual"
 
-#: src/templates/admin/invKoForm.php:159
+#: src/templates/admin/invKoForm.php:183
 msgid "Current / Upcoming"
 msgstr "Actual / Próximo"
 
-#: src/templates/admin/invKoForm.php:167
+#: src/templates/admin/invKoForm.php:191
 msgid "Default Filters"
 msgstr "Filtros predeterminados"
 
-#: src/templates/admin/invKoForm.php:199
+#: src/templates/admin/invKoForm.php:223
 msgid "Gender"
 msgstr "Género"
 
-#: src/templates/admin/invKoForm.php:213
+#: src/templates/admin/invKoForm.php:237
 #: src/TouchPoint-WP/Involvement.php:1853
-#: src/TouchPoint-WP/Taxonomies.php:744
+#: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr "Día laborable"
 
-#: src/templates/admin/invKoForm.php:217
+#: src/templates/admin/invKoForm.php:241
 #: src/TouchPoint-WP/Involvement.php:1879
-#: src/TouchPoint-WP/Taxonomies.php:802
+#: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr "Hora del día"
 
-#: src/templates/admin/invKoForm.php:221
+#: src/templates/admin/invKoForm.php:245
 msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
-#: src/templates/admin/invKoForm.php:225
-#: src/TouchPoint-WP/Taxonomies.php:831
+#: src/templates/admin/invKoForm.php:249
+#: src/TouchPoint-WP/Taxonomies.php:837
 msgid "Age Group"
 msgstr "Grupo de edad"
 
-#: src/templates/admin/invKoForm.php:230
+#: src/templates/admin/invKoForm.php:254
 msgid "Task Owner"
 msgstr "Propietario de la tarea"
 
-#: src/templates/admin/invKoForm.php:237
+#: src/templates/admin/invKoForm.php:261
 msgid "Contact Leader Task Keywords"
 msgstr "Palabras clave de la tarea del líder de contacto"
 
-#: src/templates/admin/invKoForm.php:248
+#: src/templates/admin/invKoForm.php:272
 msgid "Join Task Keywords"
 msgstr "Unirse a las palabras clave de la tarea"
 
-#: src/templates/admin/invKoForm.php:264
+#: src/templates/admin/invKoForm.php:288
 msgid "Add Involvement Post Type"
 msgstr "Agregar tipo de publicación de participación"
 
-#: src/templates/admin/invKoForm.php:271
+#: src/templates/admin/invKoForm.php:295
 msgid "Small Group"
 msgstr "Grupo Pequeño"
 
-#: src/templates/admin/invKoForm.php:272
+#: src/templates/admin/invKoForm.php:296
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:403
+#: src/templates/admin/invKoForm.php:442
 msgid "Select..."
 msgstr "Seleccione..."
 
@@ -235,53 +236,53 @@ msgstr "Cualquier"
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3554
+#: src/TouchPoint-WP/Involvement.php:3556
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3557
+#: src/TouchPoint-WP/Involvement.php:3559
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3634
+#: src/TouchPoint-WP/Involvement.php:3636
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3704
-#: src/TouchPoint-WP/Involvement.php:3763
+#: src/TouchPoint-WP/Involvement.php:3706
+#: src/TouchPoint-WP/Involvement.php:3765
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3710
+#: src/TouchPoint-WP/Involvement.php:3712
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3714
+#: src/TouchPoint-WP/Involvement.php:3716
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3719
+#: src/TouchPoint-WP/Involvement.php:3721
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3722
+#: src/TouchPoint-WP/Involvement.php:3724
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3725
+#: src/TouchPoint-WP/Involvement.php:3727
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3728
+#: src/TouchPoint-WP/Involvement.php:3730
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3754
+#: src/TouchPoint-WP/Involvement.php:3756
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3651
+#: src/TouchPoint-WP/Involvement.php:3653
 #: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -313,38 +314,38 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2023
+#: src/TouchPoint-WP/TouchPointWP.php:2027
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2080
+#: src/TouchPoint-WP/TouchPointWP.php:2084
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2083
+#: src/TouchPoint-WP/TouchPointWP.php:2087
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2086
+#: src/TouchPoint-WP/TouchPointWP.php:2090
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2091
-#: src/TouchPoint-WP/TouchPointWP.php:2092
+#: src/TouchPoint-WP/TouchPointWP.php:2095
+#: src/TouchPoint-WP/TouchPointWP.php:2096
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2209
-#: src/TouchPoint-WP/TouchPointWP.php:2245
+#: src/TouchPoint-WP/TouchPointWP.php:2213
+#: src/TouchPoint-WP/TouchPointWP.php:2249
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2259
-#: src/TouchPoint-WP/TouchPointWP.php:2303
+#: src/TouchPoint-WP/TouchPointWP.php:2263
+#: src/TouchPoint-WP/TouchPointWP.php:2307
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2435
+#: src/TouchPoint-WP/TouchPointWP.php:2439
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -971,7 +972,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2376
+#: src/TouchPoint-WP/TouchPointWP.php:2380
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1027,7 +1028,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: src/TouchPoint-WP/Involvement.php:1901
-#: src/TouchPoint-WP/Taxonomies.php:863
+#: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr "Estado civil"
 
@@ -1109,15 +1110,15 @@ msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/templates/admin/invKoForm.php:104
+#: src/templates/admin/invKoForm.php:128
 msgid "Based on Involvement setting in TouchPoint"
 msgstr "Basado en la configuración de participación en TouchPoint"
 
-#: src/templates/admin/invKoForm.php:104
+#: src/templates/admin/invKoForm.php:128
 msgid "Involvement does not meet weekly"
 msgstr "La participación no se reúne semanalmente"
 
-#: src/templates/admin/invKoForm.php:108
+#: src/templates/admin/invKoForm.php:132
 msgid "Involvement does not have a Schedule"
 msgstr "La participación no tiene horario"
 
@@ -1220,7 +1221,6 @@ msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#. Translators: %1$s is the start date, %2$s is the start time.
 #: src/TouchPoint-WP/Involvement.php:995
 #: src/TouchPoint-WP/Involvement.php:1027
 #: src/TouchPoint-WP/Involvement.php:1120
@@ -1262,7 +1262,7 @@ msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3575
+#: src/TouchPoint-WP/Involvement.php:3577
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1271,11 +1271,11 @@ msgstr "%2.1fmi"
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
-#: src/templates/admin/invKoForm.php:112
+#: src/templates/admin/invKoForm.php:136
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr "La participación tiene un tipo de registro de \"No Online Registration\""
 
-#: src/templates/admin/invKoForm.php:116
+#: src/templates/admin/invKoForm.php:140
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
@@ -1292,7 +1292,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1027
+#: src/TouchPoint-WP/TouchPointWP.php:1029
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1306,8 +1306,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3859
-#: src/TouchPoint-WP/Involvement.php:3962
+#: src/TouchPoint-WP/Involvement.php:3861
+#: src/TouchPoint-WP/Involvement.php:3964
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1315,64 +1315,64 @@ msgstr "Tipo de publicación no válida."
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/Taxonomies.php:652
+#: src/TouchPoint-WP/Taxonomies.php:658
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/Taxonomies.php:681
+#: src/TouchPoint-WP/Taxonomies.php:687
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:712
+#: src/TouchPoint-WP/Taxonomies.php:718
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/Taxonomies.php:743
+#: src/TouchPoint-WP/Taxonomies.php:749
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:744
+#: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/Taxonomies.php:770
+#: src/TouchPoint-WP/Taxonomies.php:776
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/Taxonomies.php:774
+#: src/TouchPoint-WP/Taxonomies.php:780
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/Taxonomies.php:774
+#: src/TouchPoint-WP/Taxonomies.php:780
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/Taxonomies.php:797
+#: src/TouchPoint-WP/Taxonomies.php:803
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:803
+#: src/TouchPoint-WP/Taxonomies.php:809
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/Taxonomies.php:829
+#: src/TouchPoint-WP/Taxonomies.php:835
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/Taxonomies.php:832
+#: src/TouchPoint-WP/Taxonomies.php:838
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/Taxonomies.php:858
+#: src/TouchPoint-WP/Taxonomies.php:864
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/Taxonomies.php:864
+#: src/TouchPoint-WP/Taxonomies.php:870
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:897
+#: src/TouchPoint-WP/Taxonomies.php:903
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1431,11 +1431,11 @@ msgstr "Cada 15 minutos"
 msgid "Language"
 msgstr "Idioma"
 
-#: src/templates/admin/invKoForm.php:67
+#: src/templates/admin/invKoForm.php:91
 msgid "Import Images from TouchPoint"
 msgstr "Importar imágenes desde TouchPoint"
 
-#: src/templates/admin/invKoForm.php:71
+#: src/templates/admin/invKoForm.php:95
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
@@ -1452,7 +1452,7 @@ msgstr "Calendarios de Reuniones"
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
-#: src/templates/admin/invKoForm.php:78
+#: src/templates/admin/invKoForm.php:102
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
@@ -1480,7 +1480,7 @@ msgstr "Eliminar siempre de WordPress"
 msgid "Mark the occurrence as cancelled"
 msgstr "Marcar la ocurrencia como cancelada"
 
-#: src/TouchPoint-WP/Involvement.php:3949
+#: src/TouchPoint-WP/Involvement.php:3951
 #: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1505,7 +1505,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3939
+#: src/TouchPoint-WP/Involvement.php:3941
 #: src/TouchPoint-WP/Person.php:1850
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1585,7 +1585,7 @@ msgstr "hoy"
 msgid "Tomorrow"
 msgstr "mañana"
 
-#: src/templates/admin/invKoForm.php:366
+#: src/templates/admin/invKoForm.php:405
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
@@ -1631,7 +1631,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3663
+#: src/TouchPoint-WP/Involvement.php:3665
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1724,8 +1724,7 @@ msgstr "todo el dia los %1$s"
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
-#. translators: %1$s is the start time, %2$s is the end time.
-#. Translators: %1$s is the start date, %2$s is the end date.
+#. translators: %1$s is the start date/time, %2$s is the end date/time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
 #: src/TouchPoint-WP/Utilities/DateFormats.php:326
 msgid "%1$s &ndash; %2$s"
@@ -1822,15 +1821,15 @@ msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el ca
 msgid "This %s has been Cancelled."
 msgstr "Este %s ha sido Cancelado."
 
-#: src/templates/admin/invKoForm.php:173
+#: src/templates/admin/invKoForm.php:197
 msgid "Division"
 msgstr "Division"
 
-#: src/templates/admin/invKoForm.php:180
+#: src/templates/admin/invKoForm.php:204
 msgid "Resident Code"
 msgstr "Código de Residente"
 
-#: src/templates/admin/invKoForm.php:187
+#: src/templates/admin/invKoForm.php:211
 msgid "Campus"
 msgstr "Campus"
 
@@ -1858,3 +1857,15 @@ msgstr "Permitir que los desarrolladores de TouchPoint-WP incluyan públicamente
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Ayuda a otras iglesias potenciales a ver lo que se puede hacer combinando WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
+
+#: src/templates/admin/invKoForm.php:60
+msgid "Import Campuses"
+msgstr "Importar Campus"
+
+#: src/templates/admin/invKoForm.php:67
+msgid "All Campuses"
+msgstr "Todos los campus"
+
+#: src/templates/admin/invKoForm.php:71
+msgid "(No Campus)"
+msgstr "(Sin campus)"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 58dfbe9d..63a78e97 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.94\n"
+"Project-Id-Version: TouchPoint WP 0.0.95\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-19T13:48:25+00:00\n"
+"POT-Creation-Date: 2024-11-22T01:13:58+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -39,186 +39,199 @@ msgstr ""
 msgid "https://github.com/jkrrv"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:17
+#: src/templates/admin/invKoForm.php:18
 #: src/templates/admin/locationsKoForm.php:13
 #: src/templates/admin/locationsKoForm.php:58
 msgid "Delete"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:23
+#: src/templates/admin/invKoForm.php:24
 msgid "Singular Name"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:31
+#: src/templates/admin/invKoForm.php:32
 msgid "Plural Name"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:39
+#: src/templates/admin/invKoForm.php:40
 msgid "Slug"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:47
+#: src/templates/admin/invKoForm.php:48
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:992
 msgid "Divisions to Import"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:60
-msgid "Import Hierarchically (Parent-Child Relationships)"
+msgid "Import Campuses"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:63
+#: src/templates/admin/invKoForm.php:149
+#: src/templates/admin/invKoForm.php:165
+#: src/templates/admin/invKoForm.php:318
+#: src/templates/parts/involvement-nearby-list.php:2
+#: src/TouchPoint-WP/Meeting.php:746
+#: src/TouchPoint-WP/Rsvp.php:75
+#: assets/js/base-defer.js:192
+#: assets/js/base-defer.js:1133
+msgid "Loading..."
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:67
-msgid "Import Images from TouchPoint"
+msgid "All Campuses"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:71
+msgid "(No Campus)"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:84
+msgid "Import Hierarchically (Parent-Child Relationships)"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:91
+msgid "Import Images from TouchPoint"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:95
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:78
+#: src/templates/admin/invKoForm.php:102
 msgid "Import All Meetings to Calendar"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:86
+#: src/templates/admin/invKoForm.php:110
 msgid "Use Geographic Location"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:92
+#: src/templates/admin/invKoForm.php:116
 msgid "Exclude Involvements if"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:96
+#: src/templates/admin/invKoForm.php:120
 msgid "Involvement is Closed"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:100
+#: src/templates/admin/invKoForm.php:124
 msgid "Involvement is a Child Involvement"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:104
+#: src/templates/admin/invKoForm.php:128
 msgid "Based on Involvement setting in TouchPoint"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:104
+#: src/templates/admin/invKoForm.php:128
 msgid "Involvement does not meet weekly"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:108
+#: src/templates/admin/invKoForm.php:132
 msgid "Involvement does not have a Schedule"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:112
+#: src/templates/admin/invKoForm.php:136
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:116
+#: src/templates/admin/invKoForm.php:140
 msgid "Involvement registration has ended (end date is past)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:122
+#: src/templates/admin/invKoForm.php:146
 msgid "Leader Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:125
-#: src/templates/admin/invKoForm.php:141
-#: src/templates/admin/invKoForm.php:293
-#: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:746
-#: src/TouchPoint-WP/Rsvp.php:75
-#: assets/js/base-defer.js:192
-#: assets/js/base-defer.js:1133
-msgid "Loading..."
-msgstr ""
-
-#: src/templates/admin/invKoForm.php:137
+#: src/templates/admin/invKoForm.php:161
 msgid "Host Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:153
+#: src/templates/admin/invKoForm.php:177
 msgid "Default Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:157
+#: src/templates/admin/invKoForm.php:181
 msgid "No Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:158
+#: src/templates/admin/invKoForm.php:182
 msgid "Upcoming / Current"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:159
+#: src/templates/admin/invKoForm.php:183
 msgid "Current / Upcoming"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:167
+#: src/templates/admin/invKoForm.php:191
 msgid "Default Filters"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:173
+#: src/templates/admin/invKoForm.php:197
 msgid "Division"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:180
+#: src/templates/admin/invKoForm.php:204
 msgid "Resident Code"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:187
+#: src/templates/admin/invKoForm.php:211
 msgid "Campus"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:199
+#: src/templates/admin/invKoForm.php:223
 msgid "Gender"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:213
+#: src/templates/admin/invKoForm.php:237
 #: src/TouchPoint-WP/Involvement.php:1853
-#: src/TouchPoint-WP/Taxonomies.php:744
+#: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:217
+#: src/templates/admin/invKoForm.php:241
 #: src/TouchPoint-WP/Involvement.php:1879
-#: src/TouchPoint-WP/Taxonomies.php:802
+#: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:221
+#: src/templates/admin/invKoForm.php:245
 msgid "Prevailing Marital Status"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:225
-#: src/TouchPoint-WP/Taxonomies.php:831
+#: src/templates/admin/invKoForm.php:249
+#: src/TouchPoint-WP/Taxonomies.php:837
 msgid "Age Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:230
+#: src/templates/admin/invKoForm.php:254
 msgid "Task Owner"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:237
+#: src/templates/admin/invKoForm.php:261
 msgid "Contact Leader Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:248
+#: src/templates/admin/invKoForm.php:272
 msgid "Join Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:264
+#: src/templates/admin/invKoForm.php:288
 msgid "Add Involvement Post Type"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:271
+#: src/templates/admin/invKoForm.php:295
 msgid "Small Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:272
+#: src/templates/admin/invKoForm.php:296
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:366
+#: src/templates/admin/invKoForm.php:405
 msgid "(named person)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:403
+#: src/templates/admin/invKoForm.php:442
 msgid "Select..."
 msgstr ""
 
@@ -282,7 +295,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3575
+#: src/TouchPoint-WP/Involvement.php:3577
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -344,7 +357,6 @@ msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#. Translators: %1$s is the start date, %2$s is the start time.
 #: src/TouchPoint-WP/Involvement.php:995
 #: src/TouchPoint-WP/Involvement.php:1027
 #: src/TouchPoint-WP/Involvement.php:1120
@@ -408,7 +420,7 @@ msgid "Language"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1901
-#: src/TouchPoint-WP/Taxonomies.php:863
+#: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr ""
 
@@ -456,73 +468,73 @@ msgstr ""
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3554
+#: src/TouchPoint-WP/Involvement.php:3556
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3557
+#: src/TouchPoint-WP/Involvement.php:3559
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3634
+#: src/TouchPoint-WP/Involvement.php:3636
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3651
+#: src/TouchPoint-WP/Involvement.php:3653
 #: src/TouchPoint-WP/Partner.php:1318
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3663
+#: src/TouchPoint-WP/Involvement.php:3665
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3704
-#: src/TouchPoint-WP/Involvement.php:3763
+#: src/TouchPoint-WP/Involvement.php:3706
+#: src/TouchPoint-WP/Involvement.php:3765
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3710
+#: src/TouchPoint-WP/Involvement.php:3712
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3714
+#: src/TouchPoint-WP/Involvement.php:3716
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3719
+#: src/TouchPoint-WP/Involvement.php:3721
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3722
+#: src/TouchPoint-WP/Involvement.php:3724
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3725
+#: src/TouchPoint-WP/Involvement.php:3727
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3728
+#: src/TouchPoint-WP/Involvement.php:3730
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3754
+#: src/TouchPoint-WP/Involvement.php:3756
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3859
-#: src/TouchPoint-WP/Involvement.php:3962
+#: src/TouchPoint-WP/Involvement.php:3861
+#: src/TouchPoint-WP/Involvement.php:3964
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3939
+#: src/TouchPoint-WP/Involvement.php:3941
 #: src/TouchPoint-WP/Person.php:1850
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3949
+#: src/TouchPoint-WP/Involvement.php:3951
 #: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr ""
@@ -559,7 +571,7 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1027
+#: src/TouchPoint-WP/TouchPointWP.php:1029
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -667,64 +679,64 @@ msgstr ""
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:652
+#: src/TouchPoint-WP/Taxonomies.php:658
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:681
+#: src/TouchPoint-WP/Taxonomies.php:687
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:712
+#: src/TouchPoint-WP/Taxonomies.php:718
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:743
+#: src/TouchPoint-WP/Taxonomies.php:749
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:744
+#: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:770
+#: src/TouchPoint-WP/Taxonomies.php:776
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:774
+#: src/TouchPoint-WP/Taxonomies.php:780
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:774
+#: src/TouchPoint-WP/Taxonomies.php:780
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:797
+#: src/TouchPoint-WP/Taxonomies.php:803
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:803
+#: src/TouchPoint-WP/Taxonomies.php:809
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:829
+#: src/TouchPoint-WP/Taxonomies.php:835
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:832
+#: src/TouchPoint-WP/Taxonomies.php:838
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:858
+#: src/TouchPoint-WP/Taxonomies.php:864
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:864
+#: src/TouchPoint-WP/Taxonomies.php:870
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:897
+#: src/TouchPoint-WP/Taxonomies.php:903
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
@@ -732,42 +744,42 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2023
+#: src/TouchPoint-WP/TouchPointWP.php:2027
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2080
+#: src/TouchPoint-WP/TouchPointWP.php:2084
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2083
+#: src/TouchPoint-WP/TouchPointWP.php:2087
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2086
+#: src/TouchPoint-WP/TouchPointWP.php:2090
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2091
-#: src/TouchPoint-WP/TouchPointWP.php:2092
+#: src/TouchPoint-WP/TouchPointWP.php:2095
+#: src/TouchPoint-WP/TouchPointWP.php:2096
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2209
-#: src/TouchPoint-WP/TouchPointWP.php:2245
+#: src/TouchPoint-WP/TouchPointWP.php:2213
+#: src/TouchPoint-WP/TouchPointWP.php:2249
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2259
-#: src/TouchPoint-WP/TouchPointWP.php:2303
+#: src/TouchPoint-WP/TouchPointWP.php:2263
+#: src/TouchPoint-WP/TouchPointWP.php:2307
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2376
+#: src/TouchPoint-WP/TouchPointWP.php:2380
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2435
+#: src/TouchPoint-WP/TouchPointWP.php:2439
 msgid "People Query Failed"
 msgstr ""
 
@@ -1534,8 +1546,7 @@ msgstr ""
 msgid "Expand"
 msgstr ""
 
-#. translators: %1$s is the start time, %2$s is the end time.
-#. Translators: %1$s is the start date, %2$s is the end date.
+#. translators: %1$s is the start date/time, %2$s is the end date/time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
 #: src/TouchPoint-WP/Utilities/DateFormats.php:326
 msgid "%1$s &ndash; %2$s"
diff --git a/package.json b/package.json
index 06a92658..fef681e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index e00a1ed8..f457866d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -35,7 +35,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.94";
+	public const VERSION = "0.0.95";
 
 	/**
 	 * The Token
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 16177069..e57f51ec 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -85,7 +85,7 @@ public static function TimeRangeStringFormatted(DateTimeInterface $startDt, Date
 		$startStr = self::TimeStringFormatted($startDt);
 		$endStr = self::TimeStringFormatted($endDt);
 
-		// translators: %1$s is the start time, %2$s is the end time.
+		// translators: %1$s is the start date/time, %2$s is the end date/time.
 		$ts = wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $startStr, $endStr);
 
 		/**
@@ -322,7 +322,7 @@ public static function DurationToStringArray(?DateTimeInterface $start, ?DateTim
 				$date1 = self::DateStringFormattedShort($start);
 				$date2 = self::DateStringFormattedShort($end);
 
-				// Translators: %1$s is the start date, %2$s is the end date.
+				// translators: %1$s is the start date/time, %2$s is the end date/time.
 				$r['datetime'] = wp_sprintf(__('%1$s &ndash; %2$s', 'TouchPoint-WP'), $date1, $date2);
 
 			} else {
@@ -343,7 +343,7 @@ public static function DurationToStringArray(?DateTimeInterface $start, ?DateTim
 				$date = self::DateStringFormatted($start);
 				$time = self::TimeStringFormatted($start);
 
-				// Translators: %1$s is the start date, %2$s is the start time.
+				// translators: %1$s is the date(s), %2$s is the time(s).
 				$r['datetime'] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $date, $time);
 
 			} else {
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index a0824092..283a5c1a 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -5,7 +5,7 @@
 import linecache
 import sys
 
-VERSION = "0.0.94"
+VERSION = "0.0.95"
 
 sgContactEvName = "Contact"
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 785860a0..4c54688e 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.94
+Version:            0.0.95
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From f039fa667837bee24e093ab2983431ca823a45b0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 22 Nov 2024 12:43:11 -0500
Subject: [PATCH 218/423] Add a dashboard widget with some simple stats.

---
 docs                                        |   2 +-
 i18n/TouchPoint-WP-es_ES.po                 | 144 ++++++++++---------
 i18n/TouchPoint-WP.pot                      | 146 +++++++++++---------
 src/TouchPoint-WP/Report.php                |   2 +-
 src/TouchPoint-WP/Stats.php                 |  14 +-
 src/TouchPoint-WP/TouchPointWP.php          |   2 +
 src/TouchPoint-WP/TouchPointWP_Widget.php   | 117 ++++++++++++++++
 src/TouchPoint-WP/Utilities.php             |  14 ++
 src/TouchPoint-WP/Utilities/DateFormats.php |  29 ++--
 9 files changed, 325 insertions(+), 145 deletions(-)
 create mode 100644 src/TouchPoint-WP/TouchPointWP_Widget.php

diff --git a/docs b/docs
index e53d723f..4ddcde14 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit e53d723f44bfc397d48a2707d8a9d2567762ff56
+Subproject commit 4ddcde146fa218887d0b60482b187a512fd1bd80
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 7cd03594..2e2c014d 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -314,38 +314,38 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2027
+#: src/TouchPoint-WP/TouchPointWP.php:2029
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2084
+#: src/TouchPoint-WP/TouchPointWP.php:2086
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2087
+#: src/TouchPoint-WP/TouchPointWP.php:2089
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2090
+#: src/TouchPoint-WP/TouchPointWP.php:2092
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2095
-#: src/TouchPoint-WP/TouchPointWP.php:2096
+#: src/TouchPoint-WP/TouchPointWP.php:2097
+#: src/TouchPoint-WP/TouchPointWP.php:2098
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2213
-#: src/TouchPoint-WP/TouchPointWP.php:2249
+#: src/TouchPoint-WP/TouchPointWP.php:2215
+#: src/TouchPoint-WP/TouchPointWP.php:2251
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2263
-#: src/TouchPoint-WP/TouchPointWP.php:2307
+#: src/TouchPoint-WP/TouchPointWP.php:2265
+#: src/TouchPoint-WP/TouchPointWP.php:2309
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2439
+#: src/TouchPoint-WP/TouchPointWP.php:2441
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -809,7 +809,7 @@ msgid "Save Settings"
 msgstr "Guardar ajustes"
 
 #: src/TouchPoint-WP/Person.php:1451
-#: src/TouchPoint-WP/Utilities.php:271
+#: src/TouchPoint-WP/Utilities.php:285
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
@@ -972,7 +972,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2380
+#: src/TouchPoint-WP/TouchPointWP.php:2382
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1040,72 +1040,72 @@ msgstr "Años"
 msgid "Genders"
 msgstr "Géneros"
 
-#: src/TouchPoint-WP/Utilities.php:121
+#: src/TouchPoint-WP/Utilities.php:135
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr "los domingos"
 
-#: src/TouchPoint-WP/Utilities.php:122
+#: src/TouchPoint-WP/Utilities.php:136
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr "los lunes"
 
-#: src/TouchPoint-WP/Utilities.php:123
+#: src/TouchPoint-WP/Utilities.php:137
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr "los martes"
 
-#: src/TouchPoint-WP/Utilities.php:124
+#: src/TouchPoint-WP/Utilities.php:138
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr "los miércoles"
 
-#: src/TouchPoint-WP/Utilities.php:125
+#: src/TouchPoint-WP/Utilities.php:139
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr "los jueves"
 
-#: src/TouchPoint-WP/Utilities.php:126
+#: src/TouchPoint-WP/Utilities.php:140
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr "los viernes"
 
-#: src/TouchPoint-WP/Utilities.php:127
+#: src/TouchPoint-WP/Utilities.php:141
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr "los sábados"
 
-#: src/TouchPoint-WP/Utilities.php:173
+#: src/TouchPoint-WP/Utilities.php:187
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr "Dom"
 
-#: src/TouchPoint-WP/Utilities.php:174
+#: src/TouchPoint-WP/Utilities.php:188
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr "Lun"
 
-#: src/TouchPoint-WP/Utilities.php:175
+#: src/TouchPoint-WP/Utilities.php:189
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr "Mar"
 
-#: src/TouchPoint-WP/Utilities.php:176
+#: src/TouchPoint-WP/Utilities.php:190
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr "Mié"
 
-#: src/TouchPoint-WP/Utilities.php:177
+#: src/TouchPoint-WP/Utilities.php:191
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr "Jue"
 
-#: src/TouchPoint-WP/Utilities.php:178
+#: src/TouchPoint-WP/Utilities.php:192
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr "Vie"
 
-#: src/TouchPoint-WP/Utilities.php:179
+#: src/TouchPoint-WP/Utilities.php:193
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
@@ -1163,37 +1163,37 @@ msgstr "Ubicaciones"
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
-#: src/TouchPoint-WP/Utilities.php:221
+#: src/TouchPoint-WP/Utilities.php:235
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr "Tarde en la noche"
 
-#: src/TouchPoint-WP/Utilities.php:223
+#: src/TouchPoint-WP/Utilities.php:237
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr "Madrugada"
 
-#: src/TouchPoint-WP/Utilities.php:225
+#: src/TouchPoint-WP/Utilities.php:239
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr "Mañana"
 
-#: src/TouchPoint-WP/Utilities.php:227
+#: src/TouchPoint-WP/Utilities.php:241
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr "Mediodía"
 
-#: src/TouchPoint-WP/Utilities.php:229
+#: src/TouchPoint-WP/Utilities.php:243
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: src/TouchPoint-WP/Utilities.php:231
+#: src/TouchPoint-WP/Utilities.php:245
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr "Tardecita"
 
-#: src/TouchPoint-WP/Utilities.php:233
+#: src/TouchPoint-WP/Utilities.php:247
 msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
@@ -1225,8 +1225,9 @@ msgstr "restablecer el mapa"
 #: src/TouchPoint-WP/Involvement.php:1027
 #: src/TouchPoint-WP/Involvement.php:1120
 #: src/TouchPoint-WP/Involvement.php:1144
-#: src/TouchPoint-WP/Utilities/DateFormats.php:283
-#: src/TouchPoint-WP/Utilities/DateFormats.php:347
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:67
+#: src/TouchPoint-WP/Utilities/DateFormats.php:288
+#: src/TouchPoint-WP/Utilities/DateFormats.php:352
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
@@ -1292,17 +1293,17 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1029
+#: src/TouchPoint-WP/TouchPointWP.php:1031
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
 #: src/TouchPoint-WP/Meeting.php:700
-#: src/TouchPoint-WP/TouchPointWP.php:360
+#: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
 #: src/TouchPoint-WP/Meeting.php:710
-#: src/TouchPoint-WP/TouchPointWP.php:369
+#: src/TouchPoint-WP/TouchPointWP.php:371
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
@@ -1571,17 +1572,17 @@ msgid "Select post types which should have Resident Codes available as a native
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
 #: src/TouchPoint-WP/Utilities/DateFormats.php:119
-#: src/TouchPoint-WP/Utilities/DateFormats.php:191
+#: src/TouchPoint-WP/Utilities/DateFormats.php:194
 msgid "Tonight"
 msgstr "este noche"
 
 #: src/TouchPoint-WP/Utilities/DateFormats.php:121
-#: src/TouchPoint-WP/Utilities/DateFormats.php:193
+#: src/TouchPoint-WP/Utilities/DateFormats.php:196
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:127
-#: src/TouchPoint-WP/Utilities/DateFormats.php:199
+#: src/TouchPoint-WP/Utilities/DateFormats.php:128
+#: src/TouchPoint-WP/Utilities/DateFormats.php:203
 msgid "Tomorrow"
 msgstr "mañana"
 
@@ -1589,7 +1590,7 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:482
+#: src/TouchPoint-WP/Utilities.php:496
 msgid "Expand"
 msgstr "Ampliar"
 
@@ -1602,25 +1603,25 @@ msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:144
+#: src/TouchPoint-WP/Utilities/DateFormats.php:147
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:150
+#: src/TouchPoint-WP/Utilities/DateFormats.php:153
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:156
+#: src/TouchPoint-WP/Utilities/DateFormats.php:159
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:161
+#: src/TouchPoint-WP/Utilities/DateFormats.php:164
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -1685,22 +1686,22 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:134
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:135
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+#: src/TouchPoint-WP/Utilities/DateFormats.php:140
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:141
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
@@ -1726,55 +1727,55 @@ msgstr "Aún no se admite la creación de un objeto de reunión a partir de un o
 
 #. translators: %1$s is the start date/time, %2$s is the end date/time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
-#: src/TouchPoint-WP/Utilities/DateFormats.php:326
+#: src/TouchPoint-WP/Utilities/DateFormats.php:331
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:206
+#: src/TouchPoint-WP/Utilities/DateFormats.php:211
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:207
+#: src/TouchPoint-WP/Utilities/DateFormats.php:212
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr "j M"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:209
+#: src/TouchPoint-WP/Utilities/DateFormats.php:214
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:210
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:359
+#: src/TouchPoint-WP/Utilities/DateFormats.php:364
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:216
+#: src/TouchPoint-WP/Utilities/DateFormats.php:221
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:222
+#: src/TouchPoint-WP/Utilities/DateFormats.php:227
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:228
+#: src/TouchPoint-WP/Utilities/DateFormats.php:233
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#: src/TouchPoint-WP/Utilities/DateFormats.php:238
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -1837,7 +1838,7 @@ msgstr "Campus"
 msgid "All Day"
 msgstr "todo el dia"
 
-#: src/TouchPoint-WP/Utilities.php:276
+#: src/TouchPoint-WP/Utilities.php:290
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1869,3 +1870,20 @@ msgstr "Todos los campus"
 #: src/templates/admin/invKoForm.php:71
 msgid "(No Campus)"
 msgstr "(Sin campus)"
+
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:37
+msgid "TouchPoint-WP Status"
+msgstr "Estado de TouchPoint-WP"
+
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:92
+msgid "Imported"
+msgstr "Importadas"
+
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:93
+msgid "Last Updated"
+msgstr "Actualizada"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:130
+#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+msgid "Yesterday"
+msgstr "Ayer"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 63a78e97..71300fa4 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-22T01:13:58+00:00\n"
+"POT-Creation-Date: 2024-11-22T17:39:16+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -361,8 +361,9 @@ msgstr ""
 #: src/TouchPoint-WP/Involvement.php:1027
 #: src/TouchPoint-WP/Involvement.php:1120
 #: src/TouchPoint-WP/Involvement.php:1144
-#: src/TouchPoint-WP/Utilities/DateFormats.php:283
-#: src/TouchPoint-WP/Utilities/DateFormats.php:347
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:67
+#: src/TouchPoint-WP/Utilities/DateFormats.php:288
+#: src/TouchPoint-WP/Utilities/DateFormats.php:352
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -571,17 +572,17 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1029
+#: src/TouchPoint-WP/TouchPointWP.php:1031
 msgid "Only GET requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:700
-#: src/TouchPoint-WP/TouchPointWP.php:360
+#: src/TouchPoint-WP/TouchPointWP.php:362
 msgid "Only POST requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:710
-#: src/TouchPoint-WP/TouchPointWP.php:369
+#: src/TouchPoint-WP/TouchPointWP.php:371
 msgid "Invalid data provided."
 msgstr ""
 
@@ -618,7 +619,7 @@ msgid "Person in %s"
 msgstr ""
 
 #: src/TouchPoint-WP/Person.php:1451
-#: src/TouchPoint-WP/Utilities.php:271
+#: src/TouchPoint-WP/Utilities.php:285
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
@@ -744,42 +745,42 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2027
+#: src/TouchPoint-WP/TouchPointWP.php:2029
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2084
+#: src/TouchPoint-WP/TouchPointWP.php:2086
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2087
+#: src/TouchPoint-WP/TouchPointWP.php:2089
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2090
+#: src/TouchPoint-WP/TouchPointWP.php:2092
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2095
-#: src/TouchPoint-WP/TouchPointWP.php:2096
+#: src/TouchPoint-WP/TouchPointWP.php:2097
+#: src/TouchPoint-WP/TouchPointWP.php:2098
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2213
-#: src/TouchPoint-WP/TouchPointWP.php:2249
+#: src/TouchPoint-WP/TouchPointWP.php:2215
+#: src/TouchPoint-WP/TouchPointWP.php:2251
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2263
-#: src/TouchPoint-WP/TouchPointWP.php:2307
+#: src/TouchPoint-WP/TouchPointWP.php:2265
+#: src/TouchPoint-WP/TouchPointWP.php:2309
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2380
+#: src/TouchPoint-WP/TouchPointWP.php:2382
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2439
+#: src/TouchPoint-WP/TouchPointWP.php:2441
 msgid "People Query Failed"
 msgstr ""
 
@@ -1432,231 +1433,248 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:121
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:37
+msgid "TouchPoint-WP Status"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:92
+msgid "Imported"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:93
+msgid "Last Updated"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities.php:135
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:122
+#: src/TouchPoint-WP/Utilities.php:136
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:123
+#: src/TouchPoint-WP/Utilities.php:137
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:124
+#: src/TouchPoint-WP/Utilities.php:138
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:125
+#: src/TouchPoint-WP/Utilities.php:139
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:126
+#: src/TouchPoint-WP/Utilities.php:140
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:127
+#: src/TouchPoint-WP/Utilities.php:141
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:173
+#: src/TouchPoint-WP/Utilities.php:187
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:174
+#: src/TouchPoint-WP/Utilities.php:188
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:175
+#: src/TouchPoint-WP/Utilities.php:189
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:176
+#: src/TouchPoint-WP/Utilities.php:190
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:177
+#: src/TouchPoint-WP/Utilities.php:191
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:178
+#: src/TouchPoint-WP/Utilities.php:192
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:179
+#: src/TouchPoint-WP/Utilities.php:193
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:221
+#: src/TouchPoint-WP/Utilities.php:235
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:223
+#: src/TouchPoint-WP/Utilities.php:237
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:225
+#: src/TouchPoint-WP/Utilities.php:239
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:227
+#: src/TouchPoint-WP/Utilities.php:241
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:229
+#: src/TouchPoint-WP/Utilities.php:243
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:231
+#: src/TouchPoint-WP/Utilities.php:245
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:233
+#: src/TouchPoint-WP/Utilities.php:247
 msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:276
+#: src/TouchPoint-WP/Utilities.php:290
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:482
+#: src/TouchPoint-WP/Utilities.php:496
 msgid "Expand"
 msgstr ""
 
 #. translators: %1$s is the start date/time, %2$s is the end date/time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
-#: src/TouchPoint-WP/Utilities/DateFormats.php:326
+#: src/TouchPoint-WP/Utilities/DateFormats.php:331
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
 #: src/TouchPoint-WP/Utilities/DateFormats.php:119
-#: src/TouchPoint-WP/Utilities/DateFormats.php:191
+#: src/TouchPoint-WP/Utilities/DateFormats.php:194
 msgid "Tonight"
 msgstr ""
 
 #: src/TouchPoint-WP/Utilities/DateFormats.php:121
-#: src/TouchPoint-WP/Utilities/DateFormats.php:193
+#: src/TouchPoint-WP/Utilities/DateFormats.php:196
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:127
-#: src/TouchPoint-WP/Utilities/DateFormats.php:199
+#: src/TouchPoint-WP/Utilities/DateFormats.php:128
+#: src/TouchPoint-WP/Utilities/DateFormats.php:203
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:134
+#: src/TouchPoint-WP/Utilities/DateFormats.php:130
+#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+msgid "Yesterday"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:135
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+#: src/TouchPoint-WP/Utilities/DateFormats.php:140
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:141
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:144
+#: src/TouchPoint-WP/Utilities/DateFormats.php:147
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:150
+#: src/TouchPoint-WP/Utilities/DateFormats.php:153
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:156
+#: src/TouchPoint-WP/Utilities/DateFormats.php:159
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:161
+#: src/TouchPoint-WP/Utilities/DateFormats.php:164
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:206
+#: src/TouchPoint-WP/Utilities/DateFormats.php:211
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:207
+#: src/TouchPoint-WP/Utilities/DateFormats.php:212
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:209
+#: src/TouchPoint-WP/Utilities/DateFormats.php:214
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:210
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:216
+#: src/TouchPoint-WP/Utilities/DateFormats.php:221
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:222
+#: src/TouchPoint-WP/Utilities/DateFormats.php:227
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:228
+#: src/TouchPoint-WP/Utilities/DateFormats.php:233
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#: src/TouchPoint-WP/Utilities/DateFormats.php:238
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:359
+#: src/TouchPoint-WP/Utilities/DateFormats.php:364
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index ce34ec3c..e130c0d3 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -144,7 +144,7 @@ public static function load(): bool
 		/// Cron ///
 		////////////
 
-		// Setup cron for updating People daily.
+		// Setup cron for updating Reports daily.
 		add_action(self::CRON_HOOK, [self::class, 'updateCron']);
 		if ( ! wp_next_scheduled(self::CRON_HOOK)) {
 			// Runs every 15 minutes, starting now.
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 24a9cbb9..ba857834 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -236,10 +236,16 @@ public function __get(string $name)
 	/**
 	 * Assemble the information that's submitted.
 	 *
+	 * @param bool $updateQueried
+	 *
 	 * @return array
 	 */
-	public function getStatsForSubmission(): array
+	public function getStatsForSubmission(bool $updateQueried = false): array
 	{
+		if ($updateQueried) {
+			$this->updateQueriedStats();
+		}
+
 		$data = $this->jsonSerialize();
 
 		$sets = TouchPointWP::instance()->settings;
@@ -321,9 +327,9 @@ protected function updateQueriedStats(): void
 		global $wpdb;
 
 		$this->involvementPosts = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_invId'") ?? -1;
-		$this->meetings = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_mtgId'") ?? -1;
-		$this->people = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->usermeta WHERE meta_key = 'tp_peopleId';") ?? -1;
-		$this->partnerPosts = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
+		$this->meetings         = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_mtgId'") ?? -1;
+		$this->people           = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->usermeta WHERE meta_key = 'tp_peopleId';") ?? -1;
+		$this->partnerPosts     = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
 
 		$this->_dirty = true;
 	}
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index f457866d..fa914b67 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -298,8 +298,10 @@ public function admin(): TouchPointWP_AdminAPI
 		if ($this->admin === null) {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 				require_once 'TouchPointWP_AdminAPI.php';
+				require_once 'TouchPointWP_Widget.php';
 			}
 			$this->admin = new TouchPointWP_AdminAPI();
+			TouchPointWP_Widget::init();
 		}
 
 		return $this->admin;
diff --git a/src/TouchPoint-WP/TouchPointWP_Widget.php b/src/TouchPoint-WP/TouchPointWP_Widget.php
new file mode 100644
index 00000000..43e89a0c
--- /dev/null
+++ b/src/TouchPoint-WP/TouchPointWP_Widget.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use tp\TouchPointWP\Utilities\DateFormats;
+
+if ( ! defined('ABSPATH')) {
+	exit;
+}
+
+/**
+ * Class TouchPointWP_Widget
+ *
+ * Provides an admin dashboard widget that shows some basic stats about the plugin.
+ *
+ * @package tp\TouchPointWP
+ */
+abstract class TouchPointWP_Widget
+{
+	/**
+	 * Initialize the widget.
+	 */
+	public static function init(): void
+	{
+		add_action( 'wp_dashboard_setup', [self::class, 'dashboardSetup'] );
+	}
+
+	/**
+	 * Setup the dashboard widget.
+	 */
+	public static function dashboardSetup(): void
+	{
+		wp_add_dashboard_widget('tpwp_status',
+			esc_html__( 'TouchPoint-WP Status', 'TouchPoint-WP' ),
+			[self::class, 'render']
+		);
+	}
+
+	/**
+	 * Convert a timestamp to a formatted string.
+	 *
+	 * @param mixed $timestamp The timestamp to convert.
+	 *
+	 * @return string The formatted string.
+	 */
+	protected static function timestampToFormated(mixed $timestamp): string
+	{
+		if (!is_numeric($timestamp)) {
+			try {
+				$timestamp = new \DateTime($timestamp);
+			} catch (\Exception $e) {
+				return 'Never';
+			}
+		} else {
+			try {
+				$timestamp = new \DateTime('@' . $timestamp);
+			} catch (\Exception $e) {
+				return 'Never';
+			}
+		}
+
+		return wp_sprintf(
+			// translators: %1$s is the date(s), %2$s is the time(s).
+			__('%1$s at %2$s', 'TouchPoint-WP'),
+			DateFormats::DateStringFormattedShort($timestamp),
+			DateFormats::TimeStringFormatted($timestamp)
+		);
+	}
+
+	/**
+	 * Print the widget content.
+	 *
+	 * @return void
+	 */
+	public static function render(): void
+	{
+		$stats = (object) Stats::instance()->getStatsForSubmission(true);
+		$settings = TouchPointWP::instance()->settings;
+
+		global $wpdb;
+		$rpt = Report::POST_TYPE;
+		$reportData = $wpdb->get_row("SELECT MAX(post_modified) as ts, COUNT(*) as cnt FROM $wpdb->posts WHERE post_type = '$rpt'");
+
+		echo '<div class="tpwp-status">';
+		echo '<table style="width:100%">';
+
+		echo "<tr><td></td>";
+
+		echo "<th>" . __("Imported", "TouchPoint-WP") . "</th>";
+		echo "<th>" . __("Last Updated", "TouchPoint-WP") . "</th></tr>";
+
+		echo '<tr><th style="text-align:left;">People</th><td style="text-align:center;">' . $stats->people . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->person_cron_last_run) . "</td></tr>";
+
+		if ($settings->enable_involvements === "on") {
+			echo '<tr><th style="text-align:left;">Involvements</th><td style="text-align:center;">' . $stats->involvementPosts . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->inv_cron_last_run) . "</td></tr>";
+		}
+
+		if ($settings->enable_meeting_cal === "on") {
+			echo '<tr><th style="text-align:left;">Meetings</th><td style="text-align:center;">' . $stats->meetings . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->inv_cron_last_run) . "</td></tr>";
+		}
+
+		if ($settings->enable_global === "on") {
+			echo '<tr><th style="text-align:left;">Partners</th><td style="text-align:center;">' . $stats->partnerPosts . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->global_cron_last_run) . "</td></tr>";
+		}
+
+		echo '<tr><th style="text-align:left;">Reports</th><td style="text-align:center;">' . $reportData->cnt . '</td><td style="text-align:center;">' . self::timestampToFormated($reportData->ts) . "</td></tr>";
+
+		echo "</table>";
+
+		echo '<div style="text-align: right;">Version ' . TouchPointWP::VERSION . "</div>";
+
+		echo '</div>';
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 6a0ead78..78ef94f4 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -89,6 +89,19 @@ public static function dateTimeNowPlus1D(): DateTimeImmutable
 
 		return self::$_dateTimeNowPlus1D;
 	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public static function dateTimeNowMinus1D(): DateTimeImmutable
+	{
+		if (self::$_dateTimeNowMinus1D === null) {
+			$aDay                     = new DateInterval('P-1D');
+			self::$_dateTimeNowMinus1D = self::dateTimeNow()->add($aDay);
+		}
+
+		return self::$_dateTimeNowMinus1D;
+	}
 	
 	/**
 	 * @return DateTimeZone
@@ -106,6 +119,7 @@ public static function utcTimeZone(): DateTimeZone
 	private static ?DateTimeImmutable $_dateTimeTodayAtMidnight = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1Y = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1D = null;
+	private static ?DateTimeImmutable $_dateTimeNowMinus1D = null;
 	private static ?DateTimeZone $_utcTimeZone = null;
 
 	/**
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index e57f51ec..25cf8ea6 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -121,10 +121,13 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 				$r = __("Today", "TouchPoint-WP");
 			}
 		} else {
-			// Tomorrow
+			// Tomorrow & Yesterday
 			$tomorrow = Utilities::dateTimeNowPlus1D();
+			$yesterday = Utilities::dateTimeNowMinus1D();
 			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
 				$r = __("Tomorrow", "TouchPoint-WP");
+			} elseif ($yesterday->format("Ymd") === $dt->format("Ymd")) {
+				$r = __("Yesterday", "TouchPoint-WP");
 			} else {
 				$ts    = DateFormats::timestampWithoutOffset($dt);
 				$nowTs = DateFormats::timestampWithoutOffset($now);
@@ -142,16 +145,16 @@ public static function DateStringFormatted(DateTimeInterface $dt): string
 				if ($ts < $nowTs && $ts - $nowTs > -7 * 86400) {
 					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('Last %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
-				}
+
 
 				// This week
-				else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
+				} else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
 					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('This %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
-				}
+
 
 				// Next week
-				else if ($ts > $nowTs && $ts - $nowTs < 14 * 86400) {
+				} else if ($ts > $nowTs && $ts - $nowTs < 14 * 86400) {
 					// translators: %1$s is "Monday".  %2$s is "January 1".
 					$r = sprintf(_x('Next %1$s, %2$s', "Date format string", 'TouchPoint-WP'), $day, $date);
 
@@ -193,16 +196,18 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 				$r = __("Today", "TouchPoint-WP");
 			}
 		} else {
-			// Tomorrow
+			// Tomorrow & Yesterday
 			$tomorrow = Utilities::dateTimeNowPlus1D();
+			$yesterday = Utilities::dateTimeNowMinus1D();
 			if ($tomorrow->format("Ymd") === $dt->format("Ymd")) {
 				$r = __("Tomorrow", "TouchPoint-WP");
+			} elseif ($yesterday->format("Ymd") === $dt->format("Ymd")) {
+				$r = __("Yesterday", "TouchPoint-WP");
 			} else {
 				$ts    = DateFormats::timestampWithoutOffset($dt);
 				$nowTs = DateFormats::timestampWithoutOffset($now);
 
-
-				if ($tomorrow->format("Y") === $dt->format("Y")) { // Same Year
+				if ($now->format("Y") === $dt->format("Y")) { // Same Year
 					$day = wp_date(_x('D', "Short date string for day of the week, when the year is current.", "TouchPoint-WP"), $ts);
 					$date = wp_date(_x('M j', "Short date string when the year is current.", "TouchPoint-WP"), $ts);
 				} else {
@@ -214,16 +219,16 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 				if ($ts < $nowTs && $ts - $nowTs > -7 * 86400) {
 					// translators: %1$s is "Mon".  %2$s is "Jan 1".
 					$r = sprintf(_x('Last %1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
-				}
+
 
 				// This week
-				else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
+				} else if ($ts > $nowTs && $ts - $nowTs < 7 * 86400) {
 					// translators: %1$s is "Mon".  %2$s is "Jan 1".
 					$r = sprintf(_x('This %1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
-				}
+
 
 				// Next week
-				else if ($ts > $nowTs && $ts - $nowTs < 14 * 86400) {
+				} else if ($ts > $nowTs && $ts - $nowTs < 14 * 86400) {
 					// translators: %1$s is "Mon".  %2$s is "Jan 1".
 					$r = sprintf(_x('Next %1$s, %2$s', "Short date format string", 'TouchPoint-WP'), $day, $date);
 

From b94429bc4363507fbaf0baaba34eef041ad2a551 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 22 Nov 2024 13:06:01 -0500
Subject: [PATCH 219/423] Adding reports to submitted stats

---
 src/TouchPoint-WP/Stats.php        | 3 +++
 src/TouchPoint-WP/TouchPointWP.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index ba857834..ff9f9d1c 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -24,6 +24,7 @@
  * @property int $involvementJoins
  * @property int $involvementContacts
  * @property int $involvementPosts
+ * @property int $reportPosts
  * @property int $meetings
  * @property int $rsvps
  * @property int $people
@@ -42,6 +43,7 @@ class Stats implements api, \JsonSerializable, updatesViaCron
 	protected int $involvementJoins = 0;
 	protected int $involvementContacts = 0;
 	protected int $involvementPosts = 0;  // updated by query
+	protected int $reportPosts = 0;  // updated by query
 	protected int $meetings = 0;  // updated by query
 	protected int $rsvps = 0;
 	protected int $people = 0; // updated by query
@@ -327,6 +329,7 @@ protected function updateQueriedStats(): void
 		global $wpdb;
 
 		$this->involvementPosts = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_invId'") ?? -1;
+		$this->reportPosts      = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_report'") ?? -1;
 		$this->meetings         = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_mtgId'") ?? -1;
 		$this->people           = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->usermeta WHERE meta_key = 'tp_peopleId';") ?? -1;
 		$this->partnerPosts     = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index fa914b67..c89c99b7 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -682,6 +682,7 @@ protected function createTables(): void
 				involvementJoins int(10) DEFAULT 0,
 				involvementContacts int(10) DEFAULT 0,
 				involvementPosts int(10) DEFAULT 0,
+				reportPosts int(10) DEFAULT 0,
 				meetings int(10) DEFAULT 0,
 				rsvps int(10) DEFAULT 0,
 				people int(10) DEFAULT 0,

From b78a81e6ebce9e197ce3952d2dc23c4c8b6a65a3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 22 Nov 2024 13:08:51 -0500
Subject: [PATCH 220/423] Updating several settings

---
 i18n/TouchPoint-WP-es_ES.po                 | 384 ++++++++++----------
 i18n/TouchPoint-WP.pot                      | 378 +++++++++----------
 src/TouchPoint-WP/TouchPointWP_Settings.php |  22 +-
 3 files changed, 370 insertions(+), 414 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 2e2c014d..abb41fe6 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:992
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -314,497 +314,497 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2029
+#: src/TouchPoint-WP/TouchPointWP.php:2030
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2086
+#: src/TouchPoint-WP/TouchPointWP.php:2087
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2089
+#: src/TouchPoint-WP/TouchPointWP.php:2090
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2092
+#: src/TouchPoint-WP/TouchPointWP.php:2093
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2097
 #: src/TouchPoint-WP/TouchPointWP.php:2098
+#: src/TouchPoint-WP/TouchPointWP.php:2099
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2215
-#: src/TouchPoint-WP/TouchPointWP.php:2251
+#: src/TouchPoint-WP/TouchPointWP.php:2216
+#: src/TouchPoint-WP/TouchPointWP.php:2252
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2265
-#: src/TouchPoint-WP/TouchPointWP.php:2309
+#: src/TouchPoint-WP/TouchPointWP.php:2266
+#: src/TouchPoint-WP/TouchPointWP.php:2310
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2441
+#: src/TouchPoint-WP/TouchPointWP.php:2442
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:262
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:274
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:282
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:337
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:348
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:361
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:373
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:385
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:398
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:410
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:422
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:484
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:501
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:512
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:523
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:761
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:565
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:575
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:597
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:603
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:638
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:649
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:660
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:695
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:706
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:717
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:728
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:817
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:822
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:950
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:935
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:964
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:993
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1044
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1053
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1064
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1065
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1076
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1077
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1093
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1078
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1094
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1083
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1099
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1095
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1107
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1123
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1299
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1284
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1353
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1339
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1402
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1387
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1627
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1761
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1749
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1812
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1800
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -972,7 +972,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2382
+#: src/TouchPoint-WP/TouchPointWP.php:2383
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1154,12 +1154,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1010
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1268,7 +1268,7 @@ msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi l
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1293,7 +1293,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1031
+#: src/TouchPoint-WP/TouchPointWP.php:1032
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1312,7 +1312,7 @@ msgstr "Datos proporcionados no válidos."
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:326
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1377,7 +1377,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1445,11 +1445,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:850
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1457,44 +1457,28 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:879
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
-msgid "Meeting Deletion Handling"
-msgstr "Manejo de eliminación de reuniones"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:933
-msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
-msgstr "Cuando se elimina una reunión en TouchPoint que ya se ha importado a WordPress, ¿cómo se debe manejar?"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:939
-msgid "Always delete from WordPress"
-msgstr "Eliminar siempre de WordPress"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
-msgid "Mark the occurrence as cancelled"
-msgstr "Marcar la ocurrencia como cancelada"
-
 #: src/TouchPoint-WP/Involvement.php:3951
 #: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1526,48 +1510,40 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:293
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
-msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
-msgstr "Las reuniones que hayan transcurrido más de esta cantidad de días pasados se trasladarán al Archivo de eventos. Una vez que pase esta fecha, la información de la reunión ya no se actualizará."
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
-msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
-msgstr "Las reuniones se mantendrán para el calendario público hasta que hayan transcurrido tantos días desde el evento."
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1135
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:989
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1120
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1136
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1650,39 +1626,39 @@ msgstr "Reunión en %s"
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:867
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
 msgid "Event"
 msgstr "Evento"
 
@@ -1789,31 +1765,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1843,19 +1819,19 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:433
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP"
 msgstr "Permitir que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio/iglesia como usuarios de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
 msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Ayuda a otras iglesias potenciales a ver lo que se puede hacer combinando WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
@@ -1887,3 +1863,11 @@ msgstr "Actualizada"
 #: src/TouchPoint-WP/Utilities/DateFormats.php:205
 msgid "Yesterday"
 msgstr "Ayer"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
+msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
+msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días en el pasado. Una vez que un evento tenga más de esta cantidad de días, se eliminará."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 71300fa4..977622c1 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-22T17:39:16+00:00\n"
+"POT-Creation-Date: 2024-11-22T18:07:49+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:992
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
 msgid "Divisions to Import"
 msgstr ""
 
@@ -572,7 +572,7 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1031
+#: src/TouchPoint-WP/TouchPointWP.php:1032
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -745,691 +745,675 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2029
+#: src/TouchPoint-WP/TouchPointWP.php:2030
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2086
+#: src/TouchPoint-WP/TouchPointWP.php:2087
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2089
+#: src/TouchPoint-WP/TouchPointWP.php:2090
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2092
+#: src/TouchPoint-WP/TouchPointWP.php:2093
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2097
 #: src/TouchPoint-WP/TouchPointWP.php:2098
+#: src/TouchPoint-WP/TouchPointWP.php:2099
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2215
-#: src/TouchPoint-WP/TouchPointWP.php:2251
+#: src/TouchPoint-WP/TouchPointWP.php:2216
+#: src/TouchPoint-WP/TouchPointWP.php:2252
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2265
-#: src/TouchPoint-WP/TouchPointWP.php:2309
+#: src/TouchPoint-WP/TouchPointWP.php:2266
+#: src/TouchPoint-WP/TouchPointWP.php:2310
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2382
+#: src/TouchPoint-WP/TouchPointWP.php:2383
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2441
+#: src/TouchPoint-WP/TouchPointWP.php:2442
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:262
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:274
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:282
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:293
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:326
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:337
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:348
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:361
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:373
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:385
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:398
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:410
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:422
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:433
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
 msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:484
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:501
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:512
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:523
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:761
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:565
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:575
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:597
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:603
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:638
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:649
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:660
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:695
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:706
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:717
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:728
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:817
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:822
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:850
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:867
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:879
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
-msgid "Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update."
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
-msgid "Meetings will be kept for the public calendar until the event is this many days in the past."
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:932
-msgid "Meeting Deletion Handling"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:933
-msgid "When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:939
-msgid "Always delete from WordPress"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
-msgid "Mark the occurrence as cancelled"
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:950
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:935
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:951
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:955
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:956
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:967
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:968
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:964
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:980
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:993
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1135
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:989
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1120
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1019
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1025
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1010
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1020
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1044
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1045
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1052
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1053
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1064
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1065
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1076
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1077
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1093
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1078
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1094
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1098
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1083
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1099
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1110
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1095
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1111
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1107
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1123
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1136
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1299
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1284
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1353
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1354
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1339
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1402
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1387
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1627
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1761
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1749
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1812
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1800
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 54ea88e1..71162a74 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -78,7 +78,6 @@
  * @property-read int          mc_future_days     Number of days into the future to import.
  * @property-read int          mc_archive_days    Number of days to wait to move something to history.
  * @property-read int|string   mc_hist_days       Number of days of history to keep.  (Can be '' if module isn't enabled.)
- * @property-read string       mc_deletion_method Determines how meetings should be handled in WordPress if they're deleted in TouchPoint
  *
  * @property-read string       rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
  * @property-read string       rc_name_singular   What a resident code should be called, singular (e.g. "Resident Code" or "Zone")
@@ -905,7 +904,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 						'id'          => 'mc_archive_days',
 						'label'       => __('Archive After Days', 'TouchPoint-WP'),
 						'description' => __(
-							'Meetings more than this many days in the past will be moved to the Events Archive.  Once this date passes, meeting information will no longer update.',
+							'Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement.',
 							'TouchPoint-WP'
 						),
 						'type'        => 'number',
@@ -918,7 +917,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 						'id'          => 'mc_hist_days',
 						'label'       => __('Days of History', 'TouchPoint-WP'),
 						'description' => __(
-							'Meetings will be kept for the public calendar until the event is this many days in the past.',
+							"Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.",
 							'TouchPoint-WP'
 						),
 						'type'        => 'number',
@@ -927,20 +926,6 @@ private function settingsFields(bool|string $includeDetail = false): array
 						'max'         => 1825,
 						'min'         => 0
 					],
-					[
-						'id'          => 'mc_deletion_method',
-						'label'       => __('Meeting Deletion Handling', 'TouchPoint-WP'),
-						'description' => __(
-							'When a Meeting is deleted in TouchPoint that has already been imported to WordPress, how should that be handled?',
-							'TouchPoint-WP'
-						),
-						'type'        => 'select',
-						'options'     => [
-							'delete' => __('Always delete from WordPress', 'TouchPoint-WP'),
-							'cancel' => __('Mark the occurrence as cancelled', 'TouchPoint-WP'),
-						],
-						'default'     => 'delete',
-					],
 				],
 			];
 		}
@@ -1617,6 +1602,9 @@ public function migrate(): void
 		$years = TouchPointWP::TTL_IP_GEO;
 		$wpdb->query("DELETE FROM $tableName WHERE `updatedDT` < NOW() - INTERVAL $years YEAR OR `data` LIKE 'Too many rapid requests.%';");
 
+		// 0.0.95 - Remove never-really-used option for deletion handling
+		delete_option('tp_mc_deletion_method');
+
 		// Update version string
 		$this->set('version', TouchPointWP::VERSION);
 	}

From ca1b07b4d24b19f9a25032e215c9deb300aeedb7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 22 Nov 2024 14:25:37 -0500
Subject: [PATCH 221/423] Timezone-related bug

---
 src/TouchPoint-WP/TouchPointWP_Widget.php | 6 ++++--
 src/TouchPoint-WP/Utilities.php           | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Widget.php b/src/TouchPoint-WP/TouchPointWP_Widget.php
index 43e89a0c..759292c8 100644
--- a/src/TouchPoint-WP/TouchPointWP_Widget.php
+++ b/src/TouchPoint-WP/TouchPointWP_Widget.php
@@ -50,17 +50,19 @@ protected static function timestampToFormated(mixed $timestamp): string
 	{
 		if (!is_numeric($timestamp)) {
 			try {
-				$timestamp = new \DateTime($timestamp);
+				$timestamp = new \DateTime($timestamp, wp_timezone());
 			} catch (\Exception $e) {
 				return 'Never';
 			}
 		} else {
 			try {
-				$timestamp = new \DateTime('@' . $timestamp);
+				$timestamp = new \DateTime('@' . $timestamp, Utilities::utcTimeZone());
+
 			} catch (\Exception $e) {
 				return 'Never';
 			}
 		}
+		$timestamp->setTimezone(wp_timezone());
 
 		return wp_sprintf(
 			// translators: %1$s is the date(s), %2$s is the time(s).
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 78ef94f4..a05b41b6 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -96,7 +96,8 @@ public static function dateTimeNowPlus1D(): DateTimeImmutable
 	public static function dateTimeNowMinus1D(): DateTimeImmutable
 	{
 		if (self::$_dateTimeNowMinus1D === null) {
-			$aDay                     = new DateInterval('P-1D');
+			$aDay                     = new DateInterval('P1D');
+			$aDay->invert = 1;
 			self::$_dateTimeNowMinus1D = self::dateTimeNow()->add($aDay);
 		}
 

From 9668b2fa2294e23c13b0d62404f0dc1e718dfb72 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 24 Nov 2024 11:31:33 -0500
Subject: [PATCH 222/423] Replace references with imports

---
 src/TouchPoint-WP/TouchPointWP_Widget.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Widget.php b/src/TouchPoint-WP/TouchPointWP_Widget.php
index 759292c8..a7b419ce 100644
--- a/src/TouchPoint-WP/TouchPointWP_Widget.php
+++ b/src/TouchPoint-WP/TouchPointWP_Widget.php
@@ -5,6 +5,8 @@
 
 namespace tp\TouchPointWP;
 
+use DateTime;
+use Exception;
 use tp\TouchPointWP\Utilities\DateFormats;
 
 if ( ! defined('ABSPATH')) {
@@ -50,15 +52,15 @@ protected static function timestampToFormated(mixed $timestamp): string
 	{
 		if (!is_numeric($timestamp)) {
 			try {
-				$timestamp = new \DateTime($timestamp, wp_timezone());
-			} catch (\Exception $e) {
+				$timestamp = new DateTime($timestamp, wp_timezone());
+			} catch (Exception) {
 				return 'Never';
 			}
 		} else {
 			try {
-				$timestamp = new \DateTime('@' . $timestamp, Utilities::utcTimeZone());
+				$timestamp = new DateTime('@' . $timestamp, Utilities::utcTimeZone());
 
-			} catch (\Exception $e) {
+			} catch (Exception) {
 				return 'Never';
 			}
 		}

From 313d29e677f8940a6d35568aa43c04b333a7f0cc Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 24 Nov 2024 18:01:37 -0500
Subject: [PATCH 223/423] Allowing SVG reports to have background colors. 
 Closes #212

---
 docs                                          |  2 +-
 src/TouchPoint-WP/Report.php                  | 24 +++++++---
 src/TouchPoint-WP/Utilities/Database.php      | 45 +++++++++++++++++++
 .../Utilities/ImageConversions.php            | 15 ++++++-
 4 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 src/TouchPoint-WP/Utilities/Database.php

diff --git a/docs b/docs
index 4ddcde14..d99ffbf9 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 4ddcde146fa218887d0b60482b187a512fd1bd80
+Subproject commit d99ffbf9acd0da60003f3ee043afbb887b871554
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index e130c0d3..d3a9f284 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -9,6 +9,7 @@
 use DateTime;
 use Exception;
 use JsonSerializable;
+use tp\TouchPointWP\Utilities\Database;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\ImageConversions;
 use WP_Error;
@@ -255,13 +256,24 @@ public static function api(array $uri): bool
 							break;
 
 						case "svg.png":
-							$cached = get_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png", true);
+							$bgColor = $_GET['bg'] ?? null;
+
+							if ($bgColor !== null) {
+								$bgColor = strtolower($bgColor);
+								if (preg_match('/^[0-9a-f]{6}$/', $bgColor)) {
+									$bgColor = "#" . $bgColor;
+								}
+							}
+
+							$bgColorStr = ($bgColor === null) ? "" : "_$bgColor";
+
+							$cached = get_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png" . $bgColorStr, true);
 							if ($cached !== '') {
 								$content = base64_decode($cached);
 							} else {
 								try {
-									$content = ImageConversions::svgToPng($content);
-									update_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png", base64_encode($content));
+									$content = ImageConversions::svgToPng($content, $bgColor);
+									update_post_meta($r->getPost()->ID, self::META_PREFIX . "svg_png" . $bgColorStr, base64_encode($content));
 								} catch (TouchPointWP_Exception $e) {
 									http_response_code(Http::SERVICE_UNAVAILABLE);
 									echo $e->getMessage();
@@ -497,10 +509,8 @@ protected function submitUpdate()
 			return null;
 		}
 
-		// Clear the cached PNG if it exists.
-		if (get_post_meta($this->post->ID, self::META_PREFIX . "svg_png", true) !== '') {
-			update_post_meta($this->post->ID, self::META_PREFIX . "svg_png", '');
-		}
+		// Clear the cached PNGs if they exist.
+		Database::deletePostMetaByPrefix($this->post->ID, self::META_PREFIX . "svg_png");
 
 		return wp_update_post($this->post);
 	}
diff --git a/src/TouchPoint-WP/Utilities/Database.php b/src/TouchPoint-WP/Utilities/Database.php
new file mode 100644
index 00000000..e1851d4c
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/Database.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+if ( ! defined('ABSPATH')) {
+	exit(1);
+}
+
+/**
+ * Used for database actions that are relatively generic.
+ */
+abstract class Database
+{
+	/**
+	 * Deleted all post meta for a given post that starts with a given prefix.
+	 *
+	 * @param int    $postId
+	 * @param string $prefix
+	 *
+	 * @return bool
+	 */
+	public static function deletePostMetaByPrefix(int $postId, string $prefix): bool
+	{
+		global $wpdb;
+
+		// Get all meta keys for the given post
+		$meta_keys = $wpdb->get_col(
+			$wpdb->prepare(
+				"SELECT meta_key FROM $wpdb->postmeta WHERE post_id = %d AND meta_key LIKE %s",
+				$postId,
+				$wpdb->esc_like($prefix) . '%'
+			)
+		);
+
+		// Loop through each meta key and delete it
+		$success = true;
+		foreach ($meta_keys as $meta_key) {
+			$success *= delete_post_meta($postId, $meta_key);
+		}
+		return $success;
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities/ImageConversions.php b/src/TouchPoint-WP/Utilities/ImageConversions.php
index 637b5d54..49c2c491 100644
--- a/src/TouchPoint-WP/Utilities/ImageConversions.php
+++ b/src/TouchPoint-WP/Utilities/ImageConversions.php
@@ -17,7 +17,7 @@ abstract class ImageConversions
 	 * @throws \ImagickException
 	 * @throws TouchPointWP_Exception
 	 */
-	public static function svgToPng($svgContent): string
+	public static function svgToPng($svgContent, ?string $backgroundColor = null): string
 	{
 		$svg = new DOMDocument();
 		$svg->loadXML($svgContent);
@@ -36,7 +36,18 @@ public static function svgToPng($svgContent): string
 
 		$im = new \Imagick();
 		$im->setResolution(300, 300);
-		$im->setBackgroundColor(new \ImagickPixel('transparent'));
+
+		if (!empty($backgroundColor)) {
+			try {
+				$pxColor = new \ImagickPixel($backgroundColor);
+				$im->setBackgroundColor($pxColor);
+			} catch (\ImagickPixelException) {
+				$im->setBackgroundColor(new \ImagickPixel('transparent'));
+			}
+		} else {
+			$im->setBackgroundColor(new \ImagickPixel('transparent'));
+		}
+
 		$im->readImageBlob($svg->saveXML());
 
 		$im->setImageAlphaChannel(\Imagick::ALPHACHANNEL_ACTIVATE);

From f9e994ae8d5d730224f60e3f3febb8409a72ba4c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 28 Nov 2024 14:02:32 -0500
Subject: [PATCH 224/423] Provide a non-empty response to this API endpoint.

---
 src/TouchPoint-WP/Stats.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index ff9f9d1c..914f1fc5 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -284,6 +284,7 @@ protected function submitStats(): void
 			'timeout' => 10,
 			'blocking' => false,
 		]);
+		echo "ok";
 	}
 
 	/**
@@ -435,7 +436,7 @@ public static function handleSubmission(): bool
 			return false;
 		}
 
-        echo $r;
+		echo $r;
 		return true;
 	}
 }
\ No newline at end of file

From 3a230bd216b155d556e08ee6cd435ad31f08c217 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 28 Nov 2024 14:15:57 -0500
Subject: [PATCH 225/423] Add site logo in reported stats, add a filter to
 prevent or adjust reporting, and update docs/i18n.

---
 docs                                        |   2 +-
 i18n/TouchPoint-WP-es_ES.po                 | 102 ++++++++++----------
 i18n/TouchPoint-WP.pot                      |  92 +++++++++---------
 src/TouchPoint-WP/Stats.php                 |  21 +++-
 src/TouchPoint-WP/TouchPointWP.php          |   1 +
 src/TouchPoint-WP/TouchPointWP_Settings.php |   4 +-
 6 files changed, 121 insertions(+), 101 deletions(-)

diff --git a/docs b/docs
index d99ffbf9..2b93d032 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit d99ffbf9acd0da60003f3ee043afbb887b871554
+Subproject commit 2b93d032d2306cca5631e7f30f9665825b8eafb8
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index abb41fe6..9a201c6e 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -314,38 +314,38 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2030
+#: src/TouchPoint-WP/TouchPointWP.php:2031
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2087
+#: src/TouchPoint-WP/TouchPointWP.php:2088
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2090
+#: src/TouchPoint-WP/TouchPointWP.php:2091
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2093
+#: src/TouchPoint-WP/TouchPointWP.php:2094
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2098
 #: src/TouchPoint-WP/TouchPointWP.php:2099
+#: src/TouchPoint-WP/TouchPointWP.php:2100
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2216
-#: src/TouchPoint-WP/TouchPointWP.php:2252
+#: src/TouchPoint-WP/TouchPointWP.php:2217
+#: src/TouchPoint-WP/TouchPointWP.php:2253
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2266
-#: src/TouchPoint-WP/TouchPointWP.php:2310
+#: src/TouchPoint-WP/TouchPointWP.php:2267
+#: src/TouchPoint-WP/TouchPointWP.php:2311
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2442
+#: src/TouchPoint-WP/TouchPointWP.php:2443
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -809,7 +809,7 @@ msgid "Save Settings"
 msgstr "Guardar ajustes"
 
 #: src/TouchPoint-WP/Person.php:1451
-#: src/TouchPoint-WP/Utilities.php:285
+#: src/TouchPoint-WP/Utilities.php:286
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
@@ -972,7 +972,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2383
+#: src/TouchPoint-WP/TouchPointWP.php:2384
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1040,72 +1040,72 @@ msgstr "Años"
 msgid "Genders"
 msgstr "Géneros"
 
-#: src/TouchPoint-WP/Utilities.php:135
+#: src/TouchPoint-WP/Utilities.php:136
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr "los domingos"
 
-#: src/TouchPoint-WP/Utilities.php:136
+#: src/TouchPoint-WP/Utilities.php:137
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr "los lunes"
 
-#: src/TouchPoint-WP/Utilities.php:137
+#: src/TouchPoint-WP/Utilities.php:138
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr "los martes"
 
-#: src/TouchPoint-WP/Utilities.php:138
+#: src/TouchPoint-WP/Utilities.php:139
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr "los miércoles"
 
-#: src/TouchPoint-WP/Utilities.php:139
+#: src/TouchPoint-WP/Utilities.php:140
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr "los jueves"
 
-#: src/TouchPoint-WP/Utilities.php:140
+#: src/TouchPoint-WP/Utilities.php:141
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr "los viernes"
 
-#: src/TouchPoint-WP/Utilities.php:141
+#: src/TouchPoint-WP/Utilities.php:142
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr "los sábados"
 
-#: src/TouchPoint-WP/Utilities.php:187
+#: src/TouchPoint-WP/Utilities.php:188
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr "Dom"
 
-#: src/TouchPoint-WP/Utilities.php:188
+#: src/TouchPoint-WP/Utilities.php:189
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr "Lun"
 
-#: src/TouchPoint-WP/Utilities.php:189
+#: src/TouchPoint-WP/Utilities.php:190
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr "Mar"
 
-#: src/TouchPoint-WP/Utilities.php:190
+#: src/TouchPoint-WP/Utilities.php:191
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr "Mié"
 
-#: src/TouchPoint-WP/Utilities.php:191
+#: src/TouchPoint-WP/Utilities.php:192
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr "Jue"
 
-#: src/TouchPoint-WP/Utilities.php:192
+#: src/TouchPoint-WP/Utilities.php:193
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr "Vie"
 
-#: src/TouchPoint-WP/Utilities.php:193
+#: src/TouchPoint-WP/Utilities.php:194
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
@@ -1163,37 +1163,37 @@ msgstr "Ubicaciones"
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
-#: src/TouchPoint-WP/Utilities.php:235
+#: src/TouchPoint-WP/Utilities.php:236
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr "Tarde en la noche"
 
-#: src/TouchPoint-WP/Utilities.php:237
+#: src/TouchPoint-WP/Utilities.php:238
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr "Madrugada"
 
-#: src/TouchPoint-WP/Utilities.php:239
+#: src/TouchPoint-WP/Utilities.php:240
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr "Mañana"
 
-#: src/TouchPoint-WP/Utilities.php:241
+#: src/TouchPoint-WP/Utilities.php:242
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr "Mediodía"
 
-#: src/TouchPoint-WP/Utilities.php:243
+#: src/TouchPoint-WP/Utilities.php:244
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: src/TouchPoint-WP/Utilities.php:245
+#: src/TouchPoint-WP/Utilities.php:246
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr "Tardecita"
 
-#: src/TouchPoint-WP/Utilities.php:247
+#: src/TouchPoint-WP/Utilities.php:248
 msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
@@ -1225,7 +1225,7 @@ msgstr "restablecer el mapa"
 #: src/TouchPoint-WP/Involvement.php:1027
 #: src/TouchPoint-WP/Involvement.php:1120
 #: src/TouchPoint-WP/Involvement.php:1144
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:67
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:71
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
 msgid "%1$s at %2$s"
@@ -1293,7 +1293,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1032
+#: src/TouchPoint-WP/TouchPointWP.php:1033
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1411,16 +1411,16 @@ msgstr "Agregar Nuevo %s"
 msgid "New %s"
 msgstr "Nuevo %s"
 
-#: src/TouchPoint-WP/Report.php:176
+#: src/TouchPoint-WP/Report.php:177
 msgid "TouchPoint Reports"
 msgstr "Informes de TouchPoint"
 
-#: src/TouchPoint-WP/Report.php:177
+#: src/TouchPoint-WP/Report.php:178
 msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:405
+#: src/TouchPoint-WP/Report.php:417
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
@@ -1566,7 +1566,7 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:496
+#: src/TouchPoint-WP/Utilities.php:497
 msgid "Expand"
 msgstr "Ampliar"
 
@@ -1814,7 +1814,7 @@ msgstr "Campus"
 msgid "All Day"
 msgstr "todo el dia"
 
-#: src/TouchPoint-WP/Utilities.php:290
+#: src/TouchPoint-WP/Utilities.php:291
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1827,14 +1827,6 @@ msgstr "Clave API de ipapi.co"
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
-msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP"
-msgstr "Permitir que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio/iglesia como usuarios de TouchPoint-WP"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
-msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
-msgstr "Ayuda a otras iglesias potenciales a ver lo que se puede hacer combinando WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
-
 #: src/templates/admin/invKoForm.php:60
 msgid "Import Campuses"
 msgstr "Importar Campus"
@@ -1847,15 +1839,15 @@ msgstr "Todos los campus"
 msgid "(No Campus)"
 msgstr "(Sin campus)"
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:37
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:39
 msgid "TouchPoint-WP Status"
 msgstr "Estado de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:92
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:96
 msgid "Imported"
 msgstr "Importadas"
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:93
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:97
 msgid "Last Updated"
 msgstr "Actualizada"
 
@@ -1871,3 +1863,11 @@ msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se a
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
 msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días en el pasado. Una vez que un evento tenga más de esta cantidad de días, se eliminará."
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
+msgid "List Site in Directory"
+msgstr "Listar sitio en directorio"
+
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
+msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 977622c1..92ee09b7 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-22T18:07:49+00:00\n"
+"POT-Creation-Date: 2024-11-28T19:12:52+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -361,7 +361,7 @@ msgstr ""
 #: src/TouchPoint-WP/Involvement.php:1027
 #: src/TouchPoint-WP/Involvement.php:1120
 #: src/TouchPoint-WP/Involvement.php:1144
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:67
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:71
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
 msgid "%1$s at %2$s"
@@ -572,7 +572,7 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1032
+#: src/TouchPoint-WP/TouchPointWP.php:1033
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -619,7 +619,7 @@ msgid "Person in %s"
 msgstr ""
 
 #: src/TouchPoint-WP/Person.php:1451
-#: src/TouchPoint-WP/Utilities.php:285
+#: src/TouchPoint-WP/Utilities.php:286
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
@@ -637,16 +637,16 @@ msgstr ""
 msgid "You may need to sign in."
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:176
+#: src/TouchPoint-WP/Report.php:177
 msgid "TouchPoint Reports"
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:177
+#: src/TouchPoint-WP/Report.php:178
 msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:405
+#: src/TouchPoint-WP/Report.php:417
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
@@ -745,42 +745,42 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2030
+#: src/TouchPoint-WP/TouchPointWP.php:2031
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2087
+#: src/TouchPoint-WP/TouchPointWP.php:2088
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2090
+#: src/TouchPoint-WP/TouchPointWP.php:2091
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2093
+#: src/TouchPoint-WP/TouchPointWP.php:2094
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2098
 #: src/TouchPoint-WP/TouchPointWP.php:2099
+#: src/TouchPoint-WP/TouchPointWP.php:2100
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2216
-#: src/TouchPoint-WP/TouchPointWP.php:2252
+#: src/TouchPoint-WP/TouchPointWP.php:2217
+#: src/TouchPoint-WP/TouchPointWP.php:2253
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2266
-#: src/TouchPoint-WP/TouchPointWP.php:2310
+#: src/TouchPoint-WP/TouchPointWP.php:2267
+#: src/TouchPoint-WP/TouchPointWP.php:2311
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2383
+#: src/TouchPoint-WP/TouchPointWP.php:2384
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2442
+#: src/TouchPoint-WP/TouchPointWP.php:2443
 msgid "People Query Failed"
 msgstr ""
 
@@ -921,11 +921,11 @@ msgid "Optional. Allows for geolocation of user IP addresses.  This generally wi
 msgstr ""
 
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:444
-msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP"
+msgid "List Site in Directory"
 msgstr ""
 
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:445
-msgid "Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
+msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
 #: src/TouchPoint-WP/TouchPointWP_Settings.php:463
@@ -1417,129 +1417,129 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:37
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:39
 msgid "TouchPoint-WP Status"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:92
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:96
 msgid "Imported"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:93
+#: src/TouchPoint-WP/TouchPointWP_Widget.php:97
 msgid "Last Updated"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:135
+#: src/TouchPoint-WP/Utilities.php:136
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:136
+#: src/TouchPoint-WP/Utilities.php:137
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:137
+#: src/TouchPoint-WP/Utilities.php:138
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:138
+#: src/TouchPoint-WP/Utilities.php:139
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:139
+#: src/TouchPoint-WP/Utilities.php:140
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:140
+#: src/TouchPoint-WP/Utilities.php:141
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:141
+#: src/TouchPoint-WP/Utilities.php:142
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:187
+#: src/TouchPoint-WP/Utilities.php:188
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:188
+#: src/TouchPoint-WP/Utilities.php:189
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:189
+#: src/TouchPoint-WP/Utilities.php:190
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:190
+#: src/TouchPoint-WP/Utilities.php:191
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:191
+#: src/TouchPoint-WP/Utilities.php:192
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:192
+#: src/TouchPoint-WP/Utilities.php:193
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:193
+#: src/TouchPoint-WP/Utilities.php:194
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:235
+#: src/TouchPoint-WP/Utilities.php:236
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:237
+#: src/TouchPoint-WP/Utilities.php:238
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:239
+#: src/TouchPoint-WP/Utilities.php:240
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:241
+#: src/TouchPoint-WP/Utilities.php:242
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:243
+#: src/TouchPoint-WP/Utilities.php:244
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:245
+#: src/TouchPoint-WP/Utilities.php:246
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:247
+#: src/TouchPoint-WP/Utilities.php:248
 msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:290
+#: src/TouchPoint-WP/Utilities.php:291
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:496
+#: src/TouchPoint-WP/Utilities.php:497
 msgid "Expand"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 914f1fc5..28d38f0e 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -261,6 +261,7 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 		$data['wpTimezone'] = get_option('timezone_string');
 		$data['adminEmail'] = get_option('admin_email');
 		$data['siteName'] = get_bloginfo('name');
+		$data['siteLogoUrl'] = esc_url( wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' )[0] );
 		$data['listPublicly'] = 1 * ($sets->enable_public_listing === 'on');
 		$data['installId'] = $this->installId;
 		$data['privateKey'] = $this->privateKey;
@@ -279,7 +280,25 @@ protected function submitStats(): void
 
 		$data = $this->getStatsForSubmission();
 
-		wp_remote_post(self::SUBMISSION_ENDPOINT, [
+		/**
+		 * This plugin is designed to be used by other churches, but to help troubleshoot and understand usage, some
+		 * basic statistics are sent back to Tenth.  This filter allows you to change the endpoint to which the data is
+		 * sent, which may be necessary if you have a proxy system setup.  It also allows you to disable the sending of
+		 * all information back to Tenth by setting the value to an empty string.
+		 *
+		 * The URL must use https.
+		 *
+		 * @since 0.0.96 Added
+		 *
+		 * @param string $endpoint The endpoint value to use.
+		 */
+		$endpoint = (string)apply_filters('tp_stats_endpoint', self::SUBMISSION_ENDPOINT);
+
+		if ( ! str_starts_with($endpoint, 'https://')) {
+			return;
+		}
+
+		wp_remote_post($endpoint, [
 			'body' => ['data' => $data],
 			'timeout' => 10,
 			'blocking' => false,
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index c89c99b7..3f114957 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -672,6 +672,7 @@ protected function createTables(): void
 				wpTimezone varchar(50) NOT NULL,
 				adminEmail varchar(255) NOT NULL,
 				siteName varchar(255) NOT NULL,
+				siteLogo varchar(512) NOT NULL,
 				createdDT datetime DEFAULT NOW(),
 				updatedDT datetime DEFAULT NOW() ON UPDATE NOW(),
 				
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 71162a74..c203c7ac 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -441,9 +441,9 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_public_listing',
-					'label'       => __('Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP', 'TouchPoint-WP'),
+					'label'       => __('List Site in Directory', 'TouchPoint-WP'),
 					'description' => __(
-						"Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet.",
+						"Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet.",
 						'TouchPoint-WP'
 					),
 					'type'        => 'checkbox',

From e4e0010eb0b8fc608642acd9c5c0ebd638c0cdfa Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 28 Nov 2024 14:32:49 -0500
Subject: [PATCH 226/423] Hook documentation improvements

---
 docs                                        |  2 +-
 src/TouchPoint-WP/Involvement.php           |  9 +++++++--
 src/TouchPoint-WP/Partner.php               | 17 ++++++++++++++---
 src/TouchPoint-WP/Report.php                |  6 ++++--
 src/TouchPoint-WP/Stats.php                 |  4 +++-
 src/TouchPoint-WP/TouchPointWP.php          | 10 ++++++++--
 src/TouchPoint-WP/TouchPointWP_Settings.php |  2 ++
 src/TouchPoint-WP/Utilities.php             | 17 ++++++++++-------
 src/TouchPoint-WP/Utilities/DateFormats.php |  2 +-
 9 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/docs b/docs
index 2b93d032..01f959fa 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 2b93d032d2306cca5631e7f30f9665825b8eafb8
+Subproject commit 01f959faa7b2ef2c2307d6aef36454a2be2466b1
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 7d1b242c..119d3c2d 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -436,6 +436,9 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 	 */
 	public static function templateFilter(string $template): string
 	{
+		$className = self::class;
+		$useTemplates = true;
+
 		/**
 		 * Determines whether the plugin's default templates should be used.  Theme developers can return false in this
 		 * filter to prevent the default templates from applying, especially if they conflict with the theme.
@@ -447,7 +450,7 @@ public static function templateFilter(string $template): string
 		 * @param bool $value The value to return.  True will allow the default templates to be applied.
 		 * @param string $className The name of the class calling for the template.
 		 */
-		if (!!apply_filters('tp_use_default_templates', true, self::class)) {
+		if (!!apply_filters('tp_use_default_templates', $useTemplates, $className)) {
 			$postTypesToFilter        = Involvement_PostTypeSettings::getPostTypes();
 			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
@@ -3891,6 +3894,8 @@ private static function ajaxInvJoin(): void
 	 */
 	protected static function allowContact(string $invType): bool
 	{
+		$allowed = true;
+
 		/**
 		 * Determines whether contact of any kind is allowed.  This is meant to prevent abuse in contact forms by
 		 * removing the ability to contact people and thereby hiding the forms.
@@ -3899,7 +3904,7 @@ protected static function allowContact(string $invType): bool
 		 *
 		 * @param bool $allowed True if contact is allowed.
 		 */
-		$allowed = !!apply_filters('tp_allow_contact', true);
+		$allowed = !!apply_filters('tp_allow_contact', $allowed);
 
 		/**
 		 * Determines whether contact is allowed for any Involvements.  This is called *after* tp_allow_contact, and
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 943d86c9..275c4851 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -563,18 +563,24 @@ public static function updateFromTouchPoint(bool $verbose = false)
 	 */
 	public static function templateFilter(string $template): string
 	{
+		$className = self::class;
+		$useTemplates = true;
+
 		/**
 		 * Determines whether the plugin's default templates should be used.  Theme developers can return false in this
 		 * filter to prevent the default templates from applying, especially if they conflict with the theme.
 		 *
 		 * Default is true.
 		 *
-		 * @since 0.0.6 Added
+		 *  TODO merge with the same filter in Involvement
 		 *
 		 * @param bool $value The value to return.  True will allow the default templates to be applied.
 		 * @param string $className The name of the class calling for the template.
+		 *
+		 *@since 0.0.6 Added
+		 *
 		 */
-		if (!!apply_filters('tp_use_default_templates', true, self::class)) {
+		if (!!apply_filters('tp_use_default_templates', $useTemplates, $className)) {
 			$postTypesToFilter        = self::POST_TYPE;
 			$templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE;
 
@@ -685,6 +691,9 @@ public static function listShortcode($params = [], string $content = ""): string
 		}
 		$params = array_change_key_case($params, CASE_LOWER);
 
+		$useCss = true;
+		$className = self::class;
+
 		// set some defaults
 		/** @noinspection SpellCheckingInspection */
 		$params = shortcode_atts(
@@ -697,10 +706,12 @@ public static function listShortcode($params = [], string $content = ""): string
 				 *
 				 * @since 0.0.15 Added
 				 *
+				 * TODO merge with the same filter in Involvement
+				 *
 				 * @param bool $useCss Whether or not to include the default CSS.  True = include
 				 * @param string $className The name of the current calling class.
 				 */
-				'includecss' => apply_filters('tp_use_css', true, self::class),
+				'includecss' => apply_filters('tp_use_css', $useCss, $className),
 				'itemclass'  => self::$itemClass,
 			],
 			$params,
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index d3a9f284..af3ac4a5 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -394,13 +394,15 @@ public static function reportShortcode($params = [], string $content = ""): stri
 		// Add Figure elt with a unique ID
 		$idAttr = "id=\"" . wp_unique_id('tp-report-') . "\"";
 
+		$class = self::$classDefault;
+
 		/**
 		 * Filter the class name to be used for the displaying the report.
 		 *
-		 * @param string $className The class name to be used.
+		 * @param string $class The class name to be used.
 		 * @param Report $report The report being displayed.
 		 */
-		$class = apply_filters("tp_rpt_figure_class", self::$classDefault, $report);
+		$class = apply_filters("tp_rpt_figure_class", $class, $report);
 
 		$permalink = esc_attr(get_post_permalink($report->getPost()));
 
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 28d38f0e..76d476af 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -280,6 +280,8 @@ protected function submitStats(): void
 
 		$data = $this->getStatsForSubmission();
 
+		$endpoint = self::SUBMISSION_ENDPOINT;
+
 		/**
 		 * This plugin is designed to be used by other churches, but to help troubleshoot and understand usage, some
 		 * basic statistics are sent back to Tenth.  This filter allows you to change the endpoint to which the data is
@@ -292,7 +294,7 @@ protected function submitStats(): void
 		 *
 		 * @param string $endpoint The endpoint value to use.
 		 */
-		$endpoint = (string)apply_filters('tp_stats_endpoint', self::SUBMISSION_ENDPOINT);
+		$endpoint = (string)apply_filters('tp_stats_endpoint', $endpoint);
 
 		if ( ! str_starts_with($endpoint, 'https://')) {
 			return;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 3f114957..70eef512 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -978,12 +978,15 @@ public static function requireScript(string $name = null): void
 	public static function requireStyle(string $name = null): void
 	{
 		$filename = strtolower($name);
+		
+		$includeStyle = true;
+		
 		/**
 		 * Filter to determine if a given stylesheet (which comes with TouchPoint-WP) should be included.
 		 *
 		 * @params bool $include Whether to include the stylesheet.
 		 */
-		if ( ! apply_filters("tp_include_style_$filename", true)) {
+		if ( ! apply_filters("tp_include_style_$filename", $includeStyle)) {
 			return;
 		}
 
@@ -2541,12 +2544,15 @@ public static function enqueuePartialsStyle(): void
 	 */
 	public static function enqueueActionsStyle(string $action): void
 	{
+		$includeActionsStyle = true;
+
 		/**
 		 * Filter to determine if the stylesheet that adjusts SWAL and other action-related items should be included.
 		 *
 		 * @params bool $include Whether to include the styles.  Default true = include.
+		 * @params string $action The action that is being performed.
 		 */
-		$includeActionsStyle = !!apply_filters("tp_include_actions_style", true, $action);
+		$includeActionsStyle = !!apply_filters("tp_include_actions_style", $includeActionsStyle, $action);
 		if ($includeActionsStyle) {
 			wp_enqueue_style(
 				TouchPointWP::SHORTCODE_PREFIX . 'actions-style',
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index c203c7ac..42a427c5 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1260,6 +1260,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 		 * Adjust the settings array before it's returned.
 		 *
 		 * @since 0.0.90 Added
+		 *
+		 * @params array $this->settings The settings array.
 		 */
 		$this->settings = apply_filters('tp_settings_fields', $this->settings);
 
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index a05b41b6..037fa398 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -357,18 +357,20 @@ public static function getPostContentWithShortcode($shortcode): array
 	 */
 	public static function getColorFor(string $itemName, string $setName): string
 	{
+		$current = null;
+
 		/**
 		 * Allows for a custom color function to assign a color for a given value.
 		 *
 		 * @since 0.0.90 Added
 		 *
-		 * @param mixed $current The current value.  Null is provided to the function because the color hasn't otherwise been determined yet.
+		 * @param ?string $current The current value.  Null is provided to the function because the color hasn't otherwise been determined yet.
 		 * @param string $itemName The name of the current item.
 		 * @param string $setName The name of the set to which the item belongs.
 		 *
-		 * @return string|null The color in hex, starting with '#'.  Null to defer to the default color assignment.
+		 * @return ?string The color in hex, starting with '#'.  Null to defer to the default color assignment.
 		 */
-		$r = apply_filters('tp_custom_color_function', null, $itemName, $setName);
+		$r = apply_filters('tp_custom_color_function', $current, $itemName, $setName);
 		if ($r !== null)
 			return $r;
 
@@ -386,6 +388,7 @@ public static function getColorFor(string $itemName, string $setName): string
 			self::$colorAssignments[$setName][] = $itemName;
 		}
 
+		$array = [];
 		/**
 		 * Allows for a custom color set to be used for color assignment to match branding. This filter should return an
 		 * array of colors in hex format, starting with '#'.  The colors will be assigned in order, but it is not
@@ -394,10 +397,10 @@ public static function getColorFor(string $itemName, string $setName): string
 		 *
 		 * @since 0.0.90 Added
 		 *
-		 * @param string[] $array The array of colors in hex format, starting with '#'.
+		 * @param string[] $array The array of colors in hex format strings, starting with '#'.
 		 * @param string $setName The name of the set for which the colors are needed.
 		 */
-		$colorSet = apply_filters('tp_custom_color_set', [], $setName);
+		$colorSet = apply_filters('tp_custom_color_set', $array, $setName);
 
 		if (count($colorSet) > 0) {
 			return $colorSet[$idx % count($colorSet)];
@@ -678,7 +681,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		 * @return string The standardized HTML.
 		 */
 		$html      = apply_filters('tp_pre_standardize_html', $html, $context);
-
+		$maxHeader = 2;
 
 		/**
 		 * The maximum header level to allow in an HTML string.  Default is 2.
@@ -690,7 +693,7 @@ public static function standardizeHtml(?string $html, ?string $context = null):
 		 *
 		 * @return int The maximum header level to allow in the HTML.
 		 */
-		$maxHeader = intval(apply_filters('tp_standardize_h_tags_max_h', 2, $context));
+		$maxHeader = intval(apply_filters('tp_standardize_h_tags_max_h', $maxHeader, $context));
 
 		$allowedTags = [
 			'p', 'br', 'a', 'em', 'strong', 'b', 'i', 'u', 'hr', 'ul', 'ol', 'li',
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 25cf8ea6..5de1ea25 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -98,7 +98,7 @@ public static function TimeRangeStringFormatted(DateTimeInterface $startDt, Date
 		 * @param string            $startStr The start string, with default formatting.
 		 * @param string            $endStr The end string, with default formatting
 		 * @param DateTimeInterface $startDt The DateTimeInterface object for the start.
-		 * @param DateTimeInterface $endDt The DateTimeInterface object for the $end.
+		 * @param DateTimeInterface $endDt The DateTimeInterface object for the end.
 		 */
 		return apply_filters('tp_adjust_time_range_string', $ts, $startStr, $endStr, $startDt, $endDt);
 	}

From 1bee5368c5b6afe0cbb8a65124bdddf9070ce930 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 1 Dec 2024 08:06:24 -0500
Subject: [PATCH 227/423] Correcting issue with Report sync.

---
 src/TouchPoint-WP/Report.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index af3ac4a5..c2a43118 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -26,6 +26,7 @@
 	require_once "storedAsPost.php";
 	require_once "Utilities/ImageConversions.php";
 	require_once "Utilities/Http.php";
+	require_once "Utilities/Database.php";
 }
 
 /**

From 04b90186de75eb35d0fa41910fd8f26a55ecf5be Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 1 Dec 2024 17:43:05 -0500
Subject: [PATCH 228/423] Syntactic items in Report.php

---
 src/TouchPoint-WP/Report.php | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index c2a43118..013973be 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -240,12 +240,18 @@ public static function api(array $uri): bool
 				case "py":
 					TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
 
-					$r = Report::fromParams([
-						                        'type'     => 'python',
-						                        'name'     => $filename,
-						                        'p1'       => $_GET['p1'] ?? ''
-					                        ]);
-					$content = $r->content();
+					try {
+						$r       = Report::fromParams([
+							                              'type' => 'python',
+							                              'name' => $filename,
+							                              'p1'   => $_GET['p1'] ?? ''
+						                              ]);
+						$content = $r->content();
+					} catch (TouchPointWP_Exception) {
+						http_response_code(Http::SERVER_ERROR);
+						exit;
+					}
+
 					if ($content === self::DEFAULT_CONTENT) {
 						http_response_code(Http::NOT_FOUND);
 						exit;
@@ -300,11 +306,16 @@ public static function api(array $uri): bool
 				case "sql":
 					TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
 					header("Cache-Control: max-age=3600, must-revalidate, public");
+					try {
 					$r = Report::fromParams([
 						                        'type'     => 'sql',
 						                        'name'     => $filename,
 						                        'p1'       => $_GET['p1'] ?? ''
 					                        ]);
+					} catch (TouchPointWP_Exception) {
+						http_response_code(Http::SERVER_ERROR);
+						exit;
+					}
 					$content = $r->content();
 					if ($content === self::DEFAULT_CONTENT) {
 						http_response_code(Http::NOT_FOUND);
@@ -353,8 +364,9 @@ protected function title(): string
 	 *
 	 * @return string
 	 */
-	public static function reportShortcode($params = [], string $content = ""): string
+	public static function reportShortcode(mixed $params = [], string $content = ""): string
 	{
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
 		$params = array_change_key_case($params, CASE_LOWER);
 
 		$params = shortcode_atts(
@@ -506,7 +518,7 @@ public function getPost(bool $create = false): ?WP_Post
 	 *
 	 * @return int|WP_Error|null
 	 */
-	protected function submitUpdate()
+	protected function submitUpdate(): int|null|WP_Error
 	{
 		if ( ! $this->getPost()) {
 			return null;
@@ -597,7 +609,7 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 		foreach ($updates as $u) {
 			try {
 				$report = self::fromParams($u);
-			} catch (TouchPointWP_Exception $e) {
+			} catch (TouchPointWP_Exception) {
 				continue;
 			}
 
@@ -726,7 +738,7 @@ public static function updateCron(): void
 			if ( ! $forked) {
 				self::updateFromTouchPoint();
 			}
-		} catch (Exception $ex) {
+		} catch (Exception) {
 		}
 	}
 

From 53829c189ee162b6a6a1a7e77ae1d98288c0a002 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 2 Dec 2024 13:33:25 -0500
Subject: [PATCH 229/423] Making ids clearer

---
 src/TouchPoint-WP/Involvement.php |  2 +-
 src/TouchPoint-WP/Meeting.php     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 119d3c2d..eca5de62 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -754,7 +754,7 @@ protected static function scheduleStrings(int $invId, $inv = null): ?array
 	 * This is separated out to a static method to prevent involvement from being instantiated (with those database
 	 * hits) when the content is cached.  (10x faster or more)
 	 *
-	 * @param int          $objId
+	 * @param int          $objId  Involvement Id.
 	 * @param ?Involvement $obj
 	 *
 	 * @return ?string
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index df97ecf5..9b9052b2 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -183,6 +183,16 @@ protected function __construct(object $object)
 		$this->registerConstruction();
 	}
 
+	/**
+	 * Get the Meeting ID.
+	 *
+	 * @return int
+	 */
+	public function mtgId(): int
+	{
+		return $this->mtgId;
+	}
+
 
 	/**
 	 * Create a Meeting object from a Meeting ID.  Only Meetings that are already imported as Posts are currently

From 30d2f0ab812ef86c743799507358ad999eba5a90 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 3 Dec 2024 14:56:55 -0500
Subject: [PATCH 230/423] Dealing with bug in stats logo submission.

---
 src/TouchPoint-WP/Stats.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 76d476af..b00d5934 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -261,7 +261,12 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 		$data['wpTimezone'] = get_option('timezone_string');
 		$data['adminEmail'] = get_option('admin_email');
 		$data['siteName'] = get_bloginfo('name');
-		$data['siteLogoUrl'] = esc_url( wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' )[0] );
+		$data['siteLogoUrl'] = get_theme_mod('custom_logo');
+		if ($data['siteLogoUrl']) {
+			$data['siteLogoUrl'] = esc_url(wp_get_attachment_image_src($data['siteLogoUrl'], 'full')[0]);
+		} else {
+			$data['siteLogoUrl'] = '';
+		}
 		$data['listPublicly'] = 1 * ($sets->enable_public_listing === 'on');
 		$data['installId'] = $this->installId;
 		$data['privateKey'] = $this->privateKey;

From 70c6c17ea748e3c9f5212eaa5a907e4d42b94fe5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 19 Dec 2024 22:39:39 -0500
Subject: [PATCH 231/423] Fixes issue calculating calendar range.  Closes #215.
  Possibly related to #207.

---
 src/TouchPoint-WP/CalendarGrid.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index ff2aabac..e551f3df 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -74,7 +74,9 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 				$d = new DateTime('now', $tz);
 				$d = new DateTime($d->format('Y-m-01 00:00:00'), $tz);
 			} else {
-				$d = new DateTime("$year-$month-01", $tz);
+				$d = new DateTime(null, $tz);
+				$d->setDate($year, $month, 1);
+				$d->setTime(0, 0);
 			}
 		} catch (Exception $e) {
 			$this->html = "<!-- Could not create calendar grid because an exception occurred: {$e->getMessage()} -->";
@@ -88,6 +90,12 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 
 		// Get the day of the week for the first day of the month (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
 		$offsetDays = intval($d->format('w')); // w: Numeric representation of the day of the week
+
+		// Extra days at the end of the month
+		$daysInMonth = intval($d->format('t'));
+		$daysToShow = 7 * ceil(($daysInMonth + $offsetDays) / 7);
+		
+		// Set start of range to be before the offset
 		try {
 			$d->modify("-$offsetDays days");
 		} catch (Exception) { // Exception is not feasible.
@@ -95,10 +103,6 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		$d->setTimezone($tz);
 		$r = "";
 
-		// Extra days at the end of the month
-		$daysInMonth = intval($d->format('t'));
-		$daysToShow = ((42 - $daysInMonth - $offsetDays) % 7) + $daysInMonth;
-
 		// Create a table to display the calendar
 		$r .= '<div class="calGrid">';
 		foreach (Utilities::getDaysOfWeekShort() as $dayStr) {

From 6f3a4c6046b32df99f94f0e499fbb8b1d8d8db99 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 21 Jan 2025 17:30:58 -0500
Subject: [PATCH 232/423] Resolve an issue where involvements aren't
 instantiated in JS for maps

---
 src/TouchPoint-WP/Involvement.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index eca5de62..3ab60c86 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2419,6 +2419,12 @@ public static function mapShortcode($params = [], string $content = ""): string
 			if ($params['all']) {
 				self::requireAllObjectsInJs();
 				self::$_hasArchiveMap = true;
+			} else {
+				// enqueue this object for js instantiation
+				$post = get_post();
+				if ($post) {
+					self::fromPost($post)?->enqueueForJsInstantiation();
+				}
 			}
 
 			$script = file_get_contents(TouchPointWP::$dir . "/src/js-partials/involvement-map-inline.js");

From ff6bda5e386064a5f284453b577e3debb89283b1 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Feb 2025 10:24:45 -0500
Subject: [PATCH 233/423] Adding a method that confirms if post matches a class

---
 src/TouchPoint-WP/Involvement.php     | 18 +++++++++++++++---
 src/TouchPoint-WP/Meeting.php         | 12 ++++++++++++
 src/TouchPoint-WP/Partner.php         | 12 ++++++++++++
 src/TouchPoint-WP/PostTypeCapable.php | 10 ++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 3ab60c86..e5d22d5d 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3021,7 +3021,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 	}
 
 	/**
-	 * @param \WP_Post|object              $post  The parent post, which could be a group or Meeting.
+	 * @param WP_Post|object               $post  The parent post, which could be a group or Meeting.
 	 * @param object                       $inv   The involvement object from the API.
 	 * @param Involvement_PostTypeSettings $typeSets
 	 * @param int                          $imagePostId
@@ -3837,15 +3837,27 @@ public function getTouchPointId(): int
 	/**
 	 * Indicates if the given post can be instantiated as an Involvement.
 	 *
-	 * @param \WP_Post $post
+	 * @param WP_Post $post
 	 *
 	 * @return bool
 	 */
-	public static function postIsType(\WP_Post $post): bool
+	public static function postIsType(WP_Post $post): bool
 	{
 		return intval(get_post_meta($post->ID, TouchPointWP::INVOLVEMENT_META_KEY, true)) > 0;
 	}
 
+	/**
+	 * Indicates if the given post type name is the post type for this class.
+	 *
+	 * @param string $postType
+	 *
+	 * @return bool
+	 */
+	public static function postTypeMatches(string $postType): bool
+	{
+		return str_starts_with($postType, "tp_inv_") || $postType == "tp_smallgroup" || $postType == "tp_course";
+	}
+
 	/**
 	 * Handles the API call to join an involvement through a 'join' button.
 	 */
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 9b9052b2..74359e11 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -799,6 +799,18 @@ public static function postIsType(WP_Post $post): bool
 		return intval(get_post_meta($post->ID, Meeting::MEETING_META_KEY, true)) > 0;
 	}
 
+	/**
+	 * Indicates if the given post type name is the post type for this class.
+	 *
+	 * @param string $postType
+	 *
+	 * @return bool
+	 */
+	public static function postTypeMatches(string $postType): bool
+	{
+		return $postType === self::POST_TYPE;
+	}
+
 	public static function load(): bool
 	{
 		if (self::$_isLoaded) {
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 275c4851..b395d6c5 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1456,6 +1456,18 @@ public static function postIsType(WP_Post $post): bool
 		return intval(get_post_meta($post->ID, self::FAMILY_META_KEY, true)) > 0;
 	}
 
+	/**
+	 * Indicates if the given post type name is the post type for this class.
+	 *
+	 * @param string $postType
+	 *
+	 * @return bool
+	 */
+	public static function postTypeMatches(string $postType): bool
+	{
+		return $postType === self::POST_TYPE;
+	}
+
 	/**
 	 * Serialize.  Mostly, manage the security requirements.
 	 *
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 8128e413..1c4bcd8b 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -122,6 +122,16 @@ public abstract function getActionButtons(string $context = null, string $btnCla
 	public static abstract function postIsType(WP_Post $post): bool;
 
 
+	/**
+	 * Indicates if the given post type name is the post type for this class.
+	 *
+	 * @param string $postType
+	 *
+	 * @return bool
+	 */
+	public static abstract function postTypeMatches(string $postType): bool;
+
+
 	/**
 	 * Gets a TouchPoint item ID number, regardless of what type of object this is.
 	 *

From 9f9aa83f7d5ffa27896ed4bd31522e62fb48d17a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Feb 2025 14:13:36 -0500
Subject: [PATCH 234/423] Resolve a null issue

---
 src/TouchPoint-WP/CalendarGrid.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index e551f3df..c742f1af 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -68,15 +68,14 @@ public function __construct(WP_Query $q, int $month = null, int $year = null)
 		try {
 			// Validate month & year; create $d as a day within the month
 			$tz = wp_timezone();
-			$month = intval($month);
+			$monthInt = intval($month);
+			$monthStr = substr("0$monthInt", -2);
 			$year  = intval($year);
-			if ($month < 1 || $month > 12 || $year < 2020 || $year > 2100) {
+			if ($monthInt < 1 || $monthInt > 12 || $year < 2020 || $year > 2100) {
 				$d = new DateTime('now', $tz);
 				$d = new DateTime($d->format('Y-m-01 00:00:00'), $tz);
 			} else {
-				$d = new DateTime(null, $tz);
-				$d->setDate($year, $month, 1);
-				$d->setTime(0, 0);
+				$d = new DateTime("$year-$monthStr-01 00:00:00", $tz);
 			}
 		} catch (Exception $e) {
 			$this->html = "<!-- Could not create calendar grid because an exception occurred: {$e->getMessage()} -->";

From 24d5523ec42b4524164ec8238bd9e8f0fc4c487f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 11 Feb 2025 10:29:12 -0500
Subject: [PATCH 235/423] Add rate limiting to IP API

---
 src/TouchPoint-WP/TouchPointWP.php          | 11 +++++++++++
 src/TouchPoint-WP/TouchPointWP_Settings.php |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 70eef512..7b282367 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1234,6 +1234,11 @@ protected function getIpData(string $ip, bool $useApi = true)
 			return false;
 		}
 
+		if (intval($this->settings->ipapi_ratelimit_exp) > time()) {
+			// Rate limited.
+			return false;
+		}
+
 		$ipapi_key = $this->settings->ipapi_key;
 		if ($ipapi_key !== "") {
 			$ipapi_key = [
@@ -1248,9 +1253,15 @@ protected function getIpData(string $ip, bool $useApi = true)
 		$return = $return['body'];
 
 		if (str_contains($return, 'Too many rapid requests')) {
+			$this->settings->set('ipapi_ratelimit_exp', time() + 10);  // defer for 10 seconds.
 			throw new TouchPointWP_Exception("IP Geolocation Error: Too many requests", 178001);
 		}
 
+		if (str_contains($return, 'RateLimited')) {
+			$this->settings->set('ipapi_ratelimit_exp', time() + 300);  // defer for 5 minutes.
+			throw new TouchPointWP_Exception("IP Geolocation Error: Rate Limited", 178001);
+		}
+
 		try {
 			json_decode($return, flags: JSON_THROW_ON_ERROR);
 		} catch (JsonException) {
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 42a427c5..312f5292 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -32,6 +32,7 @@
  * @property-read string       google_maps_api_key Google Maps API Key for embedded maps
  * @property-read string       google_geo_api_key Google Maps API Key for geocoding
  * @property-read string       ipapi_key          The API key for ipapi.co for geolocation.
+ * @property-read ?int         ipapi_ratelimit_exp The time at which the rate limit for ipapi.co will expire.
  *
  * @property-read string 	   enable_public_listing Whether to allow the site to be listed as using TouchPoint-WP
  *

From ac3c29235f7949a6001ae1f1dd3dd06fe9cc5cdf Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 11 Feb 2025 10:48:22 -0500
Subject: [PATCH 236/423] Resolving an issue where an array key is not defined.

---
 src/TouchPoint-WP/Report.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 013973be..8a053d00 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -70,7 +70,8 @@ protected function __construct($params)
 	{
 		$this->name     = $params['name'];
 		$this->type     = $params['type'];
-		$this->interval = max(floor(floatval($params['interval']) * 4) / 4, 0.25);
+		$interval       = $params['interval'] ?? 24;
+		$this->interval = max(floor(floatval($interval) * 4) / 4, 0.25);
 		$this->p1       = $params['p1'] ?? "";
 	}
 
@@ -108,6 +109,8 @@ public static function fromParams($params): self
 			throw new TouchPointWP_Exception("Invalid Report type.", 173002);
 		}
 
+		$params['interval'] = floatval($params['interval'] ?? 24);
+
 		$key = self::cacheKey($params);
 		if (isset(self::$_instances[$key])) {
 			self::$_instances[$key]->mergeParams($params);

From 3adea6010f358e399bdbdab15e9bac53afe5c700 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Feb 2025 13:19:37 -0500
Subject: [PATCH 237/423] Significantly extending validity of IP cache

---
 src/TouchPoint-WP/TouchPointWP.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 7b282367..37ec46f8 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -88,7 +88,8 @@ class TouchPointWP
 	 */
 	public const CACHE_TTL = 8;
 
-	public const TTL_IP_GEO = 5;  // years
+	public const TTL_IP_GEO = 5;  // years until deleted
+	public const TTU_IP_GEO = 180; // days until updated
 
 	/**
 	 * Caching
@@ -1214,8 +1215,9 @@ protected function getIpData(string $ip, bool $useApi = true)
 
 		global $wpdb;
 		$tableName = $wpdb->base_prefix . self::TABLE_IP_GEO;
+		$days = self::TTU_IP_GEO;
 		/** @noinspection SqlResolve */
-		$q = $wpdb->prepare("SELECT * FROM $tableName WHERE ip = %s and updatedDt > (NOW() - INTERVAL 30 DAY)", $ip_pton);
+		$q = $wpdb->prepare("SELECT * FROM $tableName WHERE ip = %s and updatedDt > (NOW() - INTERVAL $days DAY)", $ip_pton);
 		$cache = $wpdb->get_row($q);
 		if ($cache) {
 			$this->ipData = $cache->data;

From fc32941fe34a37c771a8dd1fbbf618a79a880e98 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Feb 2025 13:30:48 -0500
Subject: [PATCH 238/423] Improving rate limiting again

---
 src/TouchPoint-WP/TouchPointWP.php          | 4 ++--
 src/TouchPoint-WP/TouchPointWP_Settings.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 37ec46f8..2b2394f7 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1256,12 +1256,12 @@ protected function getIpData(string $ip, bool $useApi = true)
 
 		if (str_contains($return, 'Too many rapid requests')) {
 			$this->settings->set('ipapi_ratelimit_exp', time() + 10);  // defer for 10 seconds.
-			throw new TouchPointWP_Exception("IP Geolocation Error: Too many requests", 178001);
+			throw new TouchPointWP_Exception("IP Geolocation Error: Too many requests. Backing off for 10 seconds.", 178001);
 		}
 
 		if (str_contains($return, 'RateLimited')) {
 			$this->settings->set('ipapi_ratelimit_exp', time() + 300);  // defer for 5 minutes.
-			throw new TouchPointWP_Exception("IP Geolocation Error: Rate Limited", 178001);
+			throw new TouchPointWP_Exception("IP Geolocation Error: Rate Limited. Backing off for 5 minutes.", 178001);
 		}
 
 		try {
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 312f5292..fbf702ca 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1603,7 +1603,7 @@ public function migrate(): void
 		// 0.0.94 - Cleanup old IP Geo data
 		$tableName = $wpdb->base_prefix . TouchPointWP::TABLE_IP_GEO;
 		$years = TouchPointWP::TTL_IP_GEO;
-		$wpdb->query("DELETE FROM $tableName WHERE `updatedDT` < NOW() - INTERVAL $years YEAR OR `data` LIKE 'Too many rapid requests.%';");
+		$wpdb->query("DELETE FROM $tableName WHERE `updatedDT` < NOW() - INTERVAL $years YEAR OR `data` LIKE '%error\": true%';");
 
 		// 0.0.95 - Remove never-really-used option for deletion handling
 		delete_option('tp_mc_deletion_method');

From 19965dff7c4e93edf642693dadc192e9191294d0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 16 Feb 2025 22:30:22 -0500
Subject: [PATCH 239/423] Correcting issue where __destruct should always be
 public

---
 src/TouchPoint-WP/Stats.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index b00d5934..770f1343 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -109,7 +109,7 @@ protected function __construct()
 	 *
 	 * @throws Exception
 	 */
-	protected function __destruct()
+	public function __destruct()
 	{
 		if ($this->_dirty) {
 			throw new Exception("Stats object was not saved.");

From cfaa257a5349cdb87ad440db98e763a31ef487f7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 16 Feb 2025 22:33:34 -0500
Subject: [PATCH 240/423] Correcting an issue that caused map shortcode to not
 work for meetings

---
 src/TouchPoint-WP/Involvement.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index e5d22d5d..8fbadf58 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2423,7 +2423,13 @@ public static function mapShortcode($params = [], string $content = ""): string
 				// enqueue this object for js instantiation
 				$post = get_post();
 				if ($post) {
-					self::fromPost($post)?->enqueueForJsInstantiation();
+					$inv = null;
+					if (Meeting::postIsType($post)) {
+						$inv = Meeting::fromPost($post)?->involvement();
+					} elseif (Involvement::postIsType($post)) {
+						$inv = Involvement::fromPost($post);
+					}
+					$inv?->enqueueForJsInstantiation();
 				}
 			}
 

From a93b22569d87274f82d4802dd0a9fefa094bc4a5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 14:10:07 -0500
Subject: [PATCH 241/423] Some adjustments to the calendar grid api

---
 src/TouchPoint-WP/CalendarGrid.php | 24 ++++++++++++++++++++++++
 src/templates/meeting-archive.php  | 10 +---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index c742f1af..ffca369c 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -464,4 +464,28 @@ protected static function getMonthNameForDate(DateTimeInterface $date): string
 		}
 		return $label;
 	}
+
+
+	protected static ?CalendarGrid $defaultItem = null;
+
+	/**
+	 * Get a standard calendar grid, as would be used for most applications on a standard archive page.
+	 *
+	 * @return CalendarGrid
+	 */
+	public final static function getDefaultGrid(): CalendarGrid
+	{
+		global $wp_query;
+		if (self::$defaultItem === null) {
+			if (!isset($_GET['page']) || !preg_match('/^(?P<mo>[0-9]{2})-(?P<yr>[0-9]{4})$/', $_GET['page'], $matches)) {
+				$matches = [
+					'mo' => null,
+					'yr' => null
+				];
+			}
+
+			self::$defaultItem = new CalendarGrid($wp_query, $matches['mo'], $matches['yr']);
+		}
+		return self::$defaultItem;
+	}
 }
\ No newline at end of file
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
index 7d62f5d5..e69ba196 100644
--- a/src/templates/meeting-archive.php
+++ b/src/templates/meeting-archive.php
@@ -36,15 +36,7 @@
 
     <?php
 
-    if (!isset($_GET['page']) || !preg_match('/^(?P<mo>[0-9]{2})-(?P<yr>[0-9]{4})$/', $_GET['page'], $matches)) {
-	    $matches = [
-		    'mo' => null,
-		    'yr' => null
-	    ];
-    }
-
-    $grid = new CalendarGrid($wp_query, $matches['mo'], $matches['yr']);
-
+    $grid = CalendarGrid::getDefaultGrid();
 	echo $grid->navBar(true);
     echo $grid;
     if ($grid->eventCount > 0) {

From 38e4fb64e147a30d04714cc5088db210b2f90daa Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 14:25:56 -0500
Subject: [PATCH 242/423] Adding calendar grid shortcode

---
 src/TouchPoint-WP/CalendarGrid.php | 23 +++++++++++++++++++++++
 src/TouchPoint-WP/Meeting.php      |  6 ++++++
 src/templates/meeting-archive.php  | 14 ++------------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index ffca369c..39d05e59 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -488,4 +488,27 @@ public final static function getDefaultGrid(): CalendarGrid
 		}
 		return self::$defaultItem;
 	}
+
+	/**
+	 * @return void
+	 */
+	public static function shortcode(): void
+	{
+		if (have_posts()) {
+			global $wp_query;
+
+			$grid = self::getDefaultGrid();
+			echo $grid->navBar(true);
+			echo $grid;
+			if ($grid->eventCount > 0) {
+				echo $grid->navBar(false, 'bottom');
+			}
+
+			wp_reset_query();
+			$taxQuery                          = [[]];
+			$wp_query->tax_query->queries      = $taxQuery;
+			$wp_query->query_vars['tax_query'] = $taxQuery;
+			$wp_query->is_tax                  = false;  // prevents templates from thinking this is a taxonomy archive
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 74359e11..8551f827 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -43,6 +43,8 @@ class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchic
 	public const MEETING_STATUS_META_KEY = TouchPointWP::SETTINGS_PREFIX . "status";
 	public const MEETING_INV_ID_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgInvId";
 
+	public const SHORTCODE_GRID = TouchPointWP::SHORTCODE_PREFIX . "calendar";
+
 	public const STATUS_CANCELLED = "cancelled";
 	public const STATUS_SCHEDULED = "scheduled";
 	public const STATUS_UNKNOWN = "unknown";
@@ -821,6 +823,10 @@ public static function load(): bool
 
 		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']);
 
+		if ( ! shortcode_exists(self::SHORTCODE_GRID)) {
+			add_shortcode(self::SHORTCODE_GRID, [CalendarGrid::class, "shortcode"]);
+		}
+
 		return true;
 	}
 
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
index e69ba196..3d1b4073 100644
--- a/src/templates/meeting-archive.php
+++ b/src/templates/meeting-archive.php
@@ -36,18 +36,8 @@
 
     <?php
 
-    $grid = CalendarGrid::getDefaultGrid();
-	echo $grid->navBar(true);
-    echo $grid;
-    if ($grid->eventCount > 0) {
-	    echo $grid->navBar(false, 'bottom');
-    }
-
-    wp_reset_query();
-    $taxQuery = [[]];
-    $wp_query->tax_query->queries = $taxQuery;
-    $wp_query->query_vars['tax_query'] = $taxQuery;
-    $wp_query->is_tax = false;  // prevents templates from thinking this is a taxonomy archive
+    CalendarGrid::shortcode();
+
 }
     ?>
 </main><!-- .TouchPointWP-main -->

From faf18afc02b8e5eb992ed9b065403ec3059f06bc Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 14:31:34 -0500
Subject: [PATCH 243/423] Correcting a comment

---
 src/TouchPoint-WP/storedAsPost.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/storedAsPost.php b/src/TouchPoint-WP/storedAsPost.php
index 2d587268..b28e8487 100644
--- a/src/TouchPoint-WP/storedAsPost.php
+++ b/src/TouchPoint-WP/storedAsPost.php
@@ -8,7 +8,7 @@
 use WP_Post;
 
 /**
- * This is a base interface for classes that have "schedule" strings.
+ * This is a base interface for classes that store TouchPoint items as posts in WordPress.
  */
 interface storedAsPost
 {

From 64f77b8480a8168ff16584985e0e3f645929c243 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 14:47:38 -0500
Subject: [PATCH 244/423] Improving inline documentation

---
 src/TouchPoint-WP/CalendarGrid.php      | 7 +++++++
 src/TouchPoint-WP/EventsCalendar.php    | 2 ++
 src/TouchPoint-WP/ExtraValueHandler.php | 6 ++++--
 src/TouchPoint-WP/api.php               | 4 +++-
 src/TouchPoint-WP/extraValues.php       | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 39d05e59..0a541d3a 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -29,7 +29,14 @@
  * @package TouchPointWP
  */
 class CalendarGrid {
+	/**
+	 * @var ?DateTimeImmutable The date of the next month.
+	 */
 	public ?DateTimeImmutable $next = null;
+
+	/**
+	 * @var ?DateTimeImmutable The date of the previous month.
+	 */
 	public ?DateTimeImmutable $prev = null;
 
 	/**
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 5f9e59a3..04d17a43 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -20,6 +20,8 @@
  * Provides an interface to bridge the gap between The Events Calendar plugin (by Modern Tribe) and the TouchPoint
  * mobile app.
  *
+ * This class and its features are deprecated since it will no longer be needed when mobile v2 is retired.
+ *
  * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
  * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
  */
diff --git a/src/TouchPoint-WP/ExtraValueHandler.php b/src/TouchPoint-WP/ExtraValueHandler.php
index b2bd8741..9718c4af 100644
--- a/src/TouchPoint-WP/ExtraValueHandler.php
+++ b/src/TouchPoint-WP/ExtraValueHandler.php
@@ -8,11 +8,13 @@
 use DateTime;
 
 /**
- * Manages the handling of Extra Values.  Items that support Extra Values MUST use the ExtraValues Trait.
+ * Classes that have extra values should implement the ExtraValues trait, which provides a ExtraValues() method which
+ * returns an instance of this class and allows getting the values via its getter. That trait has the abstract methods
+ * that need to be implemented for Extra Values to be available.
  */
 class ExtraValueHandler
 {
-	/** @var object|extraValues $owner */
+	/** @var object|extraValues $owner The object that has extra values */
 	protected object $owner; // Must have the extraValues trait.
 
 	/**
diff --git a/src/TouchPoint-WP/api.php b/src/TouchPoint-WP/api.php
index 8fae0c90..3055c69b 100644
--- a/src/TouchPoint-WP/api.php
+++ b/src/TouchPoint-WP/api.php
@@ -11,7 +11,9 @@
 
 
 /**
- * API Interface
+ * Any classes that handle API requests from the client via /touchpoint-api/ should implement this interface.
+ * 
+ * This is NOT for the connection to TouchPoint's API, but rather for XHR and such from the client.
  */
 interface api
 {
diff --git a/src/TouchPoint-WP/extraValues.php b/src/TouchPoint-WP/extraValues.php
index e289e310..95329540 100644
--- a/src/TouchPoint-WP/extraValues.php
+++ b/src/TouchPoint-WP/extraValues.php
@@ -14,7 +14,7 @@
 }
 
 /**
- * Enables a class with Extra Values
+ * Enables a class to have Extra Values.  Defines several abstract methods that must be implemented.
  */
 trait extraValues
 {

From 2e58017d71c39cc35c36e534524f466342437973 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 14:49:20 -0500
Subject: [PATCH 245/423] boring i18n update

---
 i18n/TouchPoint-WP-es_ES.po | 528 +++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 532 ++++++++++++++++++------------------
 2 files changed, 530 insertions(+), 530 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 9a201c6e..204bc25d 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -88,7 +88,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:165
 #: src/templates/admin/invKoForm.php:318
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:746
+#: src/TouchPoint-WP/Meeting.php:758
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -124,13 +124,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:237
-#: src/TouchPoint-WP/Involvement.php:1853
+#: src/TouchPoint-WP/Involvement.php:1856
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:241
-#: src/TouchPoint-WP/Involvement.php:1879
+#: src/TouchPoint-WP/Involvement.php:1882
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -174,7 +174,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2099
+#: src/TouchPoint-WP/Involvement.php:2102
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -200,99 +200,99 @@ msgstr "Su token de inicio de sesión no es válido."
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
-#: src/TouchPoint-WP/EventsCalendar.php:77
+#: src/TouchPoint-WP/EventsCalendar.php:79
 msgid "Recurring"
 msgstr "Periódico"
 
-#: src/TouchPoint-WP/EventsCalendar.php:80
-#: src/TouchPoint-WP/EventsCalendar.php:297
+#: src/TouchPoint-WP/EventsCalendar.php:82
+#: src/TouchPoint-WP/EventsCalendar.php:299
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:495
+#: src/TouchPoint-WP/Involvement.php:498
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:500
+#: src/TouchPoint-WP/Involvement.php:503
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:507
+#: src/TouchPoint-WP/Involvement.php:510
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:513
+#: src/TouchPoint-WP/Involvement.php:516
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1728
-#: src/TouchPoint-WP/Partner.php:814
+#: src/TouchPoint-WP/Involvement.php:1731
+#: src/TouchPoint-WP/Partner.php:825
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1936
-#: src/TouchPoint-WP/Partner.php:838
+#: src/TouchPoint-WP/Involvement.php:1939
+#: src/TouchPoint-WP/Partner.php:849
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3556
+#: src/TouchPoint-WP/Involvement.php:3571
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3559
+#: src/TouchPoint-WP/Involvement.php:3574
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3636
+#: src/TouchPoint-WP/Involvement.php:3651
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3706
-#: src/TouchPoint-WP/Involvement.php:3765
+#: src/TouchPoint-WP/Involvement.php:3721
+#: src/TouchPoint-WP/Involvement.php:3780
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3712
+#: src/TouchPoint-WP/Involvement.php:3727
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3716
+#: src/TouchPoint-WP/Involvement.php:3731
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3721
+#: src/TouchPoint-WP/Involvement.php:3736
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3724
+#: src/TouchPoint-WP/Involvement.php:3739
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3727
+#: src/TouchPoint-WP/Involvement.php:3742
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3730
+#: src/TouchPoint-WP/Involvement.php:3745
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3756
+#: src/TouchPoint-WP/Involvement.php:3771
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3653
-#: src/TouchPoint-WP/Partner.php:1318
+#: src/TouchPoint-WP/Involvement.php:3668
+#: src/TouchPoint-WP/Partner.php:1329
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:845
+#: src/TouchPoint-WP/Partner.php:856
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1259
+#: src/TouchPoint-WP/Partner.php:1270
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -308,503 +308,503 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:745
-#: src/TouchPoint-WP/Meeting.php:766
+#: src/TouchPoint-WP/Meeting.php:757
+#: src/TouchPoint-WP/Meeting.php:778
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2031
+#: src/TouchPoint-WP/TouchPointWP.php:2047
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2088
+#: src/TouchPoint-WP/TouchPointWP.php:2104
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2091
+#: src/TouchPoint-WP/TouchPointWP.php:2107
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2094
+#: src/TouchPoint-WP/TouchPointWP.php:2110
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2099
-#: src/TouchPoint-WP/TouchPointWP.php:2100
+#: src/TouchPoint-WP/TouchPointWP.php:2115
+#: src/TouchPoint-WP/TouchPointWP.php:2116
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2217
-#: src/TouchPoint-WP/TouchPointWP.php:2253
+#: src/TouchPoint-WP/TouchPointWP.php:2233
+#: src/TouchPoint-WP/TouchPointWP.php:2269
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2267
-#: src/TouchPoint-WP/TouchPointWP.php:2311
+#: src/TouchPoint-WP/TouchPointWP.php:2283
+#: src/TouchPoint-WP/TouchPointWP.php:2327
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2443
+#: src/TouchPoint-WP/TouchPointWP.php:2459
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:262
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:274
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:282
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:337
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:348
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:361
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:373
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:385
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:398
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:410
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:422
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:484
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:501
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:512
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:523
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:761
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:565
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:575
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:597
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:603
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:638
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:649
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:660
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:695
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:706
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:717
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:728
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:817
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:822
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:935
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:964
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:966
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1078
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1080
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1083
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1095
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1107
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1109
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1284
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1287
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1338
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1339
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1341
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1390
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1627
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1630
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1749
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1752
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1800
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1803
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -972,7 +972,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2384
+#: src/TouchPoint-WP/TouchPointWP.php:2400
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1027,16 +1027,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1901
+#: src/TouchPoint-WP/Involvement.php:1904
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1914
+#: src/TouchPoint-WP/Involvement.php:1917
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1785
+#: src/TouchPoint-WP/Involvement.php:1788
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1154,12 +1154,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1010
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1011
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1006
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1198,33 +1198,33 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1902
+#: src/TouchPoint-WP/Involvement.php:1905
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1903
+#: src/TouchPoint-WP/Involvement.php:1906
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1944
-#: src/TouchPoint-WP/Partner.php:854
+#: src/TouchPoint-WP/Involvement.php:1947
+#: src/TouchPoint-WP/Partner.php:865
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1947
-#: src/TouchPoint-WP/Partner.php:857
+#: src/TouchPoint-WP/Involvement.php:1950
+#: src/TouchPoint-WP/Partner.php:868
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:995
-#: src/TouchPoint-WP/Involvement.php:1027
-#: src/TouchPoint-WP/Involvement.php:1120
-#: src/TouchPoint-WP/Involvement.php:1144
+#: src/TouchPoint-WP/Involvement.php:998
+#: src/TouchPoint-WP/Involvement.php:1030
+#: src/TouchPoint-WP/Involvement.php:1123
+#: src/TouchPoint-WP/Involvement.php:1147
 #: src/TouchPoint-WP/TouchPointWP_Widget.php:71
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -1232,43 +1232,43 @@ msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1036
+#: src/TouchPoint-WP/Involvement.php:1039
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Involvement.php:1048
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1054
+#: src/TouchPoint-WP/Involvement.php:1057
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1062
+#: src/TouchPoint-WP/Involvement.php:1065
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1070
+#: src/TouchPoint-WP/Involvement.php:1073
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1078
+#: src/TouchPoint-WP/Involvement.php:1081
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3577
+#: src/TouchPoint-WP/Involvement.php:3592
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1280,39 +1280,39 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2040
+#: src/TouchPoint-WP/Involvement.php:2043
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2050
+#: src/TouchPoint-WP/Involvement.php:2053
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2069
+#: src/TouchPoint-WP/Involvement.php:2072
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1033
+#: src/TouchPoint-WP/Meeting.php:684
+#: src/TouchPoint-WP/TouchPointWP.php:1037
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:700
-#: src/TouchPoint-WP/TouchPointWP.php:362
+#: src/TouchPoint-WP/Meeting.php:712
+#: src/TouchPoint-WP/TouchPointWP.php:363
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:710
-#: src/TouchPoint-WP/TouchPointWP.php:371
+#: src/TouchPoint-WP/Meeting.php:722
+#: src/TouchPoint-WP/TouchPointWP.php:372
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3861
-#: src/TouchPoint-WP/Involvement.php:3964
+#: src/TouchPoint-WP/Involvement.php:3888
+#: src/TouchPoint-WP/Involvement.php:3993
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:326
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1377,7 +1377,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1411,24 +1411,24 @@ msgstr "Agregar Nuevo %s"
 msgid "New %s"
 msgstr "Nuevo %s"
 
-#: src/TouchPoint-WP/Report.php:177
+#: src/TouchPoint-WP/Report.php:181
 msgid "TouchPoint Reports"
 msgstr "Informes de TouchPoint"
 
-#: src/TouchPoint-WP/Report.php:178
+#: src/TouchPoint-WP/Report.php:182
 msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:417
+#: src/TouchPoint-WP/Report.php:435
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:266
+#: src/TouchPoint-WP/TouchPointWP.php:267
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1828
+#: src/TouchPoint-WP/Involvement.php:1831
 msgid "Language"
 msgstr "Idioma"
 
@@ -1445,11 +1445,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:850
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1457,28 +1457,28 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:879
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:3951
+#: src/TouchPoint-WP/Involvement.php:3980
 #: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1490,7 +1490,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3941
+#: src/TouchPoint-WP/Involvement.php:3970
 #: src/TouchPoint-WP/Person.php:1850
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1500,50 +1500,50 @@ msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:269
+#: src/TouchPoint-WP/Meeting.php:281
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:270
+#: src/TouchPoint-WP/Meeting.php:282
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:293
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:989
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1120
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1566,15 +1566,15 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:497
+#: src/TouchPoint-WP/Utilities.php:500
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:549
+#: src/TouchPoint-WP/Meeting.php:561
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:550
+#: src/TouchPoint-WP/Meeting.php:562
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1603,21 +1603,21 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:189
+#: src/TouchPoint-WP/CalendarGrid.php:199
 msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3665
+#: src/TouchPoint-WP/Involvement.php:3680
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:422
+#: src/TouchPoint-WP/Meeting.php:434
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:494
+#: src/TouchPoint-WP/Meeting.php:506
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1626,39 +1626,39 @@ msgstr "Reunión en %s"
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:867
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Event"
 msgstr "Evento"
 
@@ -1682,7 +1682,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:551
+#: src/TouchPoint-WP/Meeting.php:563
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
@@ -1692,12 +1692,12 @@ msgid "Creating an Involvement object from an object without a post_id is not ye
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:998
-#: src/TouchPoint-WP/Involvement.php:1021
+#: src/TouchPoint-WP/Involvement.php:1001
+#: src/TouchPoint-WP/Involvement.php:1024
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:94
+#: src/TouchPoint-WP/Meeting.php:96
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
@@ -1757,7 +1757,7 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:269
+#: src/TouchPoint-WP/CalendarGrid.php:279
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
 
@@ -1765,31 +1765,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1810,7 +1810,7 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1022
+#: src/TouchPoint-WP/Involvement.php:1025
 msgid "All Day"
 msgstr "todo el dia"
 
@@ -1819,11 +1819,11 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:433
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
@@ -1856,18 +1856,18 @@ msgstr "Actualizada"
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
 msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días en el pasado. Una vez que un evento tenga más de esta cantidad de días, se eliminará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
 msgid "List Site in Directory"
 msgstr "Listar sitio en directorio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 92ee09b7..ffa7dcf7 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -1,4 +1,4 @@
-# Copyright (C) 2024 James K
+# Copyright (C) 2025 James K
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-28T19:12:52+00:00\n"
+"POT-Creation-Date: 2025-02-27T19:48:49+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:977
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
 msgid "Divisions to Import"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:165
 #: src/templates/admin/invKoForm.php:318
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:746
+#: src/TouchPoint-WP/Meeting.php:758
 #: src/TouchPoint-WP/Rsvp.php:75
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -183,13 +183,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:237
-#: src/TouchPoint-WP/Involvement.php:1853
+#: src/TouchPoint-WP/Involvement.php:1856
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:241
-#: src/TouchPoint-WP/Involvement.php:1879
+#: src/TouchPoint-WP/Involvement.php:1882
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr ""
@@ -277,14 +277,14 @@ msgid "This %s has been Cancelled."
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:269
+#: src/TouchPoint-WP/Meeting.php:281
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2099
+#: src/TouchPoint-WP/Involvement.php:2102
 msgid "No %s Found."
 msgstr ""
 
@@ -295,7 +295,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3577
+#: src/TouchPoint-WP/Involvement.php:3592
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -318,21 +318,21 @@ msgid "Session could not be validated."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/TouchPoint-WP/CalendarGrid.php:189
+#: src/TouchPoint-WP/CalendarGrid.php:199
 msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:269
+#: src/TouchPoint-WP/CalendarGrid.php:279
 msgid "There are no %s published for this month."
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:77
+#: src/TouchPoint-WP/EventsCalendar.php:79
 msgid "Recurring"
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:80
-#: src/TouchPoint-WP/EventsCalendar.php:297
+#: src/TouchPoint-WP/EventsCalendar.php:82
+#: src/TouchPoint-WP/EventsCalendar.php:299
 msgid "Multi-Day"
 msgstr ""
 
@@ -340,27 +340,27 @@ msgstr ""
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:495
+#: src/TouchPoint-WP/Involvement.php:498
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:500
+#: src/TouchPoint-WP/Involvement.php:503
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:507
+#: src/TouchPoint-WP/Involvement.php:510
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:513
+#: src/TouchPoint-WP/Involvement.php:516
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:995
-#: src/TouchPoint-WP/Involvement.php:1027
-#: src/TouchPoint-WP/Involvement.php:1120
-#: src/TouchPoint-WP/Involvement.php:1144
+#: src/TouchPoint-WP/Involvement.php:998
+#: src/TouchPoint-WP/Involvement.php:1030
+#: src/TouchPoint-WP/Involvement.php:1123
+#: src/TouchPoint-WP/Involvement.php:1147
 #: src/TouchPoint-WP/TouchPointWP_Widget.php:71
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -368,236 +368,236 @@ msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:998
-#: src/TouchPoint-WP/Involvement.php:1021
+#: src/TouchPoint-WP/Involvement.php:1001
+#: src/TouchPoint-WP/Involvement.php:1024
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1022
+#: src/TouchPoint-WP/Involvement.php:1025
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1036
+#: src/TouchPoint-WP/Involvement.php:1039
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Involvement.php:1048
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1054
+#: src/TouchPoint-WP/Involvement.php:1057
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1062
+#: src/TouchPoint-WP/Involvement.php:1065
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1070
+#: src/TouchPoint-WP/Involvement.php:1073
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1078
+#: src/TouchPoint-WP/Involvement.php:1081
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1728
-#: src/TouchPoint-WP/Partner.php:814
+#: src/TouchPoint-WP/Involvement.php:1731
+#: src/TouchPoint-WP/Partner.php:825
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1785
+#: src/TouchPoint-WP/Involvement.php:1788
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1828
+#: src/TouchPoint-WP/Involvement.php:1831
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1901
+#: src/TouchPoint-WP/Involvement.php:1904
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1902
+#: src/TouchPoint-WP/Involvement.php:1905
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1903
+#: src/TouchPoint-WP/Involvement.php:1906
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1914
+#: src/TouchPoint-WP/Involvement.php:1917
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1936
-#: src/TouchPoint-WP/Partner.php:838
+#: src/TouchPoint-WP/Involvement.php:1939
+#: src/TouchPoint-WP/Partner.php:849
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1944
-#: src/TouchPoint-WP/Partner.php:854
+#: src/TouchPoint-WP/Involvement.php:1947
+#: src/TouchPoint-WP/Partner.php:865
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1947
-#: src/TouchPoint-WP/Partner.php:857
+#: src/TouchPoint-WP/Involvement.php:1950
+#: src/TouchPoint-WP/Partner.php:868
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2040
+#: src/TouchPoint-WP/Involvement.php:2043
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2050
+#: src/TouchPoint-WP/Involvement.php:2053
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2069
+#: src/TouchPoint-WP/Involvement.php:2072
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3556
+#: src/TouchPoint-WP/Involvement.php:3571
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3559
+#: src/TouchPoint-WP/Involvement.php:3574
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3636
+#: src/TouchPoint-WP/Involvement.php:3651
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3653
-#: src/TouchPoint-WP/Partner.php:1318
+#: src/TouchPoint-WP/Involvement.php:3668
+#: src/TouchPoint-WP/Partner.php:1329
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3665
+#: src/TouchPoint-WP/Involvement.php:3680
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3706
-#: src/TouchPoint-WP/Involvement.php:3765
+#: src/TouchPoint-WP/Involvement.php:3721
+#: src/TouchPoint-WP/Involvement.php:3780
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3712
+#: src/TouchPoint-WP/Involvement.php:3727
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3716
+#: src/TouchPoint-WP/Involvement.php:3731
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3721
+#: src/TouchPoint-WP/Involvement.php:3736
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3724
+#: src/TouchPoint-WP/Involvement.php:3739
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3727
+#: src/TouchPoint-WP/Involvement.php:3742
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3730
+#: src/TouchPoint-WP/Involvement.php:3745
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3756
+#: src/TouchPoint-WP/Involvement.php:3771
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3861
-#: src/TouchPoint-WP/Involvement.php:3964
+#: src/TouchPoint-WP/Involvement.php:3888
+#: src/TouchPoint-WP/Involvement.php:3993
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3941
+#: src/TouchPoint-WP/Involvement.php:3970
 #: src/TouchPoint-WP/Person.php:1850
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3951
+#: src/TouchPoint-WP/Involvement.php:3980
 #: src/TouchPoint-WP/Person.php:1833
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:94
+#: src/TouchPoint-WP/Meeting.php:96
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:270
+#: src/TouchPoint-WP/Meeting.php:282
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:422
+#: src/TouchPoint-WP/Meeting.php:434
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:494
+#: src/TouchPoint-WP/Meeting.php:506
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:549
+#: src/TouchPoint-WP/Meeting.php:561
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:550
+#: src/TouchPoint-WP/Meeting.php:562
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:551
+#: src/TouchPoint-WP/Meeting.php:563
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:672
-#: src/TouchPoint-WP/TouchPointWP.php:1033
+#: src/TouchPoint-WP/Meeting.php:684
+#: src/TouchPoint-WP/TouchPointWP.php:1037
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:700
-#: src/TouchPoint-WP/TouchPointWP.php:362
+#: src/TouchPoint-WP/Meeting.php:712
+#: src/TouchPoint-WP/TouchPointWP.php:363
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:710
-#: src/TouchPoint-WP/TouchPointWP.php:371
+#: src/TouchPoint-WP/Meeting.php:722
+#: src/TouchPoint-WP/TouchPointWP.php:372
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:745
-#: src/TouchPoint-WP/Meeting.php:766
+#: src/TouchPoint-WP/Meeting.php:757
+#: src/TouchPoint-WP/Meeting.php:778
 #: src/TouchPoint-WP/Rsvp.php:80
 msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:845
+#: src/TouchPoint-WP/Partner.php:856
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1259
+#: src/TouchPoint-WP/Partner.php:1270
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -637,16 +637,16 @@ msgstr ""
 msgid "You may need to sign in."
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:177
+#: src/TouchPoint-WP/Report.php:181
 msgid "TouchPoint Reports"
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:178
+#: src/TouchPoint-WP/Report.php:182
 msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:417
+#: src/TouchPoint-WP/Report.php:435
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
@@ -741,679 +741,679 @@ msgstr ""
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:266
+#: src/TouchPoint-WP/TouchPointWP.php:267
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2031
+#: src/TouchPoint-WP/TouchPointWP.php:2047
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2088
+#: src/TouchPoint-WP/TouchPointWP.php:2104
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2091
+#: src/TouchPoint-WP/TouchPointWP.php:2107
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2094
+#: src/TouchPoint-WP/TouchPointWP.php:2110
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2099
-#: src/TouchPoint-WP/TouchPointWP.php:2100
+#: src/TouchPoint-WP/TouchPointWP.php:2115
+#: src/TouchPoint-WP/TouchPointWP.php:2116
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2217
-#: src/TouchPoint-WP/TouchPointWP.php:2253
+#: src/TouchPoint-WP/TouchPointWP.php:2233
+#: src/TouchPoint-WP/TouchPointWP.php:2269
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2267
-#: src/TouchPoint-WP/TouchPointWP.php:2311
+#: src/TouchPoint-WP/TouchPointWP.php:2283
+#: src/TouchPoint-WP/TouchPointWP.php:2327
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2384
+#: src/TouchPoint-WP/TouchPointWP.php:2400
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2443
+#: src/TouchPoint-WP/TouchPointWP.php:2459
 msgid "People Query Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:257
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:262
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:274
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:282
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:293
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:304
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:315
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:326
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:337
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:348
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:361
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:373
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:385
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:398
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:410
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:422
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:433
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:444
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
 msgid "List Site in Directory"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:463
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:466
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:484
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:489
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:501
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:512
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:523
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:761
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:540
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:545
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:555
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:565
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:575
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:582
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:597
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:603
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:633
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:638
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:649
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:660
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:671
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:682
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:695
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:706
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:717
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:728
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:739
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:750
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:773
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:791
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:795
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:801
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:806
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:817
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:820
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:822
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:837
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:850
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:861
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:863
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:867
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:873
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:875
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:879
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:892
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:905
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:918
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:935
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:940
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:952
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:964
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:966
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:989
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1120
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1004
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1010
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1011
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1006
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1029
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1037
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1049
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1061
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1078
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1080
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1083
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1095
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1107
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1109
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1284
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1287
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1338
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1339
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1341
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1387
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1390
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1627
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1630
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1749
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1752
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1800
+#: src/TouchPoint-WP/TouchPointWP_Settings.php:1803
 msgid "Save Settings"
 msgstr ""
 
@@ -1539,7 +1539,7 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:497
+#: src/TouchPoint-WP/Utilities.php:500
 msgid "Expand"
 msgstr ""
 

From 6d8e35b4ebf17363aa46746b0b386e3a46471cc1 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 14:59:54 -0500
Subject: [PATCH 246/423] Correcting a shortcode typo

---
 src/TouchPoint-WP/Meeting.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 8551f827..77bc1ecc 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -43,7 +43,7 @@ class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchic
 	public const MEETING_STATUS_META_KEY = TouchPointWP::SETTINGS_PREFIX . "status";
 	public const MEETING_INV_ID_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgInvId";
 
-	public const SHORTCODE_GRID = TouchPointWP::SHORTCODE_PREFIX . "calendar";
+	public const SHORTCODE_GRID = TouchPointWP::SHORTCODE_PREFIX . "Calendar";
 
 	public const STATUS_CANCELLED = "cancelled";
 	public const STATUS_SCHEDULED = "scheduled";
@@ -823,6 +823,10 @@ public static function load(): bool
 
 		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']);
 
+		//////////////////
+		/// Shortcodes ///
+		//////////////////
+
 		if ( ! shortcode_exists(self::SHORTCODE_GRID)) {
 			add_shortcode(self::SHORTCODE_GRID, [CalendarGrid::class, "shortcode"]);
 		}

From 1c243e2a1a17eedf6bd29e2f145ec0acb3dc2869 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 19:16:07 -0500
Subject: [PATCH 247/423] Correct a few issues with WordPress menu Customizer

---
 src/TouchPoint-WP/Involvement.php | 12 +++++++++++-
 src/TouchPoint-WP/Partner.php     | 13 ++++++++++++-
 src/TouchPoint-WP/Report.php      | 12 +++++++++++-
 src/TouchPoint-WP/Taxonomies.php  |  2 +-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 8fbadf58..3cfb3ae2 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -297,7 +297,17 @@ public static function init(): void
 					],
 					'query_var'         => $type->slug,
 					'can_export'        => false,
-					'delete_with_user'  => false
+					'delete_with_user'  => false,
+					'capability_type'   => 'post',
+					'capabilities' => [
+						'create_posts'        => 'do_not_allow', // Disable creating new posts
+						'edit_posts'          => 'do_not_allow',   // Disable editing posts
+						'edit_others_posts'   => 'do_not_allow', // Disable editing others' posts
+						'delete_posts'        => 'do_not_allow', // Disable deleting posts
+						'delete_others_posts' => 'do_not_allow', // Disable deleting others' posts
+						'publish_posts'       => 'do_not_allow', // Disable publishing posts
+					],
+					'map_meta_cap' => true, // Ensure users can still view posts
 				]
 			);
 		}
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index b395d6c5..30233d4b 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -233,7 +233,18 @@ public static function init(): void
 				],
 				'query_var'         => TouchPointWP::instance()->settings->global_slug,
 				'can_export'        => false,
-				'delete_with_user'  => false
+				'delete_with_user'  => false,
+				'capability_type'   => 'post',
+				'capabilities' => [
+					'create_posts'        => 'do_not_allow', // Disable creating new posts
+					'edit_posts'          => 'do_not_allow',   // Disable editing posts
+					'edit_others_posts'   => 'do_not_allow', // Disable editing others' posts
+					'delete_posts'        => 'do_not_allow', // Disable deleting posts
+					'delete_others_posts' => 'do_not_allow', // Disable deleting others' posts
+					'publish_posts'       => 'do_not_allow', // Disable publishing posts
+				],
+				'map_meta_cap' => true, // Ensure users can still view posts
+
 			]
 		);
 
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 8a053d00..84c88cf8 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -190,7 +190,17 @@ public static function init(): void
 				'has_archive'       => false,
 				'rewrite'           => false,
 				'can_export'        => false,
-				'delete_with_user'  => false
+				'delete_with_user'  => false,
+				'capability_type'   => 'post',
+				'capabilities' => [
+					'create_posts'        => 'do_not_allow', // Disable creating new posts
+					'edit_posts'          => 'do_not_allow',   // Disable editing posts
+					'edit_others_posts'   => 'do_not_allow', // Disable editing others' posts
+					'delete_posts'        => 'do_not_allow', // Disable deleting posts
+					'delete_others_posts' => 'do_not_allow', // Disable deleting others' posts
+					'publish_posts'       => 'do_not_allow', // Disable publishing posts
+				],
+				'map_meta_cap' => true, // Ensure users can still view posts
 			]
 		);
 	}
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index a0569bc5..63184c4a 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -26,7 +26,7 @@ abstract class Taxonomies
 	public const TAX_GP_CATEGORY = TouchPointWP::HOOK_PREFIX . "partner_category";
 	public const TAX_WEEKDAY = TouchPointWP::HOOK_PREFIX . "weekday";
 	public const TAX_TENSE_FUTURE = "future";
-	public const TAX_DAYTIME = TouchPointWP::HOOK_PREFIX . "timeOfDay";
+	public const TAX_DAYTIME = TouchPointWP::HOOK_PREFIX . "timeofday";
 	public const TAX_TENSE = TouchPointWP::HOOK_PREFIX . "tense";
 	public const TAXMETA_LOOKUP_ID = TouchPointWP::HOOK_PREFIX . "lookup_id";
 

From f65b3205ee37f8a2f7e63ed8be18d7bcf43fc4b5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 27 Feb 2025 19:36:53 -0500
Subject: [PATCH 248/423] minor spacing

---
 src/TouchPoint-WP/Involvement.php | 2 +-
 src/TouchPoint-WP/Partner.php     | 3 +--
 src/TouchPoint-WP/Report.php      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 3cfb3ae2..6a0677d7 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -301,7 +301,7 @@ public static function init(): void
 					'capability_type'   => 'post',
 					'capabilities' => [
 						'create_posts'        => 'do_not_allow', // Disable creating new posts
-						'edit_posts'          => 'do_not_allow',   // Disable editing posts
+						'edit_posts'          => 'do_not_allow', // Disable editing posts
 						'edit_others_posts'   => 'do_not_allow', // Disable editing others' posts
 						'delete_posts'        => 'do_not_allow', // Disable deleting posts
 						'delete_others_posts' => 'do_not_allow', // Disable deleting others' posts
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 30233d4b..17df2f6c 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -237,14 +237,13 @@ public static function init(): void
 				'capability_type'   => 'post',
 				'capabilities' => [
 					'create_posts'        => 'do_not_allow', // Disable creating new posts
-					'edit_posts'          => 'do_not_allow',   // Disable editing posts
+					'edit_posts'          => 'do_not_allow', // Disable editing posts
 					'edit_others_posts'   => 'do_not_allow', // Disable editing others' posts
 					'delete_posts'        => 'do_not_allow', // Disable deleting posts
 					'delete_others_posts' => 'do_not_allow', // Disable deleting others' posts
 					'publish_posts'       => 'do_not_allow', // Disable publishing posts
 				],
 				'map_meta_cap' => true, // Ensure users can still view posts
-
 			]
 		);
 
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 84c88cf8..fbac7e83 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -194,7 +194,7 @@ public static function init(): void
 				'capability_type'   => 'post',
 				'capabilities' => [
 					'create_posts'        => 'do_not_allow', // Disable creating new posts
-					'edit_posts'          => 'do_not_allow',   // Disable editing posts
+					'edit_posts'          => 'do_not_allow', // Disable editing posts
 					'edit_others_posts'   => 'do_not_allow', // Disable editing others' posts
 					'delete_posts'        => 'do_not_allow', // Disable deleting posts
 					'delete_others_posts' => 'do_not_allow', // Disable deleting others' posts

From efa2a2e7ca21b4fbdf1ffd4c99d7f83b0c65b423 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 28 Feb 2025 18:35:14 -0500
Subject: [PATCH 249/423] Resolving a (previously unknown) issue with
 defer/async script tags.

---
 src/TouchPoint-WP/TouchPointWP.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 2b2394f7..98a85cac 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1012,12 +1012,13 @@ public static function requireStyle(string $name = null): void
 	 */
 	public function filterByTag(?string $tag, ?string $handle): string
 	{
-		if (str_contains($tag, 'async') &&
-			strpos($handle, '-async') > 0) {
+		if (!str_contains($tag, ' async') &&
+		    strpos($handle, '-async') > 0
+		) {
 			$tag = str_replace(' src=', ' async="async" src=', $tag);
 		}
-		if (str_contains($tag, 'defer') &&
-			strpos($handle, '-defer') > 0
+		if (!str_contains($tag, ' defer') &&
+		    strpos($handle, '-defer') > 0
 		) {
 			$tag = str_replace('<script ', '<script defer ', $tag);
 		}

From c845b3644503b45d11a69c1a9cc4e2d05e9faa81 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 5 Mar 2025 00:28:21 -0500
Subject: [PATCH 250/423] Moving interfaces into a directory and moving API
 items out of main TouchPoint class to its own.  (Moving toward #210)

Also, correcting a telemetry issue.
---
 .idea/TouchPoint-WP.iml                       |   1 +
 .idea/misc.xml                                |   5 +
 composer.json                                 |   3 +-
 src/TouchPoint-WP/Api.php                     | 280 ++++++++++++++++++
 src/TouchPoint-WP/Auth.php                    |   4 +-
 src/TouchPoint-WP/CalendarGrid.php            |   2 +-
 src/TouchPoint-WP/EventsCalendar.php          |   6 +-
 src/TouchPoint-WP/{ => Interfaces}/api.php    |   2 +-
 src/TouchPoint-WP/{ => Interfaces}/hasGeo.php |   4 +-
 .../{ => Interfaces}/hierarchical.php         |   4 +-
 src/TouchPoint-WP/{ => Interfaces}/module.php |   2 +-
 .../{ => Interfaces}/scheduled.php            |   2 +-
 .../{ => Interfaces}/storedAsPost.php         |   2 +-
 .../{ => Interfaces}/updatesViaCron.php       |   2 +-
 src/TouchPoint-WP/Involvement.php             |  19 +-
 src/TouchPoint-WP/Location.php                |   2 +
 src/TouchPoint-WP/Meeting.php                 |  17 +-
 src/TouchPoint-WP/Partner.php                 |   8 +-
 src/TouchPoint-WP/Person.php                  |  15 +-
 src/TouchPoint-WP/PostTypeCapable.php         |   6 +-
 src/TouchPoint-WP/Report.php                  |  12 +-
 src/TouchPoint-WP/Rsvp.php                    |   2 +
 src/TouchPoint-WP/Stats.php                   |  41 ++-
 src/TouchPoint-WP/TouchPointWP.php            | 212 +++----------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php   |   3 +-
 src/TouchPoint-WP/TouchPointWP_Settings.php   |   2 +-
 src/TouchPoint-WP/Utilities.php               |   1 -
 src/TouchPoint-WP/Utilities/Cleanup.php       |   2 +-
 touchpoint-wp.php                             |   7 +-
 29 files changed, 432 insertions(+), 236 deletions(-)
 create mode 100644 src/TouchPoint-WP/Api.php
 rename src/TouchPoint-WP/{ => Interfaces}/api.php (93%)
 rename src/TouchPoint-WP/{ => Interfaces}/hasGeo.php (92%)
 rename src/TouchPoint-WP/{ => Interfaces}/hierarchical.php (92%)
 rename src/TouchPoint-WP/{ => Interfaces}/module.php (92%)
 rename src/TouchPoint-WP/{ => Interfaces}/scheduled.php (92%)
 rename src/TouchPoint-WP/{ => Interfaces}/storedAsPost.php (93%)
 rename src/TouchPoint-WP/{ => Interfaces}/updatesViaCron.php (93%)

diff --git a/.idea/TouchPoint-WP.iml b/.idea/TouchPoint-WP.iml
index 9431eab8..05581e0c 100644
--- a/.idea/TouchPoint-WP.iml
+++ b/.idea/TouchPoint-WP.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/TouchPoint-WP" isTestSource="false" packagePrefix="tp\TouchPointWP\" />
       <sourceFolder url="file://$MODULE_DIR$/src/TouchPoint-WP/Utilities" isTestSource="false" packagePrefix="tp\TouchPointWP\Utilities\" />
+      <sourceFolder url="file://$MODULE_DIR$/src/TouchPoint-WP/Interfaces" isTestSource="false" packagePrefix="tp\TouchPointWP\Interfaces\" />
       <excludeFolder url="file://$MODULE_DIR$/docs/phpApi" />
       <excludeFolder url="file://$MODULE_DIR$/vendorX" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4c167176..f50e5ab3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Black">
     <option name="sdkName" value="Python 3.10 (TouchPointScripts)" />
   </component>
+  <component name="PWA">
+    <option name="enabled" value="true" />
+    <option name="wasEnabledAtLeastOnce" value="true" />
+  </component>
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
   </component>
diff --git a/composer.json b/composer.json
index cc55b172..2a3e2b96 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
   "autoload": {
     "psr-4": {
       "tp\\TouchPointWP\\": "src/TouchPoint-WP",
-      "tp\\TouchPointWP\\Utilities\\": "src/TouchPoint-WP/Utilities"
+      "tp\\TouchPointWP\\Utilities\\": "src/TouchPoint-WP/Utilities",
+      "tp\\TouchPointWP\\Interfaces\\": "src/TouchPoint-WP/Interfaces"
     }
   },
   "require": {
diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
new file mode 100644
index 00000000..7ec5c7f7
--- /dev/null
+++ b/src/TouchPoint-WP/Api.php
@@ -0,0 +1,280 @@
+<?php
+
+namespace tp\TouchPointWP;
+
+use stdClass;
+use WP_Error;
+use WP_Http;
+
+/**
+ * This class handles communication with the TouchPoint API.
+ */
+class Api
+{
+	/**
+	 * The singleton of Api.
+	 */
+	private static ?Api $_instance = null;
+
+	/**
+	 * The main plugin object.
+	 */
+	public ?TouchPointWP $parent = null;
+
+	protected static bool $allowApiCalls = true;
+	protected static array $apiCallLog = [];
+	const MAX_API_CALLS = 20;
+
+	private ?WP_Http $httpClient = null;
+
+
+	/**
+	 * Constructor function.
+	 *
+	 * @param TouchPointWP $parent Parent object.
+	 */
+	public function __construct(TouchPointWP $parent)
+	{
+		$this->parent = $parent;
+	}
+
+	/**
+	 * Shortcut to the settings object.
+	 *
+	 * @return TouchPointWP_Settings
+	 */
+	protected function settings(): TouchPointWP_Settings
+	{
+		return $this->parent->settings;
+	}
+
+
+	/**
+	 * Main Api Instance
+	 *
+	 * Ensures only one instance of Api is loaded or can be loaded.
+	 *
+	 * @param ?TouchPointWP $parent Object instance.
+	 *
+	 * @return Api instance
+	 * @since 0.0.95 Added
+	 * @static
+	 * @see TouchPointWP()
+	 */
+	public static function instance(?TouchPointWP $parent = null): Api
+	{
+		if (is_null($parent)) {
+			$parent = TouchPointWP::instance();
+		}
+
+		if (is_null(self::$_instance)) {
+			self::$_instance = new self($parent);
+		}
+
+		return self::$_instance;
+	}
+
+
+	/**
+	 * Gets data from the API via the python script.
+	 *
+	 * @param string $command The thing to get
+	 * @param ?array $parameters URL parameters to be added.
+	 * @param int    $timeout Amount of time in sec to wait before timing out.
+	 *
+	 * @return stdClass|array An array with headers, body, and other keys
+	 * Data is generally in json_decode($response['body'])->data
+	 *
+	 * @throws TouchPointWP_Exception Thrown if the API credentials are incomplete.
+	 */
+	public function pyGet(string $command, ?array $parameters = null, int $timeout = 5, $verbose = false): array|stdClass
+	{
+		if ( ! is_array($parameters)) {
+			$parameters = (array)$parameters;
+		}
+
+		if ( ! $this->settings()->hasValidApiSettings()) {
+			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
+		}
+
+		if (!self::$allowApiCalls) {
+			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+		}
+
+		$this->checkApiValidity();
+
+		$parameters['a'] = $command;
+
+		$host = $this->parent->host();
+
+		if (!$host) {
+			throw new TouchPointWP_Exception(__('Host appears to be missing from TouchPoint-WP configuration.', 'TouchPoint-WP'), 170002);
+		}
+
+		$url = $host . "/PythonApi/" .
+		       $this->settings()->api_script_name . "?" . http_build_query($parameters);
+
+		self::$apiCallLog[] = $url;
+
+		if ($verbose) {
+			echo "<p>Request to $url</p>";
+		}
+
+		$r = $this->getHttpClient()->request(
+			$url,
+			[
+				'method'  => 'GET',
+				'headers' => [
+					'Authorization' => 'Basic ' . base64_encode(
+							$this->settings()->api_user . ':' . $this->settings()->api_pass
+						)
+				],
+				'timeout' => $timeout
+			]
+		);
+
+		return self::parseApiResponse($r);
+	}
+
+
+	/**
+	 * @param string $command The thing to post
+	 * @param ?mixed $data Data to post
+	 * @param int    $timeout Amount of time in sec to wait before timing out.
+	 *
+	 * @return stdClass|array An object that corresponds to the Data python object in TouchPoint.
+	 * @throws TouchPointWP_Exception  If anything went wrong.
+	 */
+	public function pyPost(string $command, mixed $data = null, int $timeout = 5): array|stdClass
+	{
+		$this->checkApiValidity();
+
+		$host = $this->parent->host();
+
+		if ( ! $host) {
+			throw new TouchPointWP_Exception(
+				__("Host appears to be missing from TouchPoint-WP configuration.", "TouchPoint-WP"), 170002
+			);
+		}
+
+		$data = json_encode(['inputData' => $data]);
+
+		$url = $host . "/PythonApi/" . $this->settings()->api_script_name . "?" . http_build_query(['a' => $command]);
+
+		self::$apiCallLog[] = $url;
+
+		$r = $this->getHttpClient()->request(
+			$url,
+			[
+				'method'  => 'POST',
+				'headers' => [
+					'Authorization' => 'Basic ' . base64_encode($this->settings()->api_user . ':' . $this->settings()->api_pass)
+				],
+				'body'    => ['data' => $data],
+				'timeout' => $timeout
+			]
+		);
+
+		return self::parseApiResponse($r);
+	}
+
+
+	/**
+	 * @return WP_Http|null
+	 */
+	protected final function getHttpClient(): ?WP_Http
+	{
+		if ($this->httpClient === null) {
+			$this->httpClient = new WP_Http();
+		}
+
+		return $this->httpClient;
+	}
+
+
+	/**
+	 * Check that we aren't hitting rate limits or have missing credentials.
+	 *
+	 * @throws TouchPointWP_Exception
+	 */
+	protected function checkApiValidity(): void
+	{
+		if ( ! $this->settings()->hasValidApiSettings()) {
+			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
+		}
+
+		if (!self::$allowApiCalls) {
+			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+		}
+
+		$mostCommon = "";
+		if (count(self::$apiCallLog) > self::MAX_API_CALLS) {
+			if ($this->parent->debug) {
+				$counts = array_count_values(self::$apiCallLog);
+				arsort($counts);
+				$mostCommon = "  Most Common: " . key($counts);
+			}
+
+			throw new TouchPointWP_Exception("Too many API calls have been attempted in this session.$mostCommon", 170009);
+		}
+	}
+
+
+	/**
+	 * @param $response
+	 *
+	 * @return stdClass|array
+	 * @throws TouchPointWP_Exception
+	 * @throws TouchPointWP_WPError
+	 */
+	private static function parseApiResponse($response): array|stdClass
+	{
+		if ($response instanceof WP_Error) {
+			throw new TouchPointWP_WPError($response);
+		}
+
+		if ($response['response']['code'] === 429) {
+			self::$allowApiCalls = false;
+			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+		}
+
+		$respDecoded = json_decode($response['body']);
+
+		if ($respDecoded === null) {
+			throw new TouchPointWP_Exception("Connection Error", 179000);
+		}
+
+		// Most likely the issue where a module import failed for no apparent reason.
+		if (property_exists($respDecoded, 'output') &&
+		    str_starts_with($respDecoded->output, "Traceback (most recent call last):")) {
+			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001);
+		}
+
+		// Some other script error
+		if (property_exists($respDecoded, 'output') && $respDecoded->output !== '') {
+			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179002);
+		}
+
+		// Error caught by error handling within Python script
+		if (property_exists($respDecoded, 'message') && $respDecoded->message !== '') {
+			throw new TouchPointWP_Exception($respDecoded->message, 179003);
+		}
+
+		if ( ! property_exists($respDecoded->data, "VERSION") || $respDecoded->data->VERSION !== TouchPointWP::VERSION) {
+			if (in_array("updateScripts", $respDecoded->data->a ?? [])) {
+				if (class_exists("TouchPointWP_AdminAPI")) {
+					TouchPointWP_AdminAPI::showError(
+						__(
+							"The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.",
+							"TouchPoint-WP"
+						)
+					);
+				}
+			} else {
+				self::instance()->settings()->updateDeployedScripts();
+			}
+		}
+
+		return $respDecoded->data;
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 5c9c11b5..50bfd5c9 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -6,6 +6,8 @@
 namespace tp\TouchPointWP;
 
 use Exception;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonQuery;
 use tp\TouchPointWP\Utilities\Session;
@@ -251,7 +253,7 @@ private static function createApiKeyIfNeeded(): void
 		$k    = self::validateApiKey(null, $host); // will return true or a new key.
 
 		if ($k !== true) {  // Only if the saved key is unset or invalid.  (
-			TouchPointWP::instance()->apiPost("auth_key_set", [
+			TouchPointWP::instance()->api->pyPost("auth_key_set", [
 				'apiKey' => $k,
 				'host'   => $host
 			]);
diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 0a541d3a..d6b7372d 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -19,7 +19,7 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once 'api.php';
+	require_once "Interfaces/api.php";
 }
 
 /**
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 04d17a43..5957f81d 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -9,13 +9,11 @@
 	exit(1);
 }
 
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\module;
 use WP_Post;
 use WP_Query;
 
-if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once 'api.php';
-}
-
 /**
  * Provides an interface to bridge the gap between The Events Calendar plugin (by Modern Tribe) and the TouchPoint
  * mobile app.
diff --git a/src/TouchPoint-WP/api.php b/src/TouchPoint-WP/Interfaces/api.php
similarity index 93%
rename from src/TouchPoint-WP/api.php
rename to src/TouchPoint-WP/Interfaces/api.php
index 3055c69b..a37c64fb 100644
--- a/src/TouchPoint-WP/api.php
+++ b/src/TouchPoint-WP/Interfaces/api.php
@@ -3,7 +3,7 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
+namespace tp\TouchPointWP\Interfaces;
 
 if ( ! defined('ABSPATH')) {
 	exit(1);
diff --git a/src/TouchPoint-WP/hasGeo.php b/src/TouchPoint-WP/Interfaces/hasGeo.php
similarity index 92%
rename from src/TouchPoint-WP/hasGeo.php
rename to src/TouchPoint-WP/Interfaces/hasGeo.php
index 7f43b542..d99418ae 100644
--- a/src/TouchPoint-WP/hasGeo.php
+++ b/src/TouchPoint-WP/Interfaces/hasGeo.php
@@ -3,7 +3,9 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
+namespace tp\TouchPointWP\Interfaces;
+
+use tp\TouchPointWP\Geo;
 
 if ( ! defined('ABSPATH')) {
 	exit(1);
diff --git a/src/TouchPoint-WP/hierarchical.php b/src/TouchPoint-WP/Interfaces/hierarchical.php
similarity index 92%
rename from src/TouchPoint-WP/hierarchical.php
rename to src/TouchPoint-WP/Interfaces/hierarchical.php
index d4e00e06..e8c71c26 100644
--- a/src/TouchPoint-WP/hierarchical.php
+++ b/src/TouchPoint-WP/Interfaces/hierarchical.php
@@ -3,9 +3,7 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
-
-use WP_Post;
+namespace tp\TouchPointWP\Interfaces;
 
 if ( ! defined('ABSPATH')) {
 	exit(1);
diff --git a/src/TouchPoint-WP/module.php b/src/TouchPoint-WP/Interfaces/module.php
similarity index 92%
rename from src/TouchPoint-WP/module.php
rename to src/TouchPoint-WP/Interfaces/module.php
index 42835cfe..b507e8d6 100644
--- a/src/TouchPoint-WP/module.php
+++ b/src/TouchPoint-WP/Interfaces/module.php
@@ -3,7 +3,7 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
+namespace tp\TouchPointWP\Interfaces;
 
 /**
  * This is a base interface for all feature classes.
diff --git a/src/TouchPoint-WP/scheduled.php b/src/TouchPoint-WP/Interfaces/scheduled.php
similarity index 92%
rename from src/TouchPoint-WP/scheduled.php
rename to src/TouchPoint-WP/Interfaces/scheduled.php
index 02b78736..d26b8012 100644
--- a/src/TouchPoint-WP/scheduled.php
+++ b/src/TouchPoint-WP/Interfaces/scheduled.php
@@ -3,7 +3,7 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
+namespace tp\TouchPointWP\Interfaces;
 
 /**
  * This is a base interface for classes that have "schedule" strings.
diff --git a/src/TouchPoint-WP/storedAsPost.php b/src/TouchPoint-WP/Interfaces/storedAsPost.php
similarity index 93%
rename from src/TouchPoint-WP/storedAsPost.php
rename to src/TouchPoint-WP/Interfaces/storedAsPost.php
index b28e8487..170fa896 100644
--- a/src/TouchPoint-WP/storedAsPost.php
+++ b/src/TouchPoint-WP/Interfaces/storedAsPost.php
@@ -3,7 +3,7 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
+namespace tp\TouchPointWP\Interfaces;
 
 use WP_Post;
 
diff --git a/src/TouchPoint-WP/updatesViaCron.php b/src/TouchPoint-WP/Interfaces/updatesViaCron.php
similarity index 93%
rename from src/TouchPoint-WP/updatesViaCron.php
rename to src/TouchPoint-WP/Interfaces/updatesViaCron.php
index 30351347..a1de1e53 100644
--- a/src/TouchPoint-WP/updatesViaCron.php
+++ b/src/TouchPoint-WP/Interfaces/updatesViaCron.php
@@ -3,7 +3,7 @@
  * @package TouchPointWP
  */
 
-namespace tp\TouchPointWP;
+namespace tp\TouchPointWP\Interfaces;
 
 if ( ! defined('ABSPATH')) {
 	exit(1);
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 6a0677d7..318575ea 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -10,12 +10,11 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once "api.php";
 	require_once "jsInstantiation.php";
 	require_once "jsonLd.php";
-	require_once "hierarchical.php";
-	require_once "scheduled.php";
-	require_once "updatesViaCron.php";
+	require_once "Interfaces/hierarchical.php";
+	require_once "Interfaces/scheduled.php";
+	require_once "Interfaces/updatesViaCron.php";
 	require_once "Utilities.php";
 	require_once "Involvement_PostTypeSettings.php";
 }
@@ -26,6 +25,12 @@
 use Exception;
 use JsonSerializable;
 use stdClass;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\hasGeo;
+use tp\TouchPointWP\Interfaces\hierarchical;
+use tp\TouchPointWP\Interfaces\module;
+use tp\TouchPointWP\Interfaces\scheduled;
+use tp\TouchPointWP\Interfaces\updatesViaCron;
 use tp\TouchPointWP\Utilities\DateFormats;
 use tp\TouchPointWP\Utilities\DateTimeExtended;
 use tp\TouchPointWP\Utilities\Http;
@@ -2534,7 +2539,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 				$qOpts['mtgFuture'] = 365;
 			}
 
-			$response = TouchPointWP::instance()->apiGet("Invs", $qOpts, 180, $verbose);
+			$response = TouchPointWP::instance()->api->pyGet("Invs", $qOpts, 180, $verbose);
 
 		} catch (TouchPointWP_Exception) {
 			return false;
@@ -3901,7 +3906,7 @@ private static function ajaxInvJoin(): void
 		}
 
 		try {
-			$data = TouchPointWP::instance()->apiPost('inv_join', $inputData);
+			$data = TouchPointWP::instance()->api->pyPost('inv_join', $inputData);
 		} catch (TouchPointWP_Exception $ex) {
 			http_response_code(Http::SERVER_ERROR);
 			echo json_encode(['error' => $ex->getMessage()]);
@@ -4007,7 +4012,7 @@ private static function ajaxContact(): void
 
 		// Submit the contact
 		try {
-			$data = TouchPointWP::instance()->apiPost('inv_contact', $inputData);
+			$data = TouchPointWP::instance()->api->pyPost('inv_contact', $inputData);
 		} catch (TouchPointWP_Exception $ex) {
 			http_response_code(Http::SERVER_ERROR);
 			echo json_encode(['error' => $ex->getMessage()]);
diff --git a/src/TouchPoint-WP/Location.php b/src/TouchPoint-WP/Location.php
index 393c198c..54f9aeb7 100644
--- a/src/TouchPoint-WP/Location.php
+++ b/src/TouchPoint-WP/Location.php
@@ -5,6 +5,8 @@
 
 namespace tp\TouchPointWP;
 
+use tp\TouchPointWP\Interfaces\hasGeo;
+
 /**
  * A Location is generally a physical place, with an internet connection.  These likely correspond to campuses, but
  * don't necessarily need to.
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 77bc1ecc..7e73eb2e 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -10,18 +10,23 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once 'api.php';
-	require_once 'hierarchical.php';
-	require_once 'scheduled.php';
+	require_once "Interfaces/api.php";
+	require_once "Interfaces/hierarchical.php";
+	require_once "Interfaces/scheduled.php";
 }
 
 use DateTime;
 use DateTimeImmutable;
 use Exception;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\hasGeo;
+use tp\TouchPointWP\Interfaces\hierarchical;
+use tp\TouchPointWP\Interfaces\module;
+use tp\TouchPointWP\Interfaces\scheduled;
 use tp\TouchPointWP\Utilities\DateFormats;
+use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
-use tp\TouchPointWP\Utilities\Http;
 use WP_Query;
 use WP_Term;
 
@@ -667,7 +672,7 @@ public function getTouchPointId(): int
 	 */
 	private static function getMeetingInfoForRsvp($opts): object
 	{
-		return TouchPointWP::instance()->apiPost('mtg', $opts);
+		return TouchPointWP::instance()->api->pyPost('mtg', $opts);
 	}
 
 	/**
@@ -725,7 +730,7 @@ private static function ajaxSubmitRsvps(): void
 		}
 
 		try {
-			$data = TouchPointWP::instance()->apiPost('mtg_rsvp', json_decode($inputData));
+			$data = TouchPointWP::instance()->api->pyPost('mtg_rsvp', json_decode($inputData));
 		} catch (Exception $ex) {
 			http_response_code(Http::SERVER_ERROR);
 			echo json_encode(['error' => $ex->getMessage()]);
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 17df2f6c..cbe34916 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -10,15 +10,19 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once "api.php";
+	require_once "Interfaces/api.php";
 	require_once "jsInstantiation.php";
-	require_once "updatesViaCron.php";
+	require_once "Interfaces/updatesViaCron.php";
 	require_once "Utilities.php";
 }
 
 use Exception;
 use JsonSerializable;
 use stdClass;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\hasGeo;
+use tp\TouchPointWP\Interfaces\module;
+use tp\TouchPointWP\Interfaces\updatesViaCron;
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Error;
 use WP_Post;
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 8182216b..bb718968 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -10,10 +10,10 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once "api.php";
+	require_once "Interfaces/api.php";
 	require_once "extraValues.php";
 	require_once "jsInstantiation.php";
-	require_once "updatesViaCron.php";
+	require_once "Interfaces/updatesViaCron.php";
 	require_once "InvolvementMembership.php";
 	require_once "Utilities.php";
 	require_once "Utilities/PersonQuery.php";
@@ -23,6 +23,9 @@
 use Exception;
 use JsonSerializable;
 use stdClass;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\module;
+use tp\TouchPointWP\Interfaces\updatesViaCron;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
@@ -1117,7 +1120,7 @@ protected static function updatePeopleWordPressIDs()
 			return;
 		}
 		try {
-			TouchPointWP::instance()->apiPost('person_wpIds', [
+			TouchPointWP::instance()->api->pyPost('person_wpIds', [
 				'people' => self::$_peopleWhoNeedWpIdUpdatedInTouchPoint,
 				'evName' => TouchPointWP::instance()->settings->people_ev_wpId
 			]);
@@ -1619,7 +1622,7 @@ public static function ident($inputData): array
 	{
 		try {
 			$inputData->context = "ident";
-			$data               = TouchPointWP::instance()->apiPost('ident', $inputData, 30);
+			$data               = TouchPointWP::instance()->api->pyPost('ident', $inputData, 30);
 		} catch (Exception $ex) {
 			http_response_code(Http::SERVER_ERROR);
 			echo json_encode(['error' => $ex->getMessage()]);
@@ -1696,7 +1699,7 @@ private static function ajaxSrc(): void
 
 		if ($q['q'] !== '') {
 			try {
-				$data = TouchPointWP::instance()->apiGet('src', $q, 30);
+				$data = TouchPointWP::instance()->api->pyGet('src', $q, 30);
 				$data = $data->people ?? [];
 			} catch (Exception $ex) {
 				http_response_code(Http::SERVER_ERROR);
@@ -1857,7 +1860,7 @@ private static function ajaxContact(): void
 
 		// Submit the contact
 		try {
-			$data = TouchPointWP::instance()->apiPost('person_contact', $inputData);
+			$data = TouchPointWP::instance()->api->pyPost('person_contact', $inputData);
 		} catch (Exception $ex) {
 			http_response_code(Http::SERVER_ERROR);
 			echo json_encode(['error' => $ex->getMessage()]);
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 1c4bcd8b..9911b434 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -6,11 +6,13 @@
 
 namespace tp\TouchPointWP;
 
+use tp\TouchPointWP\Interfaces\module;
+use tp\TouchPointWP\Interfaces\storedAsPost;
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
 
-require_once 'module.php';
-require_once 'storedAsPost.php';
+require_once 'Interfaces/module.php';
+require_once 'Interfaces/storedAsPost.php';
 
 /**
  * This is a base class for those objects that can be derived from a Post.
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index fbac7e83..27eee523 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -9,6 +9,10 @@
 use DateTime;
 use Exception;
 use JsonSerializable;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\module;
+use tp\TouchPointWP\Interfaces\storedAsPost;
+use tp\TouchPointWP\Interfaces\updatesViaCron;
 use tp\TouchPointWP\Utilities\Database;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\ImageConversions;
@@ -21,9 +25,9 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once "api.php";
-	require_once "updatesViaCron.php";
-	require_once "storedAsPost.php";
+	require_once "Interfaces/api.php";
+	require_once "Interfaces/updatesViaCron.php";
+	require_once "Interfaces/storedAsPost.php";
 	require_once "Utilities/ImageConversions.php";
 	require_once "Utilities/Http.php";
 	require_once "Utilities/Database.php";
@@ -609,7 +613,7 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 
 		$updates = [];
 		if (count($needsUpdate) > 0) {
-			$data    = TouchPointWP::instance()->apiPost('report_run', ['reports' => $needsUpdate], 60);
+			$data    = TouchPointWP::instance()->api->pyPost('report_run', ['reports' => $needsUpdate], 60);
 			$updates = $data->report_results ?? [];
 		}
 
diff --git a/src/TouchPoint-WP/Rsvp.php b/src/TouchPoint-WP/Rsvp.php
index d3c2ca6e..a78f680a 100644
--- a/src/TouchPoint-WP/Rsvp.php
+++ b/src/TouchPoint-WP/Rsvp.php
@@ -7,6 +7,8 @@
 
 // TODO sort out what goes here, and what goes in Meetings.  Answer: all of this should go to Meetings.
 
+use tp\TouchPointWP\Interfaces\module;
+
 if ( ! defined('ABSPATH')) {
 	exit(1);
 }
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 770f1343..1e2417ad 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -7,6 +7,8 @@
 
 use Exception;
 use InvalidArgumentException;
+use tp\TouchPointWP\Interfaces\api;
+use tp\TouchPointWP\Interfaces\updatesViaCron;
 use tp\TouchPointWP\Utilities\Http;
 
 if ( ! defined('ABSPATH')) {
@@ -14,8 +16,8 @@
 }
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once "api.php";
-	require_once "updatesViaCron.php";
+	require_once "Interfaces/api.php";
+	require_once "Interfaces/updatesViaCron.php";
 }
 
 /**
@@ -188,9 +190,19 @@ public function updateDb(): bool
 		if ($this->_dirty) {
 			$d = $this->jsonSerialize();
 			unset($d['siteId']);
-			$r = update_option('tp_wp_stats', json_encode($d));
+
+			// Check if update is actually needed. If not, return true.
+			$d = json_encode($d);
+			if ($d === get_option('tp_wp_stats')) {
+				$this->_dirty = false;
+				return true;
+			}
+
+			$r = update_option('tp_wp_stats', $d);
 			if ($r) {
 				$this->_dirty = false;
+			} else if (WP_DEBUG) {
+				error_log("TouchPoint-WP Stats: Failed to save update to local database.");
 			}
 			return $r;
 		}
@@ -261,11 +273,11 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 		$data['wpTimezone'] = get_option('timezone_string');
 		$data['adminEmail'] = get_option('admin_email');
 		$data['siteName'] = get_bloginfo('name');
-		$data['siteLogoUrl'] = get_theme_mod('custom_logo');
-		if ($data['siteLogoUrl']) {
-			$data['siteLogoUrl'] = esc_url(wp_get_attachment_image_src($data['siteLogoUrl'], 'full')[0]);
+		$data['siteLogo'] = get_theme_mod('custom_logo');
+		if ($data['siteLogo']) {
+			$data['siteLogo'] = esc_url(wp_get_attachment_image_src($data['siteLogo'], 'full')[0]);
 		} else {
-			$data['siteLogoUrl'] = '';
+			$data['siteLogo'] = '';
 		}
 		$data['listPublicly'] = 1 * ($sets->enable_public_listing === 'on');
 		$data['installId'] = $this->installId;
@@ -305,11 +317,12 @@ protected function submitStats(): void
 			return;
 		}
 
-		wp_remote_post($endpoint, [
+		$r = wp_remote_post($endpoint, [
 			'body' => ['data' => $data],
 			'timeout' => 10,
-			'blocking' => false,
+//			'blocking' => false,
 		]);
+		var_dump($endpoint, $r, $data);
 		echo "ok";
 	}
 
@@ -343,7 +356,6 @@ protected function replacePrivateKey(): void
 	{
 		$this->privateKey = Utilities::createGuid();
 		$this->_dirty = true;
-		$this->updateDb();
 	}
 
 	/**
@@ -362,6 +374,8 @@ protected function updateQueriedStats(): void
 		$this->partnerPosts     = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
 
 		$this->_dirty = true;
+
+		$this->updateDb();
 	}
 
 	/**
@@ -394,13 +408,14 @@ public static function api(array $uri): bool
 
 		switch (strtolower($uri['path'][2])) {
 			case "get":
-				if (strtolower($_GET['key']) == strtolower($s->privateKey) ||
+				if (strtolower($_GET['key'] ?? "") == strtolower($s->privateKey) ||
 				    current_user_can('manage_options')) {
 					header('Content-Type: application/json');
-					$s->updateQueriedStats();
-					echo json_encode($s->getStatsForSubmission());
+					echo json_encode($s->getStatsForSubmission(true));
+					$s->updateDb();
 					exit;
 				}
+				break;
 
 			case "submit":
 				if ($_SERVER['REQUEST_METHOD'] === "POST") {
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 98a85cac..70d99f5e 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -123,6 +123,11 @@ class TouchPointWP
 	 */
 	public ?TouchPointWP_Settings $settings = null;
 
+	/**
+	 * API object
+	 */
+	public ?Api $api = null;
+
 	/**
 	 * The main plugin file.
 	 */
@@ -633,7 +638,12 @@ public function loadLocalizations(): void
 		load_plugin_textdomain('TouchPoint-WP', false, $dir . '/i18n/');
 	}
 
-	public static function isTenth()
+	/**
+	 * A few things are only relevant for the mother ship.  This is particularly for setting up telemetry.
+	 *
+	 * @return bool
+	 */
+	public static function isTenth(): bool
 	{
 		return site_url() === "https://www.tenth.org";
 	}
@@ -736,6 +746,10 @@ public static function load($file): TouchPointWP
 			}
 		}
 
+		if (is_null($instance->api)) {
+			$instance->api = Api::instance($instance);
+		}
+
 		Stats::load();
 
 		// Load Auth tool if enabled.
@@ -1631,7 +1645,7 @@ public function getDivisions(): array
 	private function updateDivisions(): object|bool
 	{
 		try {
-			$data = $this->apiGet('Divisions');
+			$data = $this->api->pyGet('Divisions');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -1656,7 +1670,7 @@ private function updateDivisions(): object|bool
 	private function getMemberTypesForDivisions_fromApi($divisions): object|bool
 	{
 		try {
-			$return = $this->apiGet('MemTypes', ['divs' => $divisions]);
+			$return = $this->api->pyGet('MemTypes', ['divs' => $divisions]);
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -1744,7 +1758,7 @@ public function getCampuses(): array
 	private function updateCampuses()
 	{
 		try {
-			$data = $this->apiGet('Campuses');
+			$data = $this->api->pyGet('Campuses');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -1770,7 +1784,7 @@ private function updateCampuses()
 	private function updateResCodes()
 	{
 		try {
-			$data = $this->apiGet('ResCodes');
+			$data = $this->api->pyGet('ResCodes');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -1831,7 +1845,7 @@ public function getGenders(): array
 	private function updateGenders()
 	{
 		try {
-			$data = $this->apiGet('Genders');
+			$data = $this->api->pyGet('Genders');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -2089,7 +2103,7 @@ public function getSavedSearches(?int $peopleId = null, $includeValue = null): a
 		}
 
 		try {
-			$data = $this->apiGet('SavedSearches', ['PeopleId' => $peopleId]);
+			$data = $this->api->pyGet('SavedSearches', ['PeopleId' => $peopleId]);
 		} catch (TouchPointWP_Exception) {
 			return [];
 		}
@@ -2146,7 +2160,7 @@ public static function flattenArrayToKV(array $array, string $kField, string $vF
 	private function updateKeywords()
 	{
 		try {
-			$data = $this->apiGet('Keywords');
+			$data = $this->api->pyGet('Keywords');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -2175,7 +2189,7 @@ private function updateKeywords()
 	public function updatePersonEvFields()
 	{
 		try {
-			$data = $this->apiGet('PersonEvFields');
+			$data = $this->api->pyGet('PersonEvFields');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -2204,7 +2218,7 @@ public function updatePersonEvFields()
 	public function updateFamilyEvFields()
 	{
 		try {
-			$data = $this->apiGet('FamilyEvFields');
+			$data = $this->api->pyGet('FamilyEvFields');
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
@@ -2225,31 +2239,6 @@ public function updateFamilyEvFields()
 		return $obj;
 	}
 
-	/**
-	 * @throws TouchPointWP_Exception
-	 */
-	protected function checkApiValidity(): void
-	{
-		if ( ! $this->settings->hasValidApiSettings()) {
-			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
-		}
-
-		if (!self::$allowApiCalls) {
-			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
-		}
-
-		$mostCommon = "";
-		if (count(self::$apiCallLog) > self::MAX_API_CALLS) {
-			if ($this->debug) {
-				$counts = array_count_values(self::$apiCallLog);
-				arsort($counts);
-				$mostCommon = "  Most Common: " . key($counts);
-			}
-
-			throw new TouchPointWP_Exception("Too many API calls have been attempted in this session.$mostCommon", 170009);
-		}
-	}
-
 	/**
 	 * @param string $command The thing to get
 	 * @param ?array $parameters URL parameters to be added.
@@ -2258,55 +2247,14 @@ protected function checkApiValidity(): void
 	 * @return stdClass|array An array with headers, body, and other keys
 	 * Data is generally in json_decode($response['body'])->data
 	 *
+	 * @deprecated 0.0.95 Use Api::pyGet instead.
+	 *
 	 * @throws TouchPointWP_Exception Thrown if the API credentials are incomplete.
 	 */
 	public function apiGet(string $command, ?array $parameters = null, int $timeout = 5, $verbose = false): array|stdClass
 	{
-		if ( ! is_array($parameters)) {
-			$parameters = (array)$parameters;
-		}
-
-		if ( ! $this->settings->hasValidApiSettings()) {
-			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
-		}
-
-		if (!self::$allowApiCalls) {
-			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
-		}
-
-		$this->checkApiValidity();
-
-		$parameters['a'] = $command;
-
-		$host = $this->host();
-
-		if (!$host) {
-			throw new TouchPointWP_Exception(__('Host appears to be missing from TouchPoint-WP configuration.', 'TouchPoint-WP'), 170002);
-		}
-
-		$url = $host . "/PythonApi/" .
-		       $this->settings->api_script_name . "?" . http_build_query($parameters);
-
-		self::$apiCallLog[] = $url;
-
-		if ($verbose) {
-			echo "<p>Request to $url</p>";
-		}
-
-		$r = $this->getHttpClient()->request(
-			$url,
-			[
-				'method'  => 'GET',
-				'headers' => [
-					'Authorization' => 'Basic ' . base64_encode(
-							$this->settings->api_user . ':' . $this->settings->api_pass
-						)
-				],
-				'timeout' => $timeout
-			]
-		);
-
-		return self::parseApiResponse($r);
+		// TODO obviate a notice that a deprecated function is being used.
+		return $this->api->pyGet($command, $parameters, $timeout, $verbose);
 	}
 
 	/**
@@ -2315,101 +2263,15 @@ public function apiGet(string $command, ?array $parameters = null, int $timeout
 	 * @param int    $timeout Amount of time in sec to wait before timing out.
 	 *
 	 * @return stdClass|array An object that corresponds to the Data python object in TouchPoint.
+	 *
+	 * @deprecated 0.0.95 Use Api::pyPost instead.
+	 *
 	 * @throws TouchPointWP_Exception  If anything went wrong.
 	 */
 	public function apiPost(string $command, mixed $data = null, int $timeout = 5): array|stdClass
 	{
-		$this->checkApiValidity();
-
-		$host = $this->host();
-
-		if ( ! $host) {
-			throw new TouchPointWP_Exception(
-				__("Host appears to be missing from TouchPoint-WP configuration.", "TouchPoint-WP"), 170002
-			);
-		}
-
-		$data = json_encode(['inputData' => $data]);
-
-		$url = $host . "/PythonApi/" . $this->settings->api_script_name . "?" . http_build_query(['a' => $command]);
-
-		self::$apiCallLog[] = $url;
-
-		$r = $this->getHttpClient()->request(
-			$url,
-			[
-				'method'  => 'POST',
-				'headers' => [
-					'Authorization' => 'Basic ' . base64_encode($this->settings->api_user . ':' . $this->settings->api_pass)
-				],
-				'body'    => ['data' => $data],
-				'timeout' => $timeout
-			]
-		);
-
-		return self::parseApiResponse($r);
-	}
-
-	protected static bool $allowApiCalls = true;
-	protected static array $apiCallLog = [];
-	const MAX_API_CALLS = 20;
-
-	/**
-	 * @param $response
-	 *
-	 * @return stdClass|array
-	 * @throws TouchPointWP_Exception
-	 * @throws TouchPointWP_WPError
-	 */
-	private static function parseApiResponse($response): array|stdClass
-	{
-		if ($response instanceof WP_Error) {
-			throw new TouchPointWP_WPError($response);
-		}
-
-		if ($response['response']['code'] === 429) {
-			self::$allowApiCalls = false;
-			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
-		}
-
-		$respDecoded = json_decode($response['body']);
-
-		if ($respDecoded === null) {
-			throw new TouchPointWP_Exception("Connection Error", 179000);
-		}
-
-		// Most likely the issue where a module import failed for no apparent reason.
-		if (property_exists($respDecoded, 'output') &&
-			str_starts_with($respDecoded->output, "Traceback (most recent call last):")) {
-			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001);
-		}
-
-		// Some other script error
-		if (property_exists($respDecoded, 'output') && $respDecoded->output !== '') {
-			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179002);
-		}
-
-		// Error caught by error handling within Python script
-		if (property_exists($respDecoded, 'message') && $respDecoded->message !== '') {
-			throw new TouchPointWP_Exception($respDecoded->message, 179003);
-		}
-
-		if ( ! property_exists($respDecoded->data, "VERSION") || $respDecoded->data->VERSION !== self::VERSION) {
-			if (in_array("updateScripts", $respDecoded->data->a ?? [])) {
-				if (class_exists("TouchPointWP_AdminAPI")) {
-					TouchPointWP_AdminAPI::showError(
-						__(
-							"The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.",
-							"TouchPoint-WP"
-						)
-					);
-				}
-			} else {
-				self::instance()->settings->updateDeployedScripts();
-			}
-		}
-
-		return $respDecoded->data;
+		// TODO obviate a notice that a deprecated function is being used.
+		return $this->api->pyPost($command, $data, $timeout);
 	}
 
 	/**
@@ -2452,7 +2314,7 @@ public function extGet(string $url, ?array $parameters = null): array
 	public function doPersonQuery(array $q, bool $verbose = false, int $timeout = 5): stdClass
 	{
 		set_time_limit($timeout + 2);
-		$data = TouchPointWP::instance()->apiPost('people_get', $q, $timeout);
+		$data = TouchPointWP::instance()->api->pyPost('people_get', $q, $timeout);
 		// An exception may already be thrown.
 
 		// Validate that the API returned something
@@ -2471,6 +2333,8 @@ public function doPersonQuery(array $q, bool $verbose = false, int $timeout = 5)
 	}
 
 	/**
+	 * @depecated 0.0.95 Use Api version instead.
+	 *
 	 * @return WP_Http|null
 	 */
 	private function getHttpClient(): ?WP_Http
@@ -2563,8 +2427,10 @@ public static function enqueueActionsStyle(string $action): void
 		/**
 		 * Filter to determine if the stylesheet that adjusts SWAL and other action-related items should be included.
 		 *
-		 * @params bool $include Whether to include the styles.  Default true = include.
+		 * @params bool $includeActionsStyle Whether to include the styles.  Default true = include.
 		 * @params string $action The action that is being performed.
+		 *
+		 * @noinspection PhpConditionAlreadyCheckedInspection
 		 */
 		$includeActionsStyle = !!apply_filters("tp_include_actions_style", $includeActionsStyle, $action);
 		if ($includeActionsStyle) {
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index b41f04dd..0888657a 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -5,12 +5,13 @@
 
 namespace tp\TouchPointWP;
 
+use tp\TouchPointWP\Interfaces\api;
 use tp\TouchPointWP\Utilities\Http;
 use WP_Post;
 use ZipArchive;
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once 'api.php';
+	require_once "Interfaces/api.php";
 }
 
 if ( ! defined('ABSPATH')) {
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index fbf702ca..13b925ce 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1623,7 +1623,7 @@ public function updateDeployedScripts(): void
 		$scripts = ["WebApi"];
 
 		$scriptContent = TouchPointWP::instance()->admin()->generatePython(false, $scripts);
-		$data          = TouchPointWP::instance()->apiPost('updateScripts', $scriptContent, 60);
+		$data          = TouchPointWP::instance()->api->pyPost('updateScripts', $scriptContent, 60);
 		$updates       = $data->scriptsUpdated ?? 0;
 
 		if (count($scriptContent) !== $updates) {
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 037fa398..82be7257 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -951,5 +951,4 @@ public static function validateMessage(?string $nickname, ?string $emailAddress,
 		}
 		return true;
 	}
-
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities/Cleanup.php b/src/TouchPoint-WP/Utilities/Cleanup.php
index b23be982..3ad5b91b 100644
--- a/src/TouchPoint-WP/Utilities/Cleanup.php
+++ b/src/TouchPoint-WP/Utilities/Cleanup.php
@@ -6,8 +6,8 @@
 namespace tp\TouchPointWP\Utilities;
 
 use Exception;
-use tp\TouchPointWP\api;
 use tp\TouchPointWP\ExtraValueHandler;
+use tp\TouchPointWP\Interfaces\api;
 use tp\TouchPointWP\Partner;
 use tp\TouchPointWP\Person;
 use tp\TouchPointWP\TouchPointWP;
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 4c54688e..b7118ca1 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -45,9 +45,10 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_WPError.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Settings.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Api.php";
 
-	require_once __DIR__ . "/src/TouchPoint-WP/api.php";
-	require_once __DIR__ . "/src/TouchPoint-WP/module.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/api.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/module.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/PostTypeCapable.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/RegistrationType.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Geo.php";
@@ -60,7 +61,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateTimeExtended.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Taxonomies.php";
-	require_once __DIR__ . "/src/TouchPoint-WP/hasGeo.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/hasGeo.php";
 
 	require_once __DIR__ . "/src/TouchPoint-WP/Person.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Meeting.php";

From c9fb772dbdaec0a70e635d6769d1ef297aa9c5da Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 7 Mar 2025 14:05:15 -0500
Subject: [PATCH 251/423] Refactor widget for better namespacing. Cleanup some
 things for telemetry

---
 docs                                          |   2 +-
 i18n/TouchPoint-WP-es_ES.po                   | 232 +++++++--------
 i18n/TouchPoint-WP.pot                        | 270 +++++++++---------
 ...uchPointWP_Widget.php => StatusWidget.php} |   6 +-
 src/TouchPoint-WP/TouchPointWP.php            |   6 +-
 5 files changed, 260 insertions(+), 256 deletions(-)
 rename src/TouchPoint-WP/{TouchPointWP_Widget.php => StatusWidget.php} (98%)

diff --git a/docs b/docs
index 01f959fa..652a683d 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 01f959faa7b2ef2c2307d6aef36454a2be2466b1
+Subproject commit 652a683d7870a7623f1d0bad5a07a5d15caef5f9
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 204bc25d..1dc3216a 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -88,8 +88,8 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:165
 #: src/templates/admin/invKoForm.php:318
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:758
-#: src/TouchPoint-WP/Rsvp.php:75
+#: src/TouchPoint-WP/Meeting.php:763
+#: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
 msgid "Loading..."
@@ -124,13 +124,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:237
-#: src/TouchPoint-WP/Involvement.php:1856
+#: src/TouchPoint-WP/Involvement.php:1871
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:241
-#: src/TouchPoint-WP/Involvement.php:1882
+#: src/TouchPoint-WP/Involvement.php:1897
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -174,7 +174,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2102
+#: src/TouchPoint-WP/Involvement.php:2117
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -184,168 +184,168 @@ msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:142
+#: src/TouchPoint-WP/Auth.php:144
 msgid "Sign in with your %s account"
 msgstr "Inicie sesión con su cuenta de %s"
 
-#: src/TouchPoint-WP/Auth.php:410
+#: src/TouchPoint-WP/Auth.php:412
 msgid "Your login token expired."
 msgstr "Su token de inicio de sesión caducó."
 
-#: src/TouchPoint-WP/Auth.php:425
+#: src/TouchPoint-WP/Auth.php:427
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
-#: src/TouchPoint-WP/Auth.php:437
+#: src/TouchPoint-WP/Auth.php:439
 msgid "Session could not be validated."
 msgstr "No se pudo validar la sesión."
 
-#: src/TouchPoint-WP/EventsCalendar.php:79
+#: src/TouchPoint-WP/EventsCalendar.php:77
 msgid "Recurring"
 msgstr "Periódico"
 
-#: src/TouchPoint-WP/EventsCalendar.php:82
-#: src/TouchPoint-WP/EventsCalendar.php:299
+#: src/TouchPoint-WP/EventsCalendar.php:80
+#: src/TouchPoint-WP/EventsCalendar.php:297
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:498
+#: src/TouchPoint-WP/Involvement.php:513
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:503
+#: src/TouchPoint-WP/Involvement.php:518
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:510
+#: src/TouchPoint-WP/Involvement.php:525
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:516
+#: src/TouchPoint-WP/Involvement.php:531
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1731
-#: src/TouchPoint-WP/Partner.php:825
+#: src/TouchPoint-WP/Involvement.php:1746
+#: src/TouchPoint-WP/Partner.php:839
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1939
-#: src/TouchPoint-WP/Partner.php:849
+#: src/TouchPoint-WP/Involvement.php:1954
+#: src/TouchPoint-WP/Partner.php:863
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3571
+#: src/TouchPoint-WP/Involvement.php:3586
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3574
+#: src/TouchPoint-WP/Involvement.php:3589
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3651
+#: src/TouchPoint-WP/Involvement.php:3666
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3721
-#: src/TouchPoint-WP/Involvement.php:3780
+#: src/TouchPoint-WP/Involvement.php:3736
+#: src/TouchPoint-WP/Involvement.php:3795
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3727
+#: src/TouchPoint-WP/Involvement.php:3742
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3731
+#: src/TouchPoint-WP/Involvement.php:3746
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3736
+#: src/TouchPoint-WP/Involvement.php:3751
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3739
+#: src/TouchPoint-WP/Involvement.php:3754
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3742
+#: src/TouchPoint-WP/Involvement.php:3757
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3745
+#: src/TouchPoint-WP/Involvement.php:3760
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3771
+#: src/TouchPoint-WP/Involvement.php:3786
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3668
-#: src/TouchPoint-WP/Partner.php:1329
+#: src/TouchPoint-WP/Involvement.php:3683
+#: src/TouchPoint-WP/Partner.php:1343
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:856
+#: src/TouchPoint-WP/Partner.php:870
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1270
+#: src/TouchPoint-WP/Partner.php:1284
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
-#: src/TouchPoint-WP/Person.php:150
+#: src/TouchPoint-WP/Person.php:153
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr "No se proporcionó una identificación de usuario de WordPress para inicializar un objeto de persona."
 
-#: src/TouchPoint-WP/Person.php:642
+#: src/TouchPoint-WP/Person.php:645
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1192
+#: src/TouchPoint-WP/Person.php:1195
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:757
-#: src/TouchPoint-WP/Meeting.php:778
-#: src/TouchPoint-WP/Rsvp.php:80
+#: src/TouchPoint-WP/Meeting.php:762
+#: src/TouchPoint-WP/Meeting.php:783
+#: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2047
+#: src/TouchPoint-WP/TouchPointWP.php:2064
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2104
+#: src/TouchPoint-WP/TouchPointWP.php:2121
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2107
+#: src/TouchPoint-WP/TouchPointWP.php:2124
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2110
+#: src/TouchPoint-WP/TouchPointWP.php:2127
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2115
-#: src/TouchPoint-WP/TouchPointWP.php:2116
+#: src/TouchPoint-WP/TouchPointWP.php:2132
+#: src/TouchPoint-WP/TouchPointWP.php:2133
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2233
-#: src/TouchPoint-WP/TouchPointWP.php:2269
+#: src/TouchPoint-WP/Api.php:97
+#: src/TouchPoint-WP/Api.php:203
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2283
-#: src/TouchPoint-WP/TouchPointWP.php:2327
+#: src/TouchPoint-WP/Api.php:111
+#: src/TouchPoint-WP/Api.php:156
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2459
+#: src/TouchPoint-WP/TouchPointWP.php:2324
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -808,7 +808,7 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1451
+#: src/TouchPoint-WP/Person.php:1454
 #: src/TouchPoint-WP/Utilities.php:286
 #: assets/js/base-defer.js:18
 msgid "and"
@@ -972,7 +972,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2400
+#: src/TouchPoint-WP/Api.php:267
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1027,16 +1027,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1904
+#: src/TouchPoint-WP/Involvement.php:1919
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1917
+#: src/TouchPoint-WP/Involvement.php:1932
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1788
+#: src/TouchPoint-WP/Involvement.php:1803
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1198,72 +1198,72 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1905
+#: src/TouchPoint-WP/Involvement.php:1920
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1906
+#: src/TouchPoint-WP/Involvement.php:1921
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1947
-#: src/TouchPoint-WP/Partner.php:865
+#: src/TouchPoint-WP/Involvement.php:1962
+#: src/TouchPoint-WP/Partner.php:879
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1950
-#: src/TouchPoint-WP/Partner.php:868
+#: src/TouchPoint-WP/Involvement.php:1965
+#: src/TouchPoint-WP/Partner.php:882
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:998
-#: src/TouchPoint-WP/Involvement.php:1030
-#: src/TouchPoint-WP/Involvement.php:1123
-#: src/TouchPoint-WP/Involvement.php:1147
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:71
+#: src/TouchPoint-WP/Involvement.php:1013
+#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Involvement.php:1138
+#: src/TouchPoint-WP/Involvement.php:1162
+#: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1039
+#: src/TouchPoint-WP/Involvement.php:1054
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1048
+#: src/TouchPoint-WP/Involvement.php:1063
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1057
+#: src/TouchPoint-WP/Involvement.php:1072
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1065
+#: src/TouchPoint-WP/Involvement.php:1080
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1073
+#: src/TouchPoint-WP/Involvement.php:1088
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1081
+#: src/TouchPoint-WP/Involvement.php:1096
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3592
+#: src/TouchPoint-WP/Involvement.php:3607
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1280,35 +1280,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2043
+#: src/TouchPoint-WP/Involvement.php:2058
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2053
+#: src/TouchPoint-WP/Involvement.php:2068
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2072
+#: src/TouchPoint-WP/Involvement.php:2087
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:684
-#: src/TouchPoint-WP/TouchPointWP.php:1037
+#: src/TouchPoint-WP/Meeting.php:689
+#: src/TouchPoint-WP/TouchPointWP.php:1054
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:712
-#: src/TouchPoint-WP/TouchPointWP.php:363
+#: src/TouchPoint-WP/Meeting.php:717
+#: src/TouchPoint-WP/TouchPointWP.php:368
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:722
-#: src/TouchPoint-WP/TouchPointWP.php:372
+#: src/TouchPoint-WP/Meeting.php:727
+#: src/TouchPoint-WP/TouchPointWP.php:377
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3888
-#: src/TouchPoint-WP/Involvement.php:3993
+#: src/TouchPoint-WP/Involvement.php:3903
+#: src/TouchPoint-WP/Involvement.php:4008
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1411,24 +1411,24 @@ msgstr "Agregar Nuevo %s"
 msgid "New %s"
 msgstr "Nuevo %s"
 
-#: src/TouchPoint-WP/Report.php:181
+#: src/TouchPoint-WP/Report.php:185
 msgid "TouchPoint Reports"
 msgstr "Informes de TouchPoint"
 
-#: src/TouchPoint-WP/Report.php:182
+#: src/TouchPoint-WP/Report.php:186
 msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:435
+#: src/TouchPoint-WP/Report.php:449
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:267
+#: src/TouchPoint-WP/TouchPointWP.php:272
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1831
+#: src/TouchPoint-WP/Involvement.php:1846
 msgid "Language"
 msgstr "Idioma"
 
@@ -1440,7 +1440,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1458
+#: src/TouchPoint-WP/Person.php:1461
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1465,8 +1465,8 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:3980
-#: src/TouchPoint-WP/Person.php:1833
+#: src/TouchPoint-WP/Involvement.php:3995
+#: src/TouchPoint-WP/Person.php:1836
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1486,26 +1486,26 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1688
+#: src/TouchPoint-WP/Person.php:1691
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3970
-#: src/TouchPoint-WP/Person.php:1850
+#: src/TouchPoint-WP/Involvement.php:3985
+#: src/TouchPoint-WP/Person.php:1853
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1597
+#: src/TouchPoint-WP/Person.php:1600
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:281
+#: src/TouchPoint-WP/Meeting.php:286
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:282
+#: src/TouchPoint-WP/Meeting.php:287
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1570,11 +1570,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:561
+#: src/TouchPoint-WP/Meeting.php:566
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:562
+#: src/TouchPoint-WP/Meeting.php:567
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1608,21 +1608,21 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3680
+#: src/TouchPoint-WP/Involvement.php:3695
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:434
+#: src/TouchPoint-WP/Meeting.php:439
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:506
+#: src/TouchPoint-WP/Meeting.php:511
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1200
+#: src/TouchPoint-WP/Person.php:1203
 msgid "Person in %s"
 msgstr "Persona en %s"
 
@@ -1682,22 +1682,22 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:563
+#: src/TouchPoint-WP/Meeting.php:568
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:136
+#: src/TouchPoint-WP/Involvement.php:141
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1001
-#: src/TouchPoint-WP/Involvement.php:1024
+#: src/TouchPoint-WP/Involvement.php:1016
+#: src/TouchPoint-WP/Involvement.php:1039
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:96
+#: src/TouchPoint-WP/Meeting.php:101
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
@@ -1810,7 +1810,7 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1025
+#: src/TouchPoint-WP/Involvement.php:1040
 msgid "All Day"
 msgstr "todo el dia"
 
@@ -1839,15 +1839,15 @@ msgstr "Todos los campus"
 msgid "(No Campus)"
 msgstr "(Sin campus)"
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:39
+#: src/TouchPoint-WP/StatusWidget.php:41
 msgid "TouchPoint-WP Status"
 msgstr "Estado de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:96
+#: src/TouchPoint-WP/StatusWidget.php:98
 msgid "Imported"
 msgstr "Importadas"
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:97
+#: src/TouchPoint-WP/StatusWidget.php:99
 msgid "Last Updated"
 msgstr "Actualizada"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index ffa7dcf7..da1067c7 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-02-27T19:48:49+00:00\n"
+"POT-Creation-Date: 2025-03-07T18:19:58+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -71,8 +71,8 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:165
 #: src/templates/admin/invKoForm.php:318
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:758
-#: src/TouchPoint-WP/Rsvp.php:75
+#: src/TouchPoint-WP/Meeting.php:763
+#: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
 msgid "Loading..."
@@ -183,13 +183,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:237
-#: src/TouchPoint-WP/Involvement.php:1856
+#: src/TouchPoint-WP/Involvement.php:1871
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:241
-#: src/TouchPoint-WP/Involvement.php:1882
+#: src/TouchPoint-WP/Involvement.php:1897
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr ""
@@ -277,14 +277,14 @@ msgid "This %s has been Cancelled."
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:281
+#: src/TouchPoint-WP/Meeting.php:286
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2102
+#: src/TouchPoint-WP/Involvement.php:2117
 msgid "No %s Found."
 msgstr ""
 
@@ -295,25 +295,39 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3592
+#: src/TouchPoint-WP/Involvement.php:3607
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
 
+#: src/TouchPoint-WP/Api.php:97
+#: src/TouchPoint-WP/Api.php:203
+msgid "Invalid or incomplete API Settings."
+msgstr ""
+
+#: src/TouchPoint-WP/Api.php:111
+#: src/TouchPoint-WP/Api.php:156
+msgid "Host appears to be missing from TouchPoint-WP configuration."
+msgstr ""
+
+#: src/TouchPoint-WP/Api.php:267
+msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
+msgstr ""
+
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:142
+#: src/TouchPoint-WP/Auth.php:144
 msgid "Sign in with your %s account"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:410
+#: src/TouchPoint-WP/Auth.php:412
 msgid "Your login token expired."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:425
+#: src/TouchPoint-WP/Auth.php:427
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:437
+#: src/TouchPoint-WP/Auth.php:439
 msgid "Session could not be validated."
 msgstr ""
 
@@ -327,329 +341,341 @@ msgstr ""
 msgid "There are no %s published for this month."
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:79
+#: src/TouchPoint-WP/EventsCalendar.php:77
 msgid "Recurring"
 msgstr ""
 
-#: src/TouchPoint-WP/EventsCalendar.php:82
-#: src/TouchPoint-WP/EventsCalendar.php:299
+#: src/TouchPoint-WP/EventsCalendar.php:80
+#: src/TouchPoint-WP/EventsCalendar.php:297
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:136
+#: src/TouchPoint-WP/Involvement.php:141
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:498
+#: src/TouchPoint-WP/Involvement.php:513
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:503
+#: src/TouchPoint-WP/Involvement.php:518
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:510
+#: src/TouchPoint-WP/Involvement.php:525
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:516
+#: src/TouchPoint-WP/Involvement.php:531
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:998
-#: src/TouchPoint-WP/Involvement.php:1030
-#: src/TouchPoint-WP/Involvement.php:1123
-#: src/TouchPoint-WP/Involvement.php:1147
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:71
+#: src/TouchPoint-WP/Involvement.php:1013
+#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Involvement.php:1138
+#: src/TouchPoint-WP/Involvement.php:1162
+#: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1001
-#: src/TouchPoint-WP/Involvement.php:1024
+#: src/TouchPoint-WP/Involvement.php:1016
+#: src/TouchPoint-WP/Involvement.php:1039
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1025
+#: src/TouchPoint-WP/Involvement.php:1040
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1039
+#: src/TouchPoint-WP/Involvement.php:1054
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1048
+#: src/TouchPoint-WP/Involvement.php:1063
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1057
+#: src/TouchPoint-WP/Involvement.php:1072
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1065
+#: src/TouchPoint-WP/Involvement.php:1080
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1073
+#: src/TouchPoint-WP/Involvement.php:1088
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1081
+#: src/TouchPoint-WP/Involvement.php:1096
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1731
-#: src/TouchPoint-WP/Partner.php:825
+#: src/TouchPoint-WP/Involvement.php:1746
+#: src/TouchPoint-WP/Partner.php:839
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1788
+#: src/TouchPoint-WP/Involvement.php:1803
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1831
+#: src/TouchPoint-WP/Involvement.php:1846
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1904
+#: src/TouchPoint-WP/Involvement.php:1919
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1905
+#: src/TouchPoint-WP/Involvement.php:1920
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1906
+#: src/TouchPoint-WP/Involvement.php:1921
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1917
+#: src/TouchPoint-WP/Involvement.php:1932
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1939
-#: src/TouchPoint-WP/Partner.php:849
+#: src/TouchPoint-WP/Involvement.php:1954
+#: src/TouchPoint-WP/Partner.php:863
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1947
-#: src/TouchPoint-WP/Partner.php:865
+#: src/TouchPoint-WP/Involvement.php:1962
+#: src/TouchPoint-WP/Partner.php:879
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1950
-#: src/TouchPoint-WP/Partner.php:868
+#: src/TouchPoint-WP/Involvement.php:1965
+#: src/TouchPoint-WP/Partner.php:882
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2043
+#: src/TouchPoint-WP/Involvement.php:2058
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2053
+#: src/TouchPoint-WP/Involvement.php:2068
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2072
+#: src/TouchPoint-WP/Involvement.php:2087
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3571
+#: src/TouchPoint-WP/Involvement.php:3586
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3574
+#: src/TouchPoint-WP/Involvement.php:3589
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3651
+#: src/TouchPoint-WP/Involvement.php:3666
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3668
-#: src/TouchPoint-WP/Partner.php:1329
+#: src/TouchPoint-WP/Involvement.php:3683
+#: src/TouchPoint-WP/Partner.php:1343
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3680
+#: src/TouchPoint-WP/Involvement.php:3695
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3721
-#: src/TouchPoint-WP/Involvement.php:3780
+#: src/TouchPoint-WP/Involvement.php:3736
+#: src/TouchPoint-WP/Involvement.php:3795
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3727
+#: src/TouchPoint-WP/Involvement.php:3742
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3731
+#: src/TouchPoint-WP/Involvement.php:3746
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3736
+#: src/TouchPoint-WP/Involvement.php:3751
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3739
+#: src/TouchPoint-WP/Involvement.php:3754
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3742
+#: src/TouchPoint-WP/Involvement.php:3757
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3745
+#: src/TouchPoint-WP/Involvement.php:3760
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3771
+#: src/TouchPoint-WP/Involvement.php:3786
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3888
-#: src/TouchPoint-WP/Involvement.php:3993
+#: src/TouchPoint-WP/Involvement.php:3903
+#: src/TouchPoint-WP/Involvement.php:4008
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3970
-#: src/TouchPoint-WP/Person.php:1850
+#: src/TouchPoint-WP/Involvement.php:3985
+#: src/TouchPoint-WP/Person.php:1853
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3980
-#: src/TouchPoint-WP/Person.php:1833
+#: src/TouchPoint-WP/Involvement.php:3995
+#: src/TouchPoint-WP/Person.php:1836
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:96
+#: src/TouchPoint-WP/Meeting.php:101
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:282
+#: src/TouchPoint-WP/Meeting.php:287
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:434
+#: src/TouchPoint-WP/Meeting.php:439
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:506
+#: src/TouchPoint-WP/Meeting.php:511
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:561
+#: src/TouchPoint-WP/Meeting.php:566
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:562
+#: src/TouchPoint-WP/Meeting.php:567
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:563
+#: src/TouchPoint-WP/Meeting.php:568
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:684
-#: src/TouchPoint-WP/TouchPointWP.php:1037
+#: src/TouchPoint-WP/Meeting.php:689
+#: src/TouchPoint-WP/TouchPointWP.php:1054
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:712
-#: src/TouchPoint-WP/TouchPointWP.php:363
+#: src/TouchPoint-WP/Meeting.php:717
+#: src/TouchPoint-WP/TouchPointWP.php:368
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:722
-#: src/TouchPoint-WP/TouchPointWP.php:372
+#: src/TouchPoint-WP/Meeting.php:727
+#: src/TouchPoint-WP/TouchPointWP.php:377
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:757
-#: src/TouchPoint-WP/Meeting.php:778
-#: src/TouchPoint-WP/Rsvp.php:80
+#: src/TouchPoint-WP/Meeting.php:762
+#: src/TouchPoint-WP/Meeting.php:783
+#: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:856
+#: src/TouchPoint-WP/Partner.php:870
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1270
+#: src/TouchPoint-WP/Partner.php:1284
 msgid "Not Shown on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:150
+#: src/TouchPoint-WP/Person.php:153
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:642
+#: src/TouchPoint-WP/Person.php:645
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1192
+#: src/TouchPoint-WP/Person.php:1195
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1200
+#: src/TouchPoint-WP/Person.php:1203
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1451
+#: src/TouchPoint-WP/Person.php:1454
 #: src/TouchPoint-WP/Utilities.php:286
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1458
+#: src/TouchPoint-WP/Person.php:1461
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1597
+#: src/TouchPoint-WP/Person.php:1600
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1688
+#: src/TouchPoint-WP/Person.php:1691
 msgid "You may need to sign in."
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:181
+#: src/TouchPoint-WP/Report.php:185
 msgid "TouchPoint Reports"
 msgstr ""
 
-#: src/TouchPoint-WP/Report.php:182
+#: src/TouchPoint-WP/Report.php:186
 msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:435
+#: src/TouchPoint-WP/Report.php:449
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
+#: src/TouchPoint-WP/StatusWidget.php:41
+msgid "TouchPoint-WP Status"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:98
+msgid "Imported"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:99
+msgid "Last Updated"
+msgstr ""
+
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:51
 msgid "Search %s"
@@ -741,46 +767,32 @@ msgstr ""
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:267
+#: src/TouchPoint-WP/TouchPointWP.php:272
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2047
+#: src/TouchPoint-WP/TouchPointWP.php:2064
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2104
+#: src/TouchPoint-WP/TouchPointWP.php:2121
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2107
+#: src/TouchPoint-WP/TouchPointWP.php:2124
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2110
+#: src/TouchPoint-WP/TouchPointWP.php:2127
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2115
-#: src/TouchPoint-WP/TouchPointWP.php:2116
+#: src/TouchPoint-WP/TouchPointWP.php:2132
+#: src/TouchPoint-WP/TouchPointWP.php:2133
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2233
-#: src/TouchPoint-WP/TouchPointWP.php:2269
-msgid "Invalid or incomplete API Settings."
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2283
-#: src/TouchPoint-WP/TouchPointWP.php:2327
-msgid "Host appears to be missing from TouchPoint-WP configuration."
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2400
-msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2459
+#: src/TouchPoint-WP/TouchPointWP.php:2324
 msgid "People Query Failed"
 msgstr ""
 
@@ -1417,18 +1429,6 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:39
-msgid "TouchPoint-WP Status"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:96
-msgid "Imported"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Widget.php:97
-msgid "Last Updated"
-msgstr ""
-
 #: src/TouchPoint-WP/Utilities.php:136
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
diff --git a/src/TouchPoint-WP/TouchPointWP_Widget.php b/src/TouchPoint-WP/StatusWidget.php
similarity index 98%
rename from src/TouchPoint-WP/TouchPointWP_Widget.php
rename to src/TouchPoint-WP/StatusWidget.php
index a7b419ce..95cfb153 100644
--- a/src/TouchPoint-WP/TouchPointWP_Widget.php
+++ b/src/TouchPoint-WP/StatusWidget.php
@@ -14,13 +14,15 @@
 }
 
 /**
- * Class TouchPointWP_Widget
+ * Class StatusWidget
  *
  * Provides an admin dashboard widget that shows some basic stats about the plugin.
  *
+ * @since 0.0.95
+ *
  * @package tp\TouchPointWP
  */
-abstract class TouchPointWP_Widget
+abstract class StatusWidget
 {
 	/**
 	 * Initialize the widget.
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 70d99f5e..5011ac50 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -304,10 +304,10 @@ public function admin(): TouchPointWP_AdminAPI
 		if ($this->admin === null) {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 				require_once 'TouchPointWP_AdminAPI.php';
-				require_once 'TouchPointWP_Widget.php';
+				require_once 'StatusWidget.php';
 			}
 			$this->admin = new TouchPointWP_AdminAPI();
-			TouchPointWP_Widget::init();
+			StatusWidget::init();
 		}
 
 		return $this->admin;
@@ -684,12 +684,14 @@ protected function createTables(): void
 				adminEmail varchar(255) NOT NULL,
 				siteName varchar(255) NOT NULL,
 				siteLogo varchar(512) NOT NULL,
+
 				createdDT datetime DEFAULT NOW(),
 				updatedDT datetime DEFAULT NOW() ON UPDATE NOW(),
 				
 				listPublicly tinyint(1) DEFAULT 1,
 				lastQueryDT datetime DEFAULT NULL,
 				lastQueryStatus int(3) DEFAULT NULL,
+				siteLogoStatus int(3) DEFAULT NULL,
 				
 				involvementJoins int(10) DEFAULT 0,
 				involvementContacts int(10) DEFAULT 0,

From e2924044661eac02550ff209188ae8c5c577b509 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 24 Mar 2025 10:36:59 -0400
Subject: [PATCH 252/423] Fix issue where API is called before it's
 initialized. Closes #223.

---
 src/TouchPoint-WP/TouchPointWP.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 5011ac50..3d7d7a91 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -224,6 +224,8 @@ protected function __construct(string $file = '')
 		$this->debug      = get_option(TouchPointWP::SETTINGS_PREFIX . "DEBUG", "") === "true";
 		$this->script_ext = ($this->debug || !file_exists($this->assets_dir . "/js/base-defer.min.js")) ? '.js' : '.min.js';
 
+		$this->api = Api::instance($this);
+
 		register_activation_hook($this->file, [$this, 'activation']);
 		register_deactivation_hook($this->file, [$this, 'deactivation']);
 		register_uninstall_hook($this->file, [self::class, 'uninstall']);
@@ -748,10 +750,6 @@ public static function load($file): TouchPointWP
 			}
 		}
 
-		if (is_null($instance->api)) {
-			$instance->api = Api::instance($instance);
-		}
-
 		Stats::load();
 
 		// Load Auth tool if enabled.

From d90f7e59aa519d0ab67df3ae3193b79785f862b5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 24 Mar 2025 10:37:31 -0400
Subject: [PATCH 253/423] Make sure tpwp user exists

---
 src/TouchPoint-WP/TouchPointWP_Settings.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 13b925ce..61c98721 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -1483,6 +1483,11 @@ public function migrate(): void
 			}
 		}
 
+		// 0.0.95 -- Make sure the TpWp user exists
+		try {
+			TouchPointWP::instance()->validateThatTpWpUserExists();
+		} catch (TouchPointWP_WPError) {}
+
 		// 0.0.4 to 0.0.5 -- Merging Small Groups and Courses Components into a single Involvement Component
 		$sgEnabled = $this->getWithoutDefault('enable_small_groups') === "on";
 		$csEnabled = $this->getWithoutDefault('enable_courses') === "on";

From d6b1e3435799dd6f0616b43f074d935e7fb4c454 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 24 Mar 2025 10:46:31 -0400
Subject: [PATCH 254/423] Starting on paging in the personQuery (#222)

---
 src/TouchPoint-WP/Api.php |  7 ++++++-
 src/python/WebApi.py      | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 7ec5c7f7..2d9c5efe 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -141,11 +141,12 @@ public function pyGet(string $command, ?array $parameters = null, int $timeout =
 	 * @param string $command The thing to post
 	 * @param ?mixed $data Data to post
 	 * @param int    $timeout Amount of time in sec to wait before timing out.
+	 * @param float  $timeTaken The time taken to complete the request.
 	 *
 	 * @return stdClass|array An object that corresponds to the Data python object in TouchPoint.
 	 * @throws TouchPointWP_Exception  If anything went wrong.
 	 */
-	public function pyPost(string $command, mixed $data = null, int $timeout = 5): array|stdClass
+	public function pyPost(string $command, mixed $data = null, int $timeout = 5, float &$timeTaken = 0): array|stdClass
 	{
 		$this->checkApiValidity();
 
@@ -163,6 +164,8 @@ public function pyPost(string $command, mixed $data = null, int $timeout = 5): a
 
 		self::$apiCallLog[] = $url;
 
+		$tik = microtime(true);
+
 		$r = $this->getHttpClient()->request(
 			$url,
 			[
@@ -175,6 +178,8 @@ public function pyPost(string $command, mixed $data = null, int $timeout = 5): a
 			]
 		);
 
+		$timeTaken = microtime(true) - $tik;
+
 		return self::parseApiResponse($r);
 	}
 
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 283a5c1a..72f10f86 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -1055,7 +1055,19 @@ def get_person_info_for_sync(person_obj):
 
     Data.Context = inData['context']
 
-    for po in q.QueryList(rules, sort.lower()):
+    # Paging -- note that paging and grouping should not really be combined.
+    offset  = 0
+    if inData.has_key('offset'):
+        offset = int(inData['offset'])
+    perPage = 10000000000
+    if inData.has_key('perPage'):
+        perPage = int(inData['perPage'])
+
+    # Do the query
+    results = q.QueryList(rules, sort.lower(), perPage, offset)
+    qCount = q.QueryCount(rules)
+
+    for po in results:
         pr = get_person_info_for_sync(po)
 
         if pr is None:  # Make sure person should not be excluded
@@ -1134,6 +1146,7 @@ def get_person_info_for_sync(person_obj):
             outPeople[grpId]["People"].append(pr)
 
     Data.people = outPeople
+    Data.items = qCount
     Data.inData = inData
     Data.rules = rules  # handy for debugging
     Data.success = True

From bd09e4a3872e855d3be847839586c0dc3f528a22 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 24 Mar 2025 10:47:28 -0400
Subject: [PATCH 255/423] Syntactic improvements

---
 src/TouchPoint-WP/Person.php                     | 11 ++++-------
 src/TouchPoint-WP/Utilities/ImageConversions.php |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index bb718968..bbebb5e8 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -658,7 +658,7 @@ public static function updateCron(): void
 	{
 		try {
 			self::updateFromTouchPoint();
-		} catch (Exception $ex) {
+		} catch (Exception) {
 		}
 	}
 
@@ -1125,7 +1125,7 @@ protected static function updatePeopleWordPressIDs()
 				'evName' => TouchPointWP::instance()->settings->people_ev_wpId
 			]);
 			self::$_peopleWhoNeedWpIdUpdatedInTouchPoint = [];
-		} catch (Exception $ex) { // If it fails this time, it'll probably get fixed next time
+		} catch (Exception) { // If it fails this time, it'll probably get fixed next time
 		}
 	}
 
@@ -1232,11 +1232,8 @@ public function getActionButtons(string $context = null, string $btnClass = "",
 	public static function enqueueForJS_byPeopleId(int $pid): ?bool
 	{
 		$p = self::fromPeopleId($pid);
-		if ($p === null) {
-			return null;
-		}
 
-		return $p->enqueueForJsInstantiation();
+		return $p?->enqueueForJsInstantiation();
 	}
 
 	/**
@@ -1920,7 +1917,7 @@ public static function checkUpdates(): void
 		if (TouchPointWP::instance()->settings->person_cron_last_run * 1 < time() - 86400 - 3600) {
 			try {
 				self::updateFromTouchPoint();
-			} catch (Exception $ex) {
+			} catch (Exception) {
 			}
 		}
 	}
diff --git a/src/TouchPoint-WP/Utilities/ImageConversions.php b/src/TouchPoint-WP/Utilities/ImageConversions.php
index 49c2c491..eab13ade 100644
--- a/src/TouchPoint-WP/Utilities/ImageConversions.php
+++ b/src/TouchPoint-WP/Utilities/ImageConversions.php
@@ -16,6 +16,7 @@ abstract class ImageConversions
 	/**
 	 * @throws \ImagickException
 	 * @throws TouchPointWP_Exception
+	 * @noinspection PhpFullyQualifiedNameUsageInspection - Imagick is helpful but not required.
 	 */
 	public static function svgToPng($svgContent, ?string $backgroundColor = null): string
 	{

From 35cef3470d20a35cd491f8128330895fc16df4f2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 4 Apr 2025 13:14:34 -0400
Subject: [PATCH 256/423] Changing default event retention timespan. closes
 #224

---
 src/TouchPoint-WP/TouchPointWP_Settings.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/TouchPointWP_Settings.php
index 61c98721..ee1cd6e5 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/TouchPointWP_Settings.php
@@ -918,13 +918,14 @@ private function settingsFields(bool|string $includeDetail = false): array
 						'id'          => 'mc_hist_days',
 						'label'       => __('Days of History', 'TouchPoint-WP'),
 						'description' => __(
-							"Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.",
+							// for reference: https://github.com/TenthPres/TouchPoint-WP/issues/224
+							"Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months).",
 							'TouchPoint-WP'
 						),
 						'type'        => 'number',
-						'default'     => 365,
-						'placeholder' => 365,
-						'max'         => 1825,
+						'default'     => 1825,
+						'placeholder' => 1825,
+						'max'         => 3650,
 						'min'         => 0
 					],
 				],

From 818746bf9b93d4a21c7f94a107b2c0bf38686379 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 6 Apr 2025 09:30:08 -0400
Subject: [PATCH 257/423] Changing event image syncing--should be a lot more
 efficient and hang less.

---
 .idea/php.xml                     |  5 ++
 src/TouchPoint-WP/Involvement.php | 11 +++-
 src/TouchPoint-WP/Utilities.php   | 83 ++++++++++++++++---------------
 3 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/.idea/php.xml b/.idea/php.xml
index a20c6b90..fd18050b 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -9,6 +9,11 @@
   <component name="PHPCodeSnifferOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings>
+      <PhpCSConfiguration asDefaultInterpreter="true" />
+    </phpcs_settings>
+  </component>
   <component name="PhpIncludePathManager">
     <include_path>
       <path value="$PROJECT_DIR$/../WordPressDemo" />
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 318575ea..11cc13f3 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -17,6 +17,7 @@
 	require_once "Interfaces/updatesViaCron.php";
 	require_once "Utilities.php";
 	require_once "Involvement_PostTypeSettings.php";
+	require_once "MeetingArray.php";
 }
 
 use DateInterval;
@@ -2024,7 +2025,7 @@ public static function api(array $uri): bool
 			case "nearby":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE);
 				self::ajaxNearby();
-//				exit;  ajaxNearby() is no-return.
+				exit;
 
 			case "force-sync":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
@@ -2810,7 +2811,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 			$imageUrl = $inv->imageUrl;
 		}
 
-		$imageId = Utilities::updatePostImageFromUrl($post->ID, $imageUrl, $post->post_title);
+		$imageId = Utilities::updatePostImageFromUrl($post->ID, $imageUrl, $post->post_title, $verbose);
 
 		////////////////////
 		//// SCHEDULING ////
@@ -3194,6 +3195,12 @@ protected static function updateMeetingsForInvolvement(
 
 				wp_update_post($mtgP);
 
+				if ($imagePostId > 0) {
+					set_post_thumbnail($mtgP->ID, $imagePostId);
+				} else {
+					delete_post_thumbnail($mtgP->ID);
+				}
+
 				if ($mtgP->post_name !== $slug) {
 					Utilities::forceSlugUpdate($mtgP->ID, $slug);
 				}
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 82be7257..85ef576e 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -9,7 +9,6 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
-use Exception;
 use WP_Post_Type;
 
 /**
@@ -526,66 +525,72 @@ public static function getAllHeaders(): array
 	 * @param int         $postId
 	 * @param string|null $newUrl
 	 * @param string      $title
+	 * @param bool        $verbose
 	 *
-	 * @return int|string The attachmentId for the image.  Can be reused for other posts.
+	 * @return int The attachmentId for the image.  Can be reused for other posts.
 	 * @since 0.0.24 Added
 	 */
-	public static function updatePostImageFromUrl(int $postId, ?string $newUrl, string $title)
+	public static function updatePostImageFromUrl(int $postId, ?string $newUrl, string $title, bool $verbose = false): int
 	{
 		// Required for image handling
 		require_once(ABSPATH . 'wp-admin/includes/media.php');
 		require_once(ABSPATH . 'wp-admin/includes/file.php');
 		require_once(ABSPATH . 'wp-admin/includes/image.php');
 
-		// If an image sideload was started but not finished within the last hour, something has gone wrong.
-		if (intval(get_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload")) > (time() - 60*60)) {
-			new TouchPointWP_Exception("Image import appears to have gotten stuck.", 170008);
-			return 0;
-		}
-
-		update_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload", time(), false);
-
-		// Post image
+		// some standardization
 		global $wpdb;
-		$oldAttId = get_post_thumbnail_id($postId);
-		$oldFName = $wpdb->get_var( "SELECT meta_value FROM $wpdb->postmeta WHERE post_id = '$oldAttId' AND meta_key = '_wp_attached_file'" ) ?? "";
-		$oldFName = substr($oldFName, strrpos($oldFName, '/') + 1);
-
 		$newUrl = trim((string)$newUrl); // nulls are now ""
 		$title = sprintf('%1$s Image', $title);
 
-		$newFName = "";
+		$newAttId = 0;
+
+		// check if target image already exists in media library
 		if ($newUrl !== "") {
-			$newFName = substr($newUrl, strrpos($newUrl, '/') + 1);
+			$newAttId = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT p.Id FROM $wpdb->posts p JOIN $wpdb->postmeta pm ON p.ID = pm.post_id WHERE post_type = 'attachment' AND meta_key = '_source_url' AND meta_value = %s",
+					$newUrl
+				)
+			);
+			$newAttId = (int)$newAttId;
+
+			if ($verbose) {
+				echo "<p>Existing Attachment ID with matching URL: $newAttId</p>";
+			}
 		}
 
-		// Compare image file names without extensions, versions, and increments.
-		$newFName = explode(".", $newFName, 2)[0];
-		if (strlen($newFName) > 5) {
-			$oldFName = substr($oldFName, 0, strlen($newFName));
-		}
+		// get existing post image, if any
+		$oldAttId = get_post_thumbnail_id($postId);
+
+		// determine if a change is needed
+		if ($newAttId !== $oldAttId || ($newUrl !== "" && $oldAttId === 0)) {
+			if ($oldAttId > 0) { // Remove and delete old one.
+				wp_delete_attachment($oldAttId, true);
+			}
+			if ($newAttId === 0 && $newUrl !== "") { // New image isn't in media yet.
+				set_time_limit(60);
+				$newAttId = media_sideload_image($newUrl, $postId, $title, 'id');
+
+				if (is_wp_error($newAttId)) {
+					$newAttId->add('', "Error encountered while trying to import image: $newUrl");
+					new TouchPointWP_WPError($newAttId);
+					if ($verbose)
+						echo "Error occurred: " . $newAttId->get_error_message();
+					return 0;
 
-		$attId = 0;
-		try {
-			if ($newFName !== $oldFName) {
-				if ($oldAttId > 0) { // Remove and delete old one.
-					wp_delete_attachment($oldAttId, true);
 				}
-				if ($newUrl !== "") { // Load and save new one
-					set_time_limit(60);
-					$attId = media_sideload_image($newUrl, $postId, $title, 'id');
-					set_post_thumbnail($postId, $attId);
+			}
+			if ($newAttId > 0) { // New image is in media.
+				set_post_thumbnail($postId, $newAttId);
+			} else {
+				// If the image is blank, remove the post thumbnail.
+				if ($verbose) {
+					echo "<p>Image URL is blank.  Removing post thumbnail.</p>";
 				}
+				delete_post_thumbnail($postId);
 			}
-		} catch (Exception $e) {
-			echo "Exception occurred: " . $e->getMessage();
-			update_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload", 0, false);
-			wp_delete_attachment($attId, true);
-			return 0;
 		}
 
-		update_option(TouchPointWP::SETTINGS_PREFIX . "image_sideload", 0, false);
-
 		if (is_wp_error($attId)) {
 			echo "Exception occurred: " . $attId->get_error_message();
 			return 0;

From 09a54c063ad010778b36ab9148e1b24794a66f7b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 6 Apr 2025 10:08:29 -0400
Subject: [PATCH 258/423] Reworking image sideloading

---
 src/TouchPoint-WP/Utilities.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 85ef576e..a6f0c24b 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -591,11 +591,7 @@ public static function updatePostImageFromUrl(int $postId, ?string $newUrl, stri
 			}
 		}
 
-		if (is_wp_error($attId)) {
-			echo "Exception occurred: " . $attId->get_error_message();
-			return 0;
-		}
-		return $attId;
+		return $newAttId;
 	}
 
 	/**

From 49ca028b74acbc62bf7c4a112a1bb1a76823aa6c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 6 Apr 2025 10:38:28 -0400
Subject: [PATCH 259/423] Adding logic to handle RSVPs for meetings that are
 deleted from TouchPoint but not yet removed from WordPress. Closes #221

---
 assets/js/meeting-defer.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/assets/js/meeting-defer.js b/assets/js/meeting-defer.js
index 4e7246f3..5e0d383a 100644
--- a/assets/js/meeting-defer.js
+++ b/assets/js/meeting-defer.js
@@ -132,6 +132,35 @@ class TP_Meeting {
                 console.error(res.error);
             } else {
                 this.fromObjArray(res.success)
+                this.disableMeetingsThatDidntLoad(meetingsOnPage)
+            }
+        }
+    }
+
+    static disableMeetingsThatDidntLoad(meetingIds) {
+        for (const mi in meetingIds) {
+            if (!meetingIds.hasOwnProperty(mi)) continue;
+            const meetingId = meetingIds[mi];
+            const mtg = tpvm.meetings[meetingId];
+            if (typeof mtg === "undefined") {
+                let ce = document.querySelector('[data-tp-mtg="' + meetingId + '"]'); // may be button, or may be a parent of the button.
+
+                // within and including ce search for data-tp-action='rsvp'
+                let actionBtns = Array.from(ce.querySelectorAll('[data-tp-action]'));
+                if (ce.hasAttribute('data-tp-action')) {
+                    // if there's a sole button, it should be added to the list so it works, too.
+                    actionBtns.push(ce);
+                }
+                for (const ai in actionBtns) {
+                    if (!actionBtns.hasOwnProperty(ai)) continue;
+                    const action = actionBtns[ai].getAttribute('data-tp-action');
+
+                    if (action === "rsvp") {
+                        // hide button
+                        actionBtns[ai].style.display = "none";
+                        console.log(`RSVP button removed for meeting ${meetingId} because it appears to not exist in TouchPoint.`);
+                    }
+                }
             }
         }
     }

From 9971a0dcb63d0c23ca63525efc68143ef844c3e5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 7 Apr 2025 16:39:22 -0400
Subject: [PATCH 260/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 597 +++++++++++++-------------
 i18n/TouchPoint-WP.pot      | 833 ++++++++++++++++++------------------
 2 files changed, 714 insertions(+), 716 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 1dc3216a..111bfe3b 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
+#: src/TouchPoint-WP/Settings.php:980
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -124,13 +124,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:237
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1872
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:241
-#: src/TouchPoint-WP/Involvement.php:1897
+#: src/TouchPoint-WP/Involvement.php:1898
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -174,7 +174,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2117
+#: src/TouchPoint-WP/Involvement.php:2118
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -183,23 +183,11 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:144
-msgid "Sign in with your %s account"
-msgstr "Inicie sesión con su cuenta de %s"
-
-#: src/TouchPoint-WP/Auth.php:412
-msgid "Your login token expired."
-msgstr "Su token de inicio de sesión caducó."
-
-#: src/TouchPoint-WP/Auth.php:427
+#: src/TouchPoint-WP/Auth.php:309
+#: src/TouchPoint-WP/Auth.php:317
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
-#: src/TouchPoint-WP/Auth.php:439
-msgid "Session could not be validated."
-msgstr "No se pudo validar la sesión."
-
 #: src/TouchPoint-WP/EventsCalendar.php:77
 msgid "Recurring"
 msgstr "Periódico"
@@ -209,80 +197,80 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:513
+#: src/TouchPoint-WP/Involvement.php:514
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:518
+#: src/TouchPoint-WP/Involvement.php:519
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:525
+#: src/TouchPoint-WP/Involvement.php:526
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:531
+#: src/TouchPoint-WP/Involvement.php:532
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1746
+#: src/TouchPoint-WP/Involvement.php:1747
 #: src/TouchPoint-WP/Partner.php:839
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1954
+#: src/TouchPoint-WP/Involvement.php:1955
 #: src/TouchPoint-WP/Partner.php:863
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3586
+#: src/TouchPoint-WP/Involvement.php:3628
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3589
+#: src/TouchPoint-WP/Involvement.php:3631
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3666
+#: src/TouchPoint-WP/Involvement.php:3708
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3736
-#: src/TouchPoint-WP/Involvement.php:3795
+#: src/TouchPoint-WP/Involvement.php:3778
+#: src/TouchPoint-WP/Involvement.php:3837
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3742
+#: src/TouchPoint-WP/Involvement.php:3784
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3746
+#: src/TouchPoint-WP/Involvement.php:3788
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3751
+#: src/TouchPoint-WP/Involvement.php:3793
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3754
+#: src/TouchPoint-WP/Involvement.php:3796
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3757
+#: src/TouchPoint-WP/Involvement.php:3799
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3760
+#: src/TouchPoint-WP/Involvement.php:3802
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3786
+#: src/TouchPoint-WP/Involvement.php:3828
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3683
+#: src/TouchPoint-WP/Involvement.php:3725
 #: src/TouchPoint-WP/Partner.php:1343
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -296,15 +284,15 @@ msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como t
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
-#: src/TouchPoint-WP/Person.php:153
+#: src/TouchPoint-WP/Person.php:146
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr "No se proporcionó una identificación de usuario de WordPress para inicializar un objeto de persona."
 
-#: src/TouchPoint-WP/Person.php:645
+#: src/TouchPoint-WP/Person.php:638
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1195
+#: src/TouchPoint-WP/Person.php:1173
 msgid "Contact"
 msgstr "Contacta"
 
@@ -314,502 +302,504 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2064
+#: src/TouchPoint-WP/TouchPointWP.php:2062
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2121
+#: src/TouchPoint-WP/TouchPointWP.php:2119
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2124
+#: src/TouchPoint-WP/TouchPointWP.php:2122
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2127
+#: src/TouchPoint-WP/TouchPointWP.php:2125
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2132
-#: src/TouchPoint-WP/TouchPointWP.php:2133
+#: src/TouchPoint-WP/TouchPointWP.php:2130
+#: src/TouchPoint-WP/TouchPointWP.php:2131
 msgid "Current Value"
 msgstr "Valor actual"
 
 #: src/TouchPoint-WP/Api.php:97
-#: src/TouchPoint-WP/Api.php:203
+#: src/TouchPoint-WP/Api.php:298
+#: src/TouchPoint-WP/Api.php:385
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
 #: src/TouchPoint-WP/Api.php:111
-#: src/TouchPoint-WP/Api.php:156
+#: src/TouchPoint-WP/Api.php:159
+#: src/TouchPoint-WP/Api.php:330
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2324
+#: src/TouchPoint-WP/TouchPointWP.php:2322
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/Settings.php:259
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/Settings.php:260
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/Settings.php:264
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/Settings.php:265
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/Settings.php:276
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
+#: src/TouchPoint-WP/Settings.php:277
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/Settings.php:284
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
+#: src/TouchPoint-WP/Settings.php:285
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/Settings.php:306
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
+#: src/TouchPoint-WP/Settings.php:307
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/Settings.php:317
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
+#: src/TouchPoint-WP/Settings.php:318
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/Settings.php:339
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
+#: src/TouchPoint-WP/Settings.php:340
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/Settings.php:350
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
+#: src/TouchPoint-WP/Settings.php:351
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/Settings.php:363
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/Settings.php:375
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/Settings.php:387
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/Settings.php:388
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/Settings.php:400
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
+#: src/TouchPoint-WP/Settings.php:401
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/Settings.php:412
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
+#: src/TouchPoint-WP/Settings.php:413
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/Settings.php:424
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
+#: src/TouchPoint-WP/Settings.php:425
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
+#: src/TouchPoint-WP/Settings.php:465
+#: src/TouchPoint-WP/Settings.php:470
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/Settings.php:469
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/Settings.php:486
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
+#: src/TouchPoint-WP/Settings.php:487
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
+#: src/TouchPoint-WP/Settings.php:491
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
+#: src/TouchPoint-WP/Settings.php:492
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/Settings.php:503
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/Settings.php:504
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/Settings.php:514
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/Settings.php:515
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
+#: src/TouchPoint-WP/Settings.php:525
+#: src/TouchPoint-WP/Settings.php:763
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
+#: src/TouchPoint-WP/Settings.php:526
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/Settings.php:542
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
+#: src/TouchPoint-WP/Settings.php:543
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/Settings.php:547
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/Settings.php:557
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
+#: src/TouchPoint-WP/Settings.php:558
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
+#: src/TouchPoint-WP/Settings.php:567
 msgid "Change 'Edit Profile' links"
 msgstr "Cambiar los enlaces 'Editar perfil'"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
+#: src/TouchPoint-WP/Settings.php:568
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/Settings.php:577
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
+#: src/TouchPoint-WP/Settings.php:578
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/Settings.php:584
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
+#: src/TouchPoint-WP/Settings.php:585
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/Settings.php:599
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
+#: src/TouchPoint-WP/Settings.php:600
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
+#: src/TouchPoint-WP/Settings.php:605
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/Settings.php:635
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
+#: src/TouchPoint-WP/Settings.php:636
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/Settings.php:640
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
+#: src/TouchPoint-WP/Settings.php:641
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/Settings.php:651
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
+#: src/TouchPoint-WP/Settings.php:652
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/Settings.php:662
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
+#: src/TouchPoint-WP/Settings.php:663
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/Settings.php:673
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
+#: src/TouchPoint-WP/Settings.php:674
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/Settings.php:684
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
+#: src/TouchPoint-WP/Settings.php:685
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/Settings.php:697
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
+#: src/TouchPoint-WP/Settings.php:698
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/Settings.php:708
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
+#: src/TouchPoint-WP/Settings.php:709
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/Settings.php:719
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
+#: src/TouchPoint-WP/Settings.php:720
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/Settings.php:730
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/Settings.php:731
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/Settings.php:741
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/Settings.php:742
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/Settings.php:752
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/Settings.php:753
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/Settings.php:764
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/Settings.php:775
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
+#: src/TouchPoint-WP/Settings.php:776
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
+#: src/TouchPoint-WP/Settings.php:819
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
+#: src/TouchPoint-WP/Settings.php:824
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/Settings.php:839
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/Settings.php:840
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
+#: src/TouchPoint-WP/Settings.php:938
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
+#: src/TouchPoint-WP/Settings.php:939
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
+#: src/TouchPoint-WP/Settings.php:943
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
+#: src/TouchPoint-WP/Settings.php:944
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
+#: src/TouchPoint-WP/Settings.php:955
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
+#: src/TouchPoint-WP/Settings.php:956
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
+#: src/TouchPoint-WP/Settings.php:967
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:966
+#: src/TouchPoint-WP/Settings.php:968
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/Settings.php:981
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/Settings.php:1032
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
+#: src/TouchPoint-WP/Settings.php:1033
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
+#: src/TouchPoint-WP/Settings.php:1040
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
+#: src/TouchPoint-WP/Settings.php:1041
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
+#: src/TouchPoint-WP/Settings.php:1052
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
+#: src/TouchPoint-WP/Settings.php:1053
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/Settings.php:1064
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
+#: src/TouchPoint-WP/Settings.php:1065
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
+#: src/TouchPoint-WP/Settings.php:1081
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1080
+#: src/TouchPoint-WP/Settings.php:1082
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
+#: src/TouchPoint-WP/Settings.php:1086
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
+#: src/TouchPoint-WP/Settings.php:1087
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
+#: src/TouchPoint-WP/Settings.php:1098
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
+#: src/TouchPoint-WP/Settings.php:1099
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
+#: src/TouchPoint-WP/Settings.php:1110
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1109
+#: src/TouchPoint-WP/Settings.php:1111
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1287
+#: src/TouchPoint-WP/Settings.php:1289
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1341
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
+#: src/TouchPoint-WP/Settings.php:1343
+#: src/TouchPoint-WP/Settings.php:1344
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1390
+#: src/TouchPoint-WP/Settings.php:1392
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1630
+#: src/TouchPoint-WP/Settings.php:1637
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1752
+#: src/TouchPoint-WP/Settings.php:1759
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1803
+#: src/TouchPoint-WP/Settings.php:1810
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1454
-#: src/TouchPoint-WP/Utilities.php:286
+#: src/TouchPoint-WP/Person.php:1452
+#: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr "y"
@@ -843,7 +833,7 @@ msgstr "No hay opción de geolocalización disponible."
 #: assets/js/base-defer.js:931
 #: assets/js/base-defer.js:968
 #: assets/js/base-defer.js:1425
-#: assets/js/meeting-defer.js:182
+#: assets/js/meeting-defer.js:211
 msgid "Something strange happened."
 msgstr "Algo extraño sucedió."
 
@@ -860,7 +850,7 @@ msgstr "¿Quién se une al grupo?"
 #: assets/js/base-defer.js:1060
 #: assets/js/base-defer.js:1376
 #: assets/js/base-defer.js:1469
-#: assets/js/meeting-defer.js:224
+#: assets/js/meeting-defer.js:253
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -936,52 +926,52 @@ msgstr "Teléfono"
 msgid "Event Past"
 msgstr "Evento pasado"
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "Who is coming?"
 msgstr "¿Quien viene?"
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "Indicate who is or is not coming.  This will overwrite any existing RSVP."
 msgstr "Indica quien viene. Esto va a duplicar a una persona que ya está escrita."
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "To avoid overwriting an existing RSVP, leave that person blank."
 msgstr "Para evadir duplicar una persona que ya está escrita, de ja el espacio de la persona vacío."
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "To protect privacy, we won't show existing RSVPs here."
 msgstr "Para proteger tu privacidad, nosotros no mostraremos las personas que están registradas aquí."
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "Yes"
 msgstr "Sí"
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "No"
 msgstr "No"
 
-#: assets/js/meeting-defer.js:222
+#: assets/js/meeting-defer.js:251
 msgid "Add Someone Else"
 msgstr "Agregar a alguien más"
 
-#: assets/js/meeting-defer.js:223
+#: assets/js/meeting-defer.js:252
 msgid "Submit"
 msgstr "Enviar"
 
-#: assets/js/meeting-defer.js:242
+#: assets/js/meeting-defer.js:271
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/Api.php:267
+#: src/TouchPoint-WP/Api.php:449
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
 #. translators: "RSVP for {Event Name}"  This is the heading on the RSVP modal.  The event name isn't translated because it comes from TouchPoint.
-#: assets/js/meeting-defer.js:204
+#: assets/js/meeting-defer.js:233
 msgid "RSVP for %s"
 msgstr "RSVP para %s"
 
-#: assets/js/meeting-defer.js:171
+#: assets/js/meeting-defer.js:200
 msgid "Response Recorded"
 msgid_plural "Responses Recorded"
 msgstr[0] "Respuesta registrada"
@@ -1018,8 +1008,8 @@ msgstr "Envía"
 #: assets/js/base-defer.js:971
 #: assets/js/base-defer.js:1417
 #: assets/js/base-defer.js:1428
-#: assets/js/meeting-defer.js:174
-#: assets/js/meeting-defer.js:185
+#: assets/js/meeting-defer.js:203
+#: assets/js/meeting-defer.js:214
 msgid "OK"
 msgstr "OK"
 
@@ -1027,85 +1017,85 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1919
+#: src/TouchPoint-WP/Involvement.php:1920
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1932
+#: src/TouchPoint-WP/Involvement.php:1933
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1803
+#: src/TouchPoint-WP/Involvement.php:1804
 msgid "Genders"
 msgstr "Géneros"
 
-#: src/TouchPoint-WP/Utilities.php:136
+#: src/TouchPoint-WP/Utilities.php:149
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr "los domingos"
 
-#: src/TouchPoint-WP/Utilities.php:137
+#: src/TouchPoint-WP/Utilities.php:150
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr "los lunes"
 
-#: src/TouchPoint-WP/Utilities.php:138
+#: src/TouchPoint-WP/Utilities.php:151
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr "los martes"
 
-#: src/TouchPoint-WP/Utilities.php:139
+#: src/TouchPoint-WP/Utilities.php:152
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr "los miércoles"
 
-#: src/TouchPoint-WP/Utilities.php:140
+#: src/TouchPoint-WP/Utilities.php:153
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr "los jueves"
 
-#: src/TouchPoint-WP/Utilities.php:141
+#: src/TouchPoint-WP/Utilities.php:154
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr "los viernes"
 
-#: src/TouchPoint-WP/Utilities.php:142
+#: src/TouchPoint-WP/Utilities.php:155
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr "los sábados"
 
-#: src/TouchPoint-WP/Utilities.php:188
+#: src/TouchPoint-WP/Utilities.php:201
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr "Dom"
 
-#: src/TouchPoint-WP/Utilities.php:189
+#: src/TouchPoint-WP/Utilities.php:202
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr "Lun"
 
-#: src/TouchPoint-WP/Utilities.php:190
+#: src/TouchPoint-WP/Utilities.php:203
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr "Mar"
 
-#: src/TouchPoint-WP/Utilities.php:191
+#: src/TouchPoint-WP/Utilities.php:204
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr "Mié"
 
-#: src/TouchPoint-WP/Utilities.php:192
+#: src/TouchPoint-WP/Utilities.php:205
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr "Jue"
 
-#: src/TouchPoint-WP/Utilities.php:193
+#: src/TouchPoint-WP/Utilities.php:206
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr "Vie"
 
-#: src/TouchPoint-WP/Utilities.php:194
+#: src/TouchPoint-WP/Utilities.php:207
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
@@ -1154,77 +1144,77 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1011
+#: src/TouchPoint-WP/Settings.php:1007
+#: src/TouchPoint-WP/Settings.php:1013
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1006
+#: src/TouchPoint-WP/Settings.php:1008
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
-#: src/TouchPoint-WP/Utilities.php:236
+#: src/TouchPoint-WP/Utilities.php:249
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr "Tarde en la noche"
 
-#: src/TouchPoint-WP/Utilities.php:238
+#: src/TouchPoint-WP/Utilities.php:251
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr "Madrugada"
 
-#: src/TouchPoint-WP/Utilities.php:240
+#: src/TouchPoint-WP/Utilities.php:253
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr "Mañana"
 
-#: src/TouchPoint-WP/Utilities.php:242
+#: src/TouchPoint-WP/Utilities.php:255
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr "Mediodía"
 
-#: src/TouchPoint-WP/Utilities.php:244
+#: src/TouchPoint-WP/Utilities.php:257
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: src/TouchPoint-WP/Utilities.php:246
+#: src/TouchPoint-WP/Utilities.php:259
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr "Tardecita"
 
-#: src/TouchPoint-WP/Utilities.php:248
+#: src/TouchPoint-WP/Utilities.php:261
 msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1920
+#: src/TouchPoint-WP/Involvement.php:1921
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1921
+#: src/TouchPoint-WP/Involvement.php:1922
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1962
+#: src/TouchPoint-WP/Involvement.php:1963
 #: src/TouchPoint-WP/Partner.php:879
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1965
+#: src/TouchPoint-WP/Involvement.php:1966
 #: src/TouchPoint-WP/Partner.php:882
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1013
-#: src/TouchPoint-WP/Involvement.php:1045
-#: src/TouchPoint-WP/Involvement.php:1138
-#: src/TouchPoint-WP/Involvement.php:1162
+#: src/TouchPoint-WP/Involvement.php:1014
+#: src/TouchPoint-WP/Involvement.php:1046
+#: src/TouchPoint-WP/Involvement.php:1139
+#: src/TouchPoint-WP/Involvement.php:1163
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -1232,43 +1222,43 @@ msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1054
+#: src/TouchPoint-WP/Involvement.php:1055
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1063
+#: src/TouchPoint-WP/Involvement.php:1064
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1072
+#: src/TouchPoint-WP/Involvement.php:1073
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1080
+#: src/TouchPoint-WP/Involvement.php:1081
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1088
+#: src/TouchPoint-WP/Involvement.php:1089
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1096
+#: src/TouchPoint-WP/Involvement.php:1097
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3607
+#: src/TouchPoint-WP/Involvement.php:3649
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+#: src/TouchPoint-WP/Settings.php:376
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1280,39 +1270,39 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2058
+#: src/TouchPoint-WP/Involvement.php:2059
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2068
+#: src/TouchPoint-WP/Involvement.php:2069
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2087
+#: src/TouchPoint-WP/Involvement.php:2088
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:689
-#: src/TouchPoint-WP/TouchPointWP.php:1054
+#: src/TouchPoint-WP/TouchPointWP.php:1052
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
 #: src/TouchPoint-WP/Meeting.php:717
-#: src/TouchPoint-WP/TouchPointWP.php:368
+#: src/TouchPoint-WP/TouchPointWP.php:370
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
 #: src/TouchPoint-WP/Meeting.php:727
-#: src/TouchPoint-WP/TouchPointWP.php:377
+#: src/TouchPoint-WP/TouchPointWP.php:379
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3903
-#: src/TouchPoint-WP/Involvement.php:4008
+#: src/TouchPoint-WP/Involvement.php:3945
+#: src/TouchPoint-WP/Involvement.php:4050
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/Settings.php:328
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1377,7 +1367,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
+#: src/TouchPoint-WP/Settings.php:329
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1424,11 +1414,11 @@ msgstr "Informe de TouchPoint"
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:272
+#: src/TouchPoint-WP/TouchPointWP.php:274
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1846
+#: src/TouchPoint-WP/Involvement.php:1847
 msgid "Language"
 msgstr "Idioma"
 
@@ -1440,16 +1430,16 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1461
+#: src/TouchPoint-WP/Person.php:1459
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/Settings.php:852
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/Settings.php:853
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1457,28 +1447,28 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
+#: src/TouchPoint-WP/Settings.php:881
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/Settings.php:882
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:3995
-#: src/TouchPoint-WP/Person.php:1836
+#: src/TouchPoint-WP/Involvement.php:4037
+#: src/TouchPoint-WP/Person.php:1841
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
+#: src/TouchPoint-WP/Settings.php:548
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
+#: src/TouchPoint-WP/Settings.php:364
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/Settings.php:468
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1486,16 +1476,16 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1691
+#: src/TouchPoint-WP/Person.php:1696
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:3985
-#: src/TouchPoint-WP/Person.php:1853
+#: src/TouchPoint-WP/Involvement.php:4027
+#: src/TouchPoint-WP/Person.php:1858
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1600
+#: src/TouchPoint-WP/Person.php:1598
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
@@ -1510,40 +1500,40 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/Settings.php:295
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+#: src/TouchPoint-WP/Settings.php:296
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/Settings.php:894
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/Settings.php:895
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/Settings.php:907
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/Settings.php:920
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
+#: src/TouchPoint-WP/Settings.php:992
+#: src/TouchPoint-WP/Settings.php:1123
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
+#: src/TouchPoint-WP/Settings.php:993
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
+#: src/TouchPoint-WP/Settings.php:1124
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1566,7 +1556,7 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Utilities.php:500
+#: src/TouchPoint-WP/Utilities.php:513
 msgid "Expand"
 msgstr "Ampliar"
 
@@ -1608,7 +1598,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3695
+#: src/TouchPoint-WP/Involvement.php:3737
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1622,43 +1612,43 @@ msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1203
+#: src/TouchPoint-WP/Person.php:1181
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/Settings.php:857
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
+#: src/TouchPoint-WP/Settings.php:858
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/Settings.php:863
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/Settings.php:863
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/Settings.php:869
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
+#: src/TouchPoint-WP/Settings.php:870
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/Settings.php:875
+#: src/TouchPoint-WP/Settings.php:877
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/Settings.php:875
+#: src/TouchPoint-WP/Settings.php:877
 msgid "Event"
 msgstr "Evento"
 
@@ -1687,13 +1677,13 @@ msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:141
+#: src/TouchPoint-WP/Involvement.php:142
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1016
-#: src/TouchPoint-WP/Involvement.php:1039
+#: src/TouchPoint-WP/Involvement.php:1017
+#: src/TouchPoint-WP/Involvement.php:1040
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
@@ -1765,31 +1755,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
+#: src/TouchPoint-WP/Settings.php:793
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+#: src/TouchPoint-WP/Settings.php:797
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/Settings.php:803
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/Settings.php:808
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/Settings.php:809
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/Settings.php:822
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
+#: src/TouchPoint-WP/Settings.php:804
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1810,20 +1800,20 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1040
+#: src/TouchPoint-WP/Involvement.php:1041
 msgid "All Day"
 msgstr "todo el dia"
 
-#: src/TouchPoint-WP/Utilities.php:291
+#: src/TouchPoint-WP/Utilities.php:304
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+#: src/TouchPoint-WP/Settings.php:435
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
+#: src/TouchPoint-WP/Settings.php:436
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
@@ -1856,18 +1846,27 @@ msgstr "Actualizada"
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
+#: src/TouchPoint-WP/Settings.php:908
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
-msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
-msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días en el pasado. Una vez que un evento tenga más de esta cantidad de días, se eliminará."
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/Settings.php:446
 msgid "List Site in Directory"
 msgstr "Listar sitio en directorio"
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+#: src/TouchPoint-WP/Settings.php:447
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
+
+#. translators: %s is "what you call TouchPoint at your church", which is a setting
+#: src/TouchPoint-WP/Auth.php:129
+msgid "Sign in with %s"
+msgstr "Iniciar sesión con %s"
+
+#: src/TouchPoint-WP/Auth.php:348
+msgid "No user account found."
+msgstr "No se encontró ninguna cuenta de usuario"
+
+#: src/TouchPoint-WP/Settings.php:921
+msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
+msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días. Si un evento tiene más de esta cantidad, se eliminará. Se recomienda encarecidamente tener poco historial (menos de un mes) o mucho (al menos 15 meses)."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index da1067c7..f45381a2 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-03-07T18:19:58+00:00\n"
+"POT-Creation-Date: 2025-04-07T20:36:47+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:978
+#: src/TouchPoint-WP/Settings.php:980
 msgid "Divisions to Import"
 msgstr ""
 
@@ -183,13 +183,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:237
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1872
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:241
-#: src/TouchPoint-WP/Involvement.php:1897
+#: src/TouchPoint-WP/Involvement.php:1898
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr ""
@@ -284,7 +284,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2117
+#: src/TouchPoint-WP/Involvement.php:2118
 msgid "No %s Found."
 msgstr ""
 
@@ -295,40 +295,39 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3607
+#: src/TouchPoint-WP/Involvement.php:3649
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
 
 #: src/TouchPoint-WP/Api.php:97
-#: src/TouchPoint-WP/Api.php:203
+#: src/TouchPoint-WP/Api.php:298
+#: src/TouchPoint-WP/Api.php:385
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
 #: src/TouchPoint-WP/Api.php:111
-#: src/TouchPoint-WP/Api.php:156
+#: src/TouchPoint-WP/Api.php:159
+#: src/TouchPoint-WP/Api.php:330
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:267
+#: src/TouchPoint-WP/Api.php:449
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:144
-msgid "Sign in with your %s account"
+#: src/TouchPoint-WP/Auth.php:129
+msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:412
-msgid "Your login token expired."
-msgstr ""
-
-#: src/TouchPoint-WP/Auth.php:427
+#: src/TouchPoint-WP/Auth.php:309
+#: src/TouchPoint-WP/Auth.php:317
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:439
-msgid "Session could not be validated."
+#: src/TouchPoint-WP/Auth.php:348
+msgid "No user account found."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
@@ -350,31 +349,31 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:141
+#: src/TouchPoint-WP/Involvement.php:142
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:513
+#: src/TouchPoint-WP/Involvement.php:514
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:518
+#: src/TouchPoint-WP/Involvement.php:519
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:525
+#: src/TouchPoint-WP/Involvement.php:526
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:531
+#: src/TouchPoint-WP/Involvement.php:532
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1013
-#: src/TouchPoint-WP/Involvement.php:1045
-#: src/TouchPoint-WP/Involvement.php:1138
-#: src/TouchPoint-WP/Involvement.php:1162
+#: src/TouchPoint-WP/Involvement.php:1014
+#: src/TouchPoint-WP/Involvement.php:1046
+#: src/TouchPoint-WP/Involvement.php:1139
+#: src/TouchPoint-WP/Involvement.php:1163
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -382,175 +381,175 @@ msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1016
-#: src/TouchPoint-WP/Involvement.php:1039
+#: src/TouchPoint-WP/Involvement.php:1017
+#: src/TouchPoint-WP/Involvement.php:1040
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1040
+#: src/TouchPoint-WP/Involvement.php:1041
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1054
+#: src/TouchPoint-WP/Involvement.php:1055
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1063
+#: src/TouchPoint-WP/Involvement.php:1064
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1072
+#: src/TouchPoint-WP/Involvement.php:1073
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1080
+#: src/TouchPoint-WP/Involvement.php:1081
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1088
+#: src/TouchPoint-WP/Involvement.php:1089
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1096
+#: src/TouchPoint-WP/Involvement.php:1097
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1746
+#: src/TouchPoint-WP/Involvement.php:1747
 #: src/TouchPoint-WP/Partner.php:839
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1803
+#: src/TouchPoint-WP/Involvement.php:1804
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1846
+#: src/TouchPoint-WP/Involvement.php:1847
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1919
+#: src/TouchPoint-WP/Involvement.php:1920
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1920
+#: src/TouchPoint-WP/Involvement.php:1921
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1921
+#: src/TouchPoint-WP/Involvement.php:1922
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1932
+#: src/TouchPoint-WP/Involvement.php:1933
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1954
+#: src/TouchPoint-WP/Involvement.php:1955
 #: src/TouchPoint-WP/Partner.php:863
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1962
+#: src/TouchPoint-WP/Involvement.php:1963
 #: src/TouchPoint-WP/Partner.php:879
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1965
+#: src/TouchPoint-WP/Involvement.php:1966
 #: src/TouchPoint-WP/Partner.php:882
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2058
+#: src/TouchPoint-WP/Involvement.php:2059
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2068
+#: src/TouchPoint-WP/Involvement.php:2069
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2087
+#: src/TouchPoint-WP/Involvement.php:2088
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3586
+#: src/TouchPoint-WP/Involvement.php:3628
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3589
+#: src/TouchPoint-WP/Involvement.php:3631
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3666
+#: src/TouchPoint-WP/Involvement.php:3708
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3683
+#: src/TouchPoint-WP/Involvement.php:3725
 #: src/TouchPoint-WP/Partner.php:1343
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3695
+#: src/TouchPoint-WP/Involvement.php:3737
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3736
-#: src/TouchPoint-WP/Involvement.php:3795
+#: src/TouchPoint-WP/Involvement.php:3778
+#: src/TouchPoint-WP/Involvement.php:3837
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3742
+#: src/TouchPoint-WP/Involvement.php:3784
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3746
+#: src/TouchPoint-WP/Involvement.php:3788
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3751
+#: src/TouchPoint-WP/Involvement.php:3793
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3754
+#: src/TouchPoint-WP/Involvement.php:3796
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3757
+#: src/TouchPoint-WP/Involvement.php:3799
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3760
+#: src/TouchPoint-WP/Involvement.php:3802
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3786
+#: src/TouchPoint-WP/Involvement.php:3828
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3903
-#: src/TouchPoint-WP/Involvement.php:4008
+#: src/TouchPoint-WP/Involvement.php:3945
+#: src/TouchPoint-WP/Involvement.php:4050
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3985
-#: src/TouchPoint-WP/Person.php:1853
+#: src/TouchPoint-WP/Involvement.php:4027
+#: src/TouchPoint-WP/Person.php:1858
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3995
-#: src/TouchPoint-WP/Person.php:1836
+#: src/TouchPoint-WP/Involvement.php:4037
+#: src/TouchPoint-WP/Person.php:1841
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -586,17 +585,17 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:689
-#: src/TouchPoint-WP/TouchPointWP.php:1054
+#: src/TouchPoint-WP/TouchPointWP.php:1052
 msgid "Only GET requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:717
-#: src/TouchPoint-WP/TouchPointWP.php:368
+#: src/TouchPoint-WP/TouchPointWP.php:370
 msgid "Only POST requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:727
-#: src/TouchPoint-WP/TouchPointWP.php:377
+#: src/TouchPoint-WP/TouchPointWP.php:379
 msgid "Invalid data provided."
 msgstr ""
 
@@ -615,39 +614,39 @@ msgstr ""
 msgid "Not Shown on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:153
+#: src/TouchPoint-WP/Person.php:146
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:645
+#: src/TouchPoint-WP/Person.php:638
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1195
+#: src/TouchPoint-WP/Person.php:1173
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1203
+#: src/TouchPoint-WP/Person.php:1181
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1454
-#: src/TouchPoint-WP/Utilities.php:286
+#: src/TouchPoint-WP/Person.php:1452
+#: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1461
+#: src/TouchPoint-WP/Person.php:1459
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1600
+#: src/TouchPoint-WP/Person.php:1598
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1691
+#: src/TouchPoint-WP/Person.php:1696
 msgid "You may need to sign in."
 msgstr ""
 
@@ -664,882 +663,882 @@ msgstr ""
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/StatusWidget.php:41
-msgid "TouchPoint-WP Status"
-msgstr ""
-
-#: src/TouchPoint-WP/StatusWidget.php:98
-msgid "Imported"
-msgstr ""
-
-#: src/TouchPoint-WP/StatusWidget.php:99
-msgid "Last Updated"
-msgstr ""
-
-#. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/Taxonomies.php:51
-msgid "Search %s"
-msgstr ""
-
-#. translators: %s: taxonomy name, plural
-#: src/TouchPoint-WP/Taxonomies.php:53
-msgid "All %s"
-msgstr ""
-
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:55
-msgid "Edit %s"
-msgstr ""
-
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:57
-msgid "Update %s"
-msgstr ""
-
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:59
-msgid "Add New %s"
-msgstr ""
-
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:61
-msgid "New %s"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:658
-msgid "Classify posts by their general locations."
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:687
-msgid "Classify posts by their church campus."
-msgstr ""
-
-#. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:718
-msgid "Classify things by %s."
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:749
-msgid "Classify involvements by the day on which they meet."
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:750
-msgid "Weekdays"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:776
-msgid "Classify involvements by tense (present, future, past)"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:780
-msgid "Tense"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:780
-msgid "Tenses"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:803
-msgid "Classify involvements by the portion of the day in which they meet."
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:809
-msgid "Times of Day"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:835
-msgid "Classify involvements and users by their age groups."
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:838
-msgid "Age Groups"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:864
-msgid "Classify involvements by whether participants are mostly single or married."
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:870
-msgid "Marital Statuses"
-msgstr ""
-
-#: src/TouchPoint-WP/Taxonomies.php:903
-msgid "Classify Partners by category chosen in settings."
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:272
-msgid "Every 15 minutes"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2064
-msgid "Unknown Type"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2121
-msgid "Your Searches"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2124
-msgid "Public Searches"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2127
-msgid "Status Flags"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2132
-#: src/TouchPoint-WP/TouchPointWP.php:2133
-msgid "Current Value"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP.php:2324
-msgid "People Query Failed"
-msgstr ""
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:258
+#: src/TouchPoint-WP/Settings.php:259
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:259
+#: src/TouchPoint-WP/Settings.php:260
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:263
+#: src/TouchPoint-WP/Settings.php:264
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:264
+#: src/TouchPoint-WP/Settings.php:265
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:275
+#: src/TouchPoint-WP/Settings.php:276
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:276
+#: src/TouchPoint-WP/Settings.php:277
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:283
+#: src/TouchPoint-WP/Settings.php:284
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:284
+#: src/TouchPoint-WP/Settings.php:285
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:294
+#: src/TouchPoint-WP/Settings.php:295
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:295
+#: src/TouchPoint-WP/Settings.php:296
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:305
+#: src/TouchPoint-WP/Settings.php:306
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:306
+#: src/TouchPoint-WP/Settings.php:307
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:316
+#: src/TouchPoint-WP/Settings.php:317
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:317
+#: src/TouchPoint-WP/Settings.php:318
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:327
+#: src/TouchPoint-WP/Settings.php:328
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:328
+#: src/TouchPoint-WP/Settings.php:329
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:338
+#: src/TouchPoint-WP/Settings.php:339
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:339
+#: src/TouchPoint-WP/Settings.php:340
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:349
+#: src/TouchPoint-WP/Settings.php:350
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:350
+#: src/TouchPoint-WP/Settings.php:351
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:362
+#: src/TouchPoint-WP/Settings.php:363
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:363
+#: src/TouchPoint-WP/Settings.php:364
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:374
+#: src/TouchPoint-WP/Settings.php:375
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:375
+#: src/TouchPoint-WP/Settings.php:376
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:386
+#: src/TouchPoint-WP/Settings.php:387
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:387
+#: src/TouchPoint-WP/Settings.php:388
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:399
+#: src/TouchPoint-WP/Settings.php:400
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:400
+#: src/TouchPoint-WP/Settings.php:401
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:411
+#: src/TouchPoint-WP/Settings.php:412
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:412
+#: src/TouchPoint-WP/Settings.php:413
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:423
+#: src/TouchPoint-WP/Settings.php:424
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:424
+#: src/TouchPoint-WP/Settings.php:425
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:434
+#: src/TouchPoint-WP/Settings.php:435
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:435
+#: src/TouchPoint-WP/Settings.php:436
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:445
+#: src/TouchPoint-WP/Settings.php:446
 msgid "List Site in Directory"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:446
+#: src/TouchPoint-WP/Settings.php:447
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:464
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:469
+#: src/TouchPoint-WP/Settings.php:465
+#: src/TouchPoint-WP/Settings.php:470
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:467
+#: src/TouchPoint-WP/Settings.php:468
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:468
+#: src/TouchPoint-WP/Settings.php:469
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:485
+#: src/TouchPoint-WP/Settings.php:486
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:486
+#: src/TouchPoint-WP/Settings.php:487
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:490
+#: src/TouchPoint-WP/Settings.php:491
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:491
+#: src/TouchPoint-WP/Settings.php:492
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:502
+#: src/TouchPoint-WP/Settings.php:503
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:503
+#: src/TouchPoint-WP/Settings.php:504
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:513
+#: src/TouchPoint-WP/Settings.php:514
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:514
+#: src/TouchPoint-WP/Settings.php:515
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:524
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:762
+#: src/TouchPoint-WP/Settings.php:525
+#: src/TouchPoint-WP/Settings.php:763
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:525
+#: src/TouchPoint-WP/Settings.php:526
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:541
+#: src/TouchPoint-WP/Settings.php:542
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:542
+#: src/TouchPoint-WP/Settings.php:543
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:546
+#: src/TouchPoint-WP/Settings.php:547
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:547
+#: src/TouchPoint-WP/Settings.php:548
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:556
+#: src/TouchPoint-WP/Settings.php:557
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:557
+#: src/TouchPoint-WP/Settings.php:558
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:566
+#: src/TouchPoint-WP/Settings.php:567
 msgid "Change 'Edit Profile' links"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:567
+#: src/TouchPoint-WP/Settings.php:568
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:576
+#: src/TouchPoint-WP/Settings.php:577
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:577
+#: src/TouchPoint-WP/Settings.php:578
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:583
+#: src/TouchPoint-WP/Settings.php:584
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:584
+#: src/TouchPoint-WP/Settings.php:585
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:598
+#: src/TouchPoint-WP/Settings.php:599
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:599
+#: src/TouchPoint-WP/Settings.php:600
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:604
+#: src/TouchPoint-WP/Settings.php:605
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:634
+#: src/TouchPoint-WP/Settings.php:635
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:635
+#: src/TouchPoint-WP/Settings.php:636
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:639
+#: src/TouchPoint-WP/Settings.php:640
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:640
+#: src/TouchPoint-WP/Settings.php:641
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:650
+#: src/TouchPoint-WP/Settings.php:651
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:651
+#: src/TouchPoint-WP/Settings.php:652
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:661
+#: src/TouchPoint-WP/Settings.php:662
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:662
+#: src/TouchPoint-WP/Settings.php:663
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:672
+#: src/TouchPoint-WP/Settings.php:673
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:673
+#: src/TouchPoint-WP/Settings.php:674
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:683
+#: src/TouchPoint-WP/Settings.php:684
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:684
+#: src/TouchPoint-WP/Settings.php:685
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:696
+#: src/TouchPoint-WP/Settings.php:697
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:697
+#: src/TouchPoint-WP/Settings.php:698
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:707
+#: src/TouchPoint-WP/Settings.php:708
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:708
+#: src/TouchPoint-WP/Settings.php:709
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:718
+#: src/TouchPoint-WP/Settings.php:719
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:719
+#: src/TouchPoint-WP/Settings.php:720
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:729
+#: src/TouchPoint-WP/Settings.php:730
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:730
+#: src/TouchPoint-WP/Settings.php:731
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:740
+#: src/TouchPoint-WP/Settings.php:741
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:741
+#: src/TouchPoint-WP/Settings.php:742
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:751
+#: src/TouchPoint-WP/Settings.php:752
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:752
+#: src/TouchPoint-WP/Settings.php:753
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:763
+#: src/TouchPoint-WP/Settings.php:764
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:774
+#: src/TouchPoint-WP/Settings.php:775
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:775
+#: src/TouchPoint-WP/Settings.php:776
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:792
+#: src/TouchPoint-WP/Settings.php:793
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:796
+#: src/TouchPoint-WP/Settings.php:797
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:802
+#: src/TouchPoint-WP/Settings.php:803
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:803
+#: src/TouchPoint-WP/Settings.php:804
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:807
+#: src/TouchPoint-WP/Settings.php:808
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:808
+#: src/TouchPoint-WP/Settings.php:809
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:818
+#: src/TouchPoint-WP/Settings.php:819
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:821
+#: src/TouchPoint-WP/Settings.php:822
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
+#: src/TouchPoint-WP/Settings.php:824
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:838
+#: src/TouchPoint-WP/Settings.php:839
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:839
+#: src/TouchPoint-WP/Settings.php:840
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:851
+#: src/TouchPoint-WP/Settings.php:852
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:852
+#: src/TouchPoint-WP/Settings.php:853
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:856
+#: src/TouchPoint-WP/Settings.php:857
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:857
+#: src/TouchPoint-WP/Settings.php:858
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/Settings.php:863
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:862
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:864
+#: src/TouchPoint-WP/Settings.php:863
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:868
+#: src/TouchPoint-WP/Settings.php:869
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:869
+#: src/TouchPoint-WP/Settings.php:870
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/Settings.php:875
+#: src/TouchPoint-WP/Settings.php:877
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:874
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/Settings.php:875
+#: src/TouchPoint-WP/Settings.php:877
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:880
+#: src/TouchPoint-WP/Settings.php:881
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:881
+#: src/TouchPoint-WP/Settings.php:882
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:893
+#: src/TouchPoint-WP/Settings.php:894
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:894
+#: src/TouchPoint-WP/Settings.php:895
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:906
+#: src/TouchPoint-WP/Settings.php:907
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:907
+#: src/TouchPoint-WP/Settings.php:908
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:919
+#: src/TouchPoint-WP/Settings.php:920
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:920
-msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted."
+#: src/TouchPoint-WP/Settings.php:921
+msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:936
+#: src/TouchPoint-WP/Settings.php:938
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:937
+#: src/TouchPoint-WP/Settings.php:939
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:941
+#: src/TouchPoint-WP/Settings.php:943
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:942
+#: src/TouchPoint-WP/Settings.php:944
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:953
+#: src/TouchPoint-WP/Settings.php:955
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:954
+#: src/TouchPoint-WP/Settings.php:956
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:965
+#: src/TouchPoint-WP/Settings.php:967
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:966
+#: src/TouchPoint-WP/Settings.php:968
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:979
+#: src/TouchPoint-WP/Settings.php:981
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:990
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1121
+#: src/TouchPoint-WP/Settings.php:992
+#: src/TouchPoint-WP/Settings.php:1123
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:991
+#: src/TouchPoint-WP/Settings.php:993
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1005
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1011
+#: src/TouchPoint-WP/Settings.php:1007
+#: src/TouchPoint-WP/Settings.php:1013
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1006
+#: src/TouchPoint-WP/Settings.php:1008
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1030
+#: src/TouchPoint-WP/Settings.php:1032
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1031
+#: src/TouchPoint-WP/Settings.php:1033
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1038
+#: src/TouchPoint-WP/Settings.php:1040
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1039
+#: src/TouchPoint-WP/Settings.php:1041
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1050
+#: src/TouchPoint-WP/Settings.php:1052
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1051
+#: src/TouchPoint-WP/Settings.php:1053
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1062
+#: src/TouchPoint-WP/Settings.php:1064
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1063
+#: src/TouchPoint-WP/Settings.php:1065
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1079
+#: src/TouchPoint-WP/Settings.php:1081
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1080
+#: src/TouchPoint-WP/Settings.php:1082
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1084
+#: src/TouchPoint-WP/Settings.php:1086
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1085
+#: src/TouchPoint-WP/Settings.php:1087
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1096
+#: src/TouchPoint-WP/Settings.php:1098
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1097
+#: src/TouchPoint-WP/Settings.php:1099
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1108
+#: src/TouchPoint-WP/Settings.php:1110
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1109
+#: src/TouchPoint-WP/Settings.php:1111
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
+#: src/TouchPoint-WP/Settings.php:1124
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1287
+#: src/TouchPoint-WP/Settings.php:1289
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1341
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1342
+#: src/TouchPoint-WP/Settings.php:1343
+#: src/TouchPoint-WP/Settings.php:1344
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1390
+#: src/TouchPoint-WP/Settings.php:1392
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1630
+#: src/TouchPoint-WP/Settings.php:1637
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1752
+#: src/TouchPoint-WP/Settings.php:1759
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1803
+#: src/TouchPoint-WP/Settings.php:1810
 msgid "Save Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:136
+#: src/TouchPoint-WP/StatusWidget.php:41
+msgid "TouchPoint-WP Status"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:98
+msgid "Imported"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:99
+msgid "Last Updated"
+msgstr ""
+
+#. translators: %s: taxonomy name, plural
+#: src/TouchPoint-WP/Taxonomies.php:51
+msgid "Search %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, plural
+#: src/TouchPoint-WP/Taxonomies.php:53
+msgid "All %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:55
+msgid "Edit %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:57
+msgid "Update %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:59
+msgid "Add New %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:61
+msgid "New %s"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:658
+msgid "Classify posts by their general locations."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:687
+msgid "Classify posts by their church campus."
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:718
+msgid "Classify things by %s."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:749
+msgid "Classify involvements by the day on which they meet."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:750
+msgid "Weekdays"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:776
+msgid "Classify involvements by tense (present, future, past)"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:780
+msgid "Tense"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:780
+msgid "Tenses"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:803
+msgid "Classify involvements by the portion of the day in which they meet."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:809
+msgid "Times of Day"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:835
+msgid "Classify involvements and users by their age groups."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:838
+msgid "Age Groups"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:864
+msgid "Classify involvements by whether participants are mostly single or married."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:870
+msgid "Marital Statuses"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:903
+msgid "Classify Partners by category chosen in settings."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:274
+msgid "Every 15 minutes"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2062
+msgid "Unknown Type"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2119
+msgid "Your Searches"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2122
+msgid "Public Searches"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2125
+msgid "Status Flags"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2130
+#: src/TouchPoint-WP/TouchPointWP.php:2131
+msgid "Current Value"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2322
+msgid "People Query Failed"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities.php:149
 msgctxt "e.g. event happens weekly on..."
 msgid "Sundays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:137
+#: src/TouchPoint-WP/Utilities.php:150
 msgctxt "e.g. event happens weekly on..."
 msgid "Mondays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:138
+#: src/TouchPoint-WP/Utilities.php:151
 msgctxt "e.g. event happens weekly on..."
 msgid "Tuesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:139
+#: src/TouchPoint-WP/Utilities.php:152
 msgctxt "e.g. event happens weekly on..."
 msgid "Wednesdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:140
+#: src/TouchPoint-WP/Utilities.php:153
 msgctxt "e.g. event happens weekly on..."
 msgid "Thursdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:141
+#: src/TouchPoint-WP/Utilities.php:154
 msgctxt "e.g. event happens weekly on..."
 msgid "Fridays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:142
+#: src/TouchPoint-WP/Utilities.php:155
 msgctxt "e.g. event happens weekly on..."
 msgid "Saturdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:188
+#: src/TouchPoint-WP/Utilities.php:201
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sun"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:189
+#: src/TouchPoint-WP/Utilities.php:202
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Mon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:190
+#: src/TouchPoint-WP/Utilities.php:203
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Tue"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:191
+#: src/TouchPoint-WP/Utilities.php:204
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Wed"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:192
+#: src/TouchPoint-WP/Utilities.php:205
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Thu"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:193
+#: src/TouchPoint-WP/Utilities.php:206
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Fri"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:194
+#: src/TouchPoint-WP/Utilities.php:207
 msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:236
+#: src/TouchPoint-WP/Utilities.php:249
 msgctxt "Time of Day"
 msgid "Late Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:238
+#: src/TouchPoint-WP/Utilities.php:251
 msgctxt "Time of Day"
 msgid "Early Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:240
+#: src/TouchPoint-WP/Utilities.php:253
 msgctxt "Time of Day"
 msgid "Morning"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:242
+#: src/TouchPoint-WP/Utilities.php:255
 msgctxt "Time of Day"
 msgid "Midday"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:244
+#: src/TouchPoint-WP/Utilities.php:257
 msgctxt "Time of Day"
 msgid "Afternoon"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:246
+#: src/TouchPoint-WP/Utilities.php:259
 msgctxt "Time of Day"
 msgid "Evening"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:248
+#: src/TouchPoint-WP/Utilities.php:261
 msgctxt "Time of Day"
 msgid "Night"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:291
+#: src/TouchPoint-WP/Utilities.php:304
 msgctxt "list of items, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities.php:500
+#: src/TouchPoint-WP/Utilities.php:513
 msgid "Expand"
 msgstr ""
 
@@ -1699,15 +1698,15 @@ msgstr ""
 #: assets/js/base-defer.js:971
 #: assets/js/base-defer.js:1417
 #: assets/js/base-defer.js:1428
-#: assets/js/meeting-defer.js:174
-#: assets/js/meeting-defer.js:185
+#: assets/js/meeting-defer.js:203
+#: assets/js/meeting-defer.js:214
 msgid "OK"
 msgstr ""
 
 #: assets/js/base-defer.js:931
 #: assets/js/base-defer.js:968
 #: assets/js/base-defer.js:1425
-#: assets/js/meeting-defer.js:182
+#: assets/js/meeting-defer.js:211
 msgid "Something strange happened."
 msgstr ""
 
@@ -1729,7 +1728,7 @@ msgstr ""
 #: assets/js/base-defer.js:1060
 #: assets/js/base-defer.js:1376
 #: assets/js/base-defer.js:1469
-#: assets/js/meeting-defer.js:224
+#: assets/js/meeting-defer.js:253
 msgid "Cancel"
 msgstr ""
 
@@ -1828,49 +1827,49 @@ msgstr ""
 msgid "Event Past"
 msgstr ""
 
-#: assets/js/meeting-defer.js:171
+#: assets/js/meeting-defer.js:200
 msgid "Response Recorded"
 msgid_plural "Responses Recorded"
 msgstr[0] ""
 msgstr[1] ""
 
 #. translators: "RSVP for {Event Name}"  This is the heading on the RSVP modal.  The event name isn't translated because it comes from TouchPoint.
-#: assets/js/meeting-defer.js:204
+#: assets/js/meeting-defer.js:233
 msgid "RSVP for %s"
 msgstr ""
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "Who is coming?"
 msgstr ""
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "Indicate who is or is not coming.  This will overwrite any existing RSVP."
 msgstr ""
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "To avoid overwriting an existing RSVP, leave that person blank."
 msgstr ""
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "To protect privacy, we won't show existing RSVPs here."
 msgstr ""
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "Yes"
 msgstr ""
 
-#: assets/js/meeting-defer.js:216
+#: assets/js/meeting-defer.js:245
 msgid "No"
 msgstr ""
 
-#: assets/js/meeting-defer.js:222
+#: assets/js/meeting-defer.js:251
 msgid "Add Someone Else"
 msgstr ""
 
-#: assets/js/meeting-defer.js:223
+#: assets/js/meeting-defer.js:252
 msgid "Submit"
 msgstr ""
 
-#: assets/js/meeting-defer.js:242
+#: assets/js/meeting-defer.js:271
 msgid "Nothing to submit."
 msgstr ""

From 8f802958e64be91e3c3203f5fc677a8ab51f77a0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 7 Apr 2025 16:47:40 -0400
Subject: [PATCH 261/423] Refactor Settings class

---
 src/TouchPoint-WP/Api.php                        |  4 ++--
 src/TouchPoint-WP/EventsCalendar.php             |  2 +-
 .../Involvement_PostTypeSettings.php             |  2 +-
 .../{TouchPointWP_Settings.php => Settings.php}  | 16 ++++++++--------
 src/TouchPoint-WP/TouchPointWP.php               |  6 +++---
 src/TouchPoint-WP/TouchPointWP_Exception.php     | 12 ++++++++++++
 src/TouchPoint-WP/Utilities.php                  | 14 ++++++++++++++
 src/TouchPoint-WP/Utilities/Cleanup.php          |  6 +++---
 src/python/WebApi.py                             |  3 ++-
 src/templates/admin/invKoForm.php                |  2 +-
 src/templates/admin/locationsKoForm.php          |  2 +-
 touchpoint-wp.php                                |  2 +-
 12 files changed, 49 insertions(+), 22 deletions(-)
 rename src/TouchPoint-WP/{TouchPointWP_Settings.php => Settings.php} (99%)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 2d9c5efe..659e3297 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -41,9 +41,9 @@ public function __construct(TouchPointWP $parent)
 	/**
 	 * Shortcut to the settings object.
 	 *
-	 * @return TouchPointWP_Settings
+	 * @return Settings
 	 */
-	protected function settings(): TouchPointWP_Settings
+	protected function settings(): Settings
 	{
 		return $this->parent->settings;
 	}
diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 5957f81d..5afb5d1f 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -201,7 +201,7 @@ private static function formatContent(?string $content): string
 	 * @return array
 	 *
 	 * @since 0.0.90 Added and Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
-	 * @depreacted
+	 * @deprecated
 	 */
 	protected static function generateEventsListFromMeetings(array $params = []): array
 	{
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index 1c3aa0cf..781df731 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -163,7 +163,7 @@ public function __get($what)
 			return $this->$what;
 		}
 
-		return TouchPointWP_Settings::UNDEFINED_PLACEHOLDER;
+		return Settings::UNDEFINED_PLACEHOLDER;
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/TouchPointWP_Settings.php b/src/TouchPoint-WP/Settings.php
similarity index 99%
rename from src/TouchPoint-WP/TouchPointWP_Settings.php
rename to src/TouchPoint-WP/Settings.php
index ee1cd6e5..2f90eaa5 100644
--- a/src/TouchPoint-WP/TouchPointWP_Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -95,13 +95,13 @@
  * @property-read array        dv_divisions       Which divisions should be imported
  * @property-read array        dv_additional_post_types  Which post types should have the division taxonomy.
  */
-class TouchPointWP_Settings
+class Settings
 {
 
 	/**
 	 * The singleton of TouchPointWP_Settings.
 	 */
-	private static ?TouchPointWP_Settings $_instance = null;
+	private static ?Settings $_instance = null;
 
 	/**
 	 * The main plugin object.
@@ -146,12 +146,12 @@ public function __construct(TouchPointWP $parent)
 	 *
 	 * @param ?TouchPointWP $parent Object instance.
 	 *
-	 * @return TouchPointWP_Settings instance
+	 * @return Settings instance
 	 * @since 0.0.90 Added
 	 * @static
 	 * @see TouchPointWP()
 	 */
-	public static function instance(?TouchPointWP $parent = null): TouchPointWP_Settings
+	public static function instance(?TouchPointWP $parent = null): Settings
 	{
 		if (is_null($parent)) {
 			$parent = TouchPointWP::instance();
@@ -183,10 +183,10 @@ public function hasValidApiSettings(): bool
 	{
 		$host = $this->getWithoutDefault('host');
 
-		return ! ($this->getWithoutDefault('api_script_name') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER ||
-				  $host === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER || $host === '' ||
-				  $this->getWithoutDefault('api_user') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER ||
-				  $this->getWithoutDefault('api_pass') === TouchPointWP_Settings::UNDEFINED_PLACEHOLDER);
+		return ! ($this->getWithoutDefault('api_script_name') === Settings::UNDEFINED_PLACEHOLDER ||
+		          $host === Settings::UNDEFINED_PLACEHOLDER || $host === '' ||
+		          $this->getWithoutDefault('api_user') === Settings::UNDEFINED_PLACEHOLDER ||
+		          $this->getWithoutDefault('api_pass') === Settings::UNDEFINED_PLACEHOLDER);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 3d7d7a91..31652417 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -121,7 +121,7 @@ class TouchPointWP
 	/**
 	 * Settings object
 	 */
-	public ?TouchPointWP_Settings $settings = null;
+	public ?Settings $settings = null;
 
 	/**
 	 * API object
@@ -744,7 +744,7 @@ public static function load($file): TouchPointWP
 		$instance = self::instance($file);
 
 		if (is_null($instance->settings)) {
-			$instance->settings = TouchPointWP_Settings::instance($instance);
+			$instance->settings = Settings::instance($instance);
 			if (is_admin()) {
 				$instance->migrate();
 			}
@@ -2333,7 +2333,7 @@ public function doPersonQuery(array $q, bool $verbose = false, int $timeout = 5)
 	}
 
 	/**
-	 * @depecated 0.0.95 Use Api version instead.
+	 * @deprecated 0.0.95 Use Api version instead.
 	 *
 	 * @return WP_Http|null
 	 */
diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index 581d7284..5f7626da 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -7,6 +7,7 @@
 
 use Exception;
 use Throwable;
+use WP_Error;
 
 if ( ! defined('ABSPATH')) {
 	exit;
@@ -109,4 +110,15 @@ public function toJson(): string
 							   ]
 						   ]);
 	}
+
+
+	/**
+	 * Convert this exception to a WP_Error object that can be passed through the WordPress API.
+	 *
+	 * @return WP_Error
+	 */
+	public function toWpError(): WP_Error
+	{
+		return new WP_Error($this->getCode(), $this->getMessage());
+	}
 }
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index a6f0c24b..5b4776da 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -76,6 +76,19 @@ public static function dateTimeNowPlus1Y(): DateTimeImmutable
 		return self::$_dateTimeNowPlus1Y;
 	}
 
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public static function dateTimeNowPlus90D(): DateTimeImmutable
+	{
+		if (self::$_dateTimeNowPlus90D === null) {
+			$someDays                  = new DateInterval('P90D');
+			self::$_dateTimeNowPlus90D = self::dateTimeNow()->add($someDays);
+		}
+
+		return self::$_dateTimeNowPlus90D;
+	}
+
 	/**
 	 * @return DateTimeImmutable
 	 */
@@ -118,6 +131,7 @@ public static function utcTimeZone(): DateTimeZone
 	private static ?DateTimeImmutable $_dateTimeNow = null;
 	private static ?DateTimeImmutable $_dateTimeTodayAtMidnight = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1Y = null;
+	private static ?DateTimeImmutable $_dateTimeNowPlus90D = null;
 	private static ?DateTimeImmutable $_dateTimeNowPlus1D = null;
 	private static ?DateTimeImmutable $_dateTimeNowMinus1D = null;
 	private static ?DateTimeZone $_utcTimeZone = null;
diff --git a/src/TouchPoint-WP/Utilities/Cleanup.php b/src/TouchPoint-WP/Utilities/Cleanup.php
index 3ad5b91b..2d522887 100644
--- a/src/TouchPoint-WP/Utilities/Cleanup.php
+++ b/src/TouchPoint-WP/Utilities/Cleanup.php
@@ -12,7 +12,7 @@
 use tp\TouchPointWP\Person;
 use tp\TouchPointWP\TouchPointWP;
 use tp\TouchPointWP\TouchPointWP_Exception;
-use tp\TouchPointWP\TouchPointWP_Settings;
+use tp\TouchPointWP\Settings;
 
 if ( ! defined('ABSPATH')) {
 	exit(1);
@@ -84,7 +84,7 @@ public static function api(array $uri): bool
 	 */
 	protected static function cleanMemberTypes(): ?bool
 	{
-		$mtObj       = TouchPointWP_Settings::instance()->get('meta_memberTypes');
+		$mtObj       = Settings::instance()->get('meta_memberTypes');
 		$needsUpdate = false;
 
 		if ($mtObj === false) {
@@ -102,7 +102,7 @@ protected static function cleanMemberTypes(): ?bool
 		}
 
 		if ($needsUpdate) {
-			return TouchPointWP_Settings::instance()->set('meta_memberTypes', json_encode($mtObj));
+			return Settings::instance()->set('meta_memberTypes', json_encode($mtObj));
 		}
 
 		return null;
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 72f10f86..49ea6b2d 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -4,6 +4,7 @@
 import json
 import linecache
 import sys
+import urllib
 
 VERSION = "0.0.95"
 
@@ -1059,7 +1060,7 @@ def get_person_info_for_sync(person_obj):
     offset  = 0
     if inData.has_key('offset'):
         offset = int(inData['offset'])
-    perPage = 10000000000
+    perPage = 1000000
     if inData.has_key('perPage'):
         perPage = int(inData['perPage'])
 
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 9e46d491..c23013c1 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace tp\TouchPointWP;
 
-/** @var TouchPointWP_Settings $this */
+/** @var Settings $this */
 
 $divs = json_encode($this->parent->getDivisions());
 $kws = json_encode($this->parent->getKeywords());
diff --git a/src/templates/admin/locationsKoForm.php b/src/templates/admin/locationsKoForm.php
index b6ddc5f1..da355d39 100644
--- a/src/templates/admin/locationsKoForm.php
+++ b/src/templates/admin/locationsKoForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace tp\TouchPointWP;
 
-/** @var TouchPointWP_Settings $this */
+/** @var Settings $this */
 
 ?>
 <form>
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index b7118ca1..bdbd82c4 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -44,7 +44,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Exception.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_WPError.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP.php";
-	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP_Settings.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Settings.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Api.php";
 
 	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/api.php";

From fd66a96c4dcbd024558f56067ac724816e2e702c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 7 Apr 2025 16:57:59 -0400
Subject: [PATCH 262/423] Reworking Auth to use Token-Based flow. Progress on
 #210.  Functionally completes #211.

---
 src/TouchPoint-WP/Api.php                   | 192 ++++++++++-
 src/TouchPoint-WP/Auth.php                  | 334 +++++---------------
 src/TouchPoint-WP/Person.php                |  80 ++---
 src/TouchPoint-WP/Settings.php              |   1 +
 src/TouchPoint-WP/TouchPointWP.php          |   4 +-
 src/TouchPoint-WP/Utilities/PersonQuery.php |   2 +-
 src/TouchPoint-WP/Utilities/Session.php     |   6 +
 src/python/WebApi.py                        |  72 +----
 touchpoint-wp.php                           |   1 +
 9 files changed, 333 insertions(+), 359 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 659e3297..da02cfed 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -133,11 +133,13 @@ public function pyGet(string $command, ?array $parameters = null, int $timeout =
 			]
 		);
 
-		return self::parseApiResponse($r);
+		return self::parsePyApiResponse($r);
 	}
 
 
 	/**
+	 * Do a POST to the Python-Defined API.
+	 *
 	 * @param string $command The thing to post
 	 * @param ?mixed $data Data to post
 	 * @param int    $timeout Amount of time in sec to wait before timing out.
@@ -163,7 +165,6 @@ public function pyPost(string $command, mixed $data = null, int $timeout = 5, fl
 		$url = $host . "/PythonApi/" . $this->settings()->api_script_name . "?" . http_build_query(['a' => $command]);
 
 		self::$apiCallLog[] = $url;
-
 		$tik = microtime(true);
 
 		$r = $this->getHttpClient()->request(
@@ -180,7 +181,183 @@ public function pyPost(string $command, mixed $data = null, int $timeout = 5, fl
 
 		$timeTaken = microtime(true) - $tik;
 
-		return self::parseApiResponse($r);
+		return self::parsePyApiResponse($r);
+	}
+
+
+	/**
+	 * Do a GET to the standard API using a PAB.
+	 *
+	 * @param string $command The API endpoint to call
+	 * @param array  $headers Headers to send with the request.
+	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
+	 * @param int    $timeout Amount of time in sec to wait before timing out.
+	 * @param float  $timeTaken The time taken to complete the request.
+	 *
+	 * @return array|WP_Error The response from the Http request call.
+	 * @throws TouchPointWP_Exception  If anything went wrong.
+	 */
+	public function get(string $command, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	{
+		if (!is_array($headers)) {
+			$headers = (array)$headers;
+		}
+
+		$this->checkApiValidity();
+		$host = $this->parent->host();
+		$url = $host . $command;
+
+		self::$apiCallLog[] = $url;
+		$tik = microtime(true);
+
+		$headers['Authorization'] = 'PAT ' . $this->getPAT();
+
+		if (!isset($headers['Content-Type'])) {
+			$headers['Content-Type'] = 'text/plain';
+		}
+
+		if ($onBehalfPid) {
+			$headers['X-On-Behalf-Of'] = $onBehalfPid;
+		}
+
+		$r = $this->getHttpClient()->request(
+			$url,
+			[
+				'method'  => 'GET',
+				'headers' => $headers,
+				'timeout' => $timeout
+			]
+		);
+
+		$timeTaken = microtime(true) - $tik;
+
+		return $r;
+	}
+
+
+	/**
+	 * Do a POST to the standard API using a PAB.
+	 *
+	 * @param string $command The API endpoint to call
+	 * @param ?mixed $data Data to post
+	 * @param array  $headers Headers to send with the request.
+	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
+	 * @param int    $timeout Amount of time in sec to wait before timing out.
+	 * @param float  $timeTaken The time taken to complete the request.
+	 *
+	 * @return array|WP_Error The response from the Http request call.
+	 * @throws TouchPointWP_Exception  If anything went wrong.
+	 */
+	public function post(string $command, mixed $data = null, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	{
+		if (!is_array($headers)) {
+			$headers = (array)$headers;
+		}
+
+		$this->checkApiValidity();
+		$host = $this->parent->host();
+		$url = $host . $command;
+
+		self::$apiCallLog[] = $url;
+		$tik = microtime(true);
+
+		$headers['Authorization'] = 'PAT ' . $this->getPAT();
+
+		if (!isset($headers['Content-Type'])) {
+			$headers['Content-Type'] = 'text/plain';
+		}
+
+		if ($onBehalfPid) {
+			$headers['X-On-Behalf-Of'] = $onBehalfPid;
+		}
+
+		$r = $this->getHttpClient()->request(
+			$url,
+			[
+				'method'  => 'POST',
+				'headers' => $headers,
+				'body'    => $data,
+				'timeout' => $timeout
+			]
+		);
+
+		$timeTaken = microtime(true) - $tik;
+
+		return $r;
+	}
+
+
+	/**
+	 * Gets the PAT token to use.  Generates one if it doesn't exist.
+	 *
+	 * @throws TouchPointWP_Exception
+	 */
+	protected final function getPAT(): string
+	{
+		if (!$this->settings()->hasValidApiSettings()) {
+			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
+		}
+
+		if (!$this->settings()->api_pat) {
+			$this->cyclePAT();
+		}
+
+		return $this->settings()->api_pat;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws TouchPointWP_Exception
+	 * @throws TouchPointWP_WPError
+	 */
+	protected final function cyclePAT(): void
+	{
+//		$this->invalidatePAT(); TODO this.
+		$this->getNewPAT();
+	}
+
+
+	/**
+	 * @throws TouchPointWP_Exception
+	 * @throws TouchPointWP_WPError
+	 */
+	private function getNewPAT(): void
+	{
+		$host = $this->parent->host();
+
+		if ( ! $host) {
+			throw new TouchPointWP_Exception(__("Host appears to be missing from TouchPoint-WP configuration.", "TouchPoint-WP"), 170002);
+		}
+
+		$url = $host . "/api/v1/Account/CreateUserAccessToken";
+
+		self::$apiCallLog[] = $url;
+
+		$r = $this->getHttpClient()->request(
+			$url,
+			[
+				'method'  => 'POST',
+				'headers' => [
+					'Authorization' => 'Basic ' . base64_encode($this->settings()->api_user . ':' . $this->settings()->api_pass),
+					'Content-Type'  => 'plain/text'
+				],
+				'body'    => Utilities::dateTimeNowPlus90D()->format("Y-m-d\TH:i:s"),
+			]
+		);
+
+		if ($r instanceof WP_Error) {
+			throw new TouchPointWP_WPError($r);
+		}
+
+		if ($r['response']['code'] !== 200) {
+			throw new TouchPointWP_Exception("Error Creating PAT: " . $r['response']['code'], 179005);
+		}
+
+		$response = json_decode($r['body']);
+
+		update_option('tp_api_pat', $response->personalAccessToken);
+		update_option('tp_api_pat_expires', $response->expirationDate);
 	}
 
 
@@ -226,13 +403,13 @@ protected function checkApiValidity(): void
 
 
 	/**
-	 * @param $response
+	 * @param WP_Error|array $response
 	 *
 	 * @return stdClass|array
 	 * @throws TouchPointWP_Exception
 	 * @throws TouchPointWP_WPError
 	 */
-	private static function parseApiResponse($response): array|stdClass
+	private static function parsePyApiResponse(WP_Error|array $response): array|stdClass
 	{
 		if ($response instanceof WP_Error) {
 			throw new TouchPointWP_WPError($response);
@@ -269,10 +446,7 @@ private static function parseApiResponse($response): array|stdClass
 			if (in_array("updateScripts", $respDecoded->data->a ?? [])) {
 				if (class_exists("TouchPointWP_AdminAPI")) {
 					TouchPointWP_AdminAPI::showError(
-						__(
-							"The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.",
-							"TouchPoint-WP"
-						)
+						__("The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.", "TouchPoint-WP")
 					);
 				}
 			} else {
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 50bfd5c9..efadfe34 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -24,20 +24,15 @@
  */
 abstract class Auth implements api, module
 {
-	/** @const Number of seconds during which the user login tokens are valid. */
-	protected const LOGIN_TIMEOUT_STANDARD = 30;
+	/** @noinspection SpellCheckingInspection */
+	protected const LOGIN_PARAMETER = 'tptoken';
 
-	/** @const How long until an API key needs to be replaced. */
-	protected const API_KEY_TIMEOUT = 86400;
-
-	/** @const number of seconds during which the login link is valid (amount of time before the login page (silently) expires). */
-	protected const SESSION_TIMEOUT = 600;
 	private static bool $_isLoaded = false;
 
 	public static function init(): void
 	{
 		// Start the session
-		add_action('login_init', [self::class, 'startSession'], 10);
+//		add_action('login_init', [self::class, 'startSession'], 10);  TODO remove
 
 		// The authentication filter
 		add_filter('authenticate', [self::class, 'authenticate'], 1, 3);
@@ -61,6 +56,7 @@ public static function init(): void
 		add_action('after_setup_theme', [self::class, 'removeAdminBarMaybe']);
 	}
 
+
 	/**
 	 * Loads the module and initializes the other actions.
 	 *
@@ -84,32 +80,17 @@ public static function load(): bool
 		/// Syncing ///
 		///////////////
 
-		if (is_admin()) {
-			try {
-				self::createApiKeyIfNeeded();
-			} catch (TouchPointWP_Exception) {
-			}
-		}
-
 		return true;
 	}
 
-	/**
-	 * Starts a new session.
-	 */
-	public static function startSession()
-	{
-		Session::startSession();
-	}
 
 	/**
 	 * Clear variables and potentially create a flag for the logout of TouchPoint.
 	 *
 	 * Does NOT actually log out of WordPress as this should be called by wp_logout, which accomplishes that.
 	 */
-	public static function logout()
+	public static function logout(): void
 	{
-		Session::sessionDestroy();
 		$tpwp = TouchPointWP::instance();
 		if ($tpwp->settings->auth_full_logout === "on") {
 			$redir = $tpwp->host() . '/PyScript/' . $tpwp->settings->api_script_name . '?' . http_build_query([
@@ -117,23 +98,27 @@ public static function logout()
 				'a' => "logout"
 			]);
 
-			wp_redirect($redir, 307);
+			wp_redirect($redir, Http::SEE_OTHER_TEMP);
 			exit;
 		}
 	}
 
+
 	/**
 	 * Placeholder for automatic login.
+	 *
+	 * TODO: this
 	 */
 	public static function footer()
 	{
 		// echo to print in footer
 	}
 
+
 	/**
 	 * Renders the link used to log in through TouchPoint.
 	 */
-	public static function printLoginLink()
+	public static function printLoginLink(): void
 	{
 		$html = '<p class="touchpoint-wp-auth-form">';
 		$url = self::getLoginUrl();
@@ -141,13 +126,14 @@ public static function printLoginLink()
 		$html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
 		$html .= sprintf(
 			// translators: %s is "what you call TouchPoint at your church", which is a setting
-			__('Sign in with your %s account', 'TouchPoint-WP'),
+			__('Sign in with %s', 'TouchPoint-WP'),
 			htmlentities(TouchPointWP::instance()->settings->system_name)
 		);
 		$html .= '</a></p>';
 		echo $html;
 	}
 
+
 	/**
 	 * Generates the URL used to initiate a sign-in with TouchPoint.
 	 *
@@ -156,16 +142,6 @@ public static function printLoginLink()
 	 */
 	public static function getLoginUrl(): string
 	{
-		try {
-			self::createApiKeyIfNeeded();
-		} catch (TouchPointWP_Exception) {
-		}
-
-		$antiforgeryId = self::generateAntiForgeryId();
-
-		$s                    = Session::instance();
-		$s->auth_sessionToken = $antiforgeryId;
-
 		$tpwp = TouchPointWP::instance();
 
 		$redirectTo = $_GET['redirect_to'] ?? get_site_url();
@@ -173,97 +149,16 @@ public static function getLoginUrl(): string
 		return $tpwp->host() . '/PyScript/' . $tpwp->settings->api_script_name . '?' . http_build_query(
 				[
 					'r'      => $redirectTo,
-					'sToken' => $antiforgeryId,
 					'a'      => "login"
 				]
 			);
 	}
 
-	/**
-	 * Get a random string with a timestamp on the end.
-	 *
-	 * @return string
-	 */
-	public static function generateAntiForgeryId(): string
-	{
-		return strtolower(substr(Utilities::createGuid(), 0, 36) . "-" . dechex(time()));
-	}
-
-	/**
-	 * @param ?string $key The api key to test against.  If no key is provided, validates the saved key.
-	 * @param ?string $host The http hostname to use for this key. Will use $_SERVER['HTTP_HOST'] if no value is
-	 *     provided.
-	 *
-	 * @return string|bool
-	 * Returns true if the key is valid.
-	 * Returns false is the key is invalid.
-	 * Returns a new key if the provided key is valid, but expired. (Does not send it to the server -- that needs to be
-	 *     handled separately.)
-	 */
-	public static function validateApiKey(string $key = null, string $host = null)
-	{
-		if ($host === null) {
-			$host = $_SERVER['HTTP_HOST'];
-		}
-
-		$host = str_replace('.', '_', $host);
-		$tpwp = TouchPointWP::instance();
-
-		$k = $tpwp->settings->get('api_key_' . $host);
-		if ($k === false) {
-			return self::replaceApiKey($host);
-		}
-
-		if ($key !== null && $key !== $k) {
-			return false;
-		}
-
-		if ( ! self::AntiForgeryTimestampIsValid($k, self::API_KEY_TIMEOUT)) {
-			return self::replaceApiKey($host);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Generates a key and saves it.
-	 *
-	 * @param $host
-	 *
-	 * @return string
-	 */
-	public static function replaceApiKey($host): string
-	{
-		$tpwp = TouchPointWP::instance();
-		$host = str_replace('.', '_', $host);
-
-		$key = Auth::generateAntiForgeryId();
-		$tpwp->settings->set('api_key_' . $host, $key);
-
-		return $key;
-	}
-
-	/**
-	 * @return void
-	 * @throws TouchPointWP_Exception
-	 */
-	private static function createApiKeyIfNeeded(): void
-	{
-		$host = $_SERVER['HTTP_HOST'];
-		$k    = self::validateApiKey(null, $host); // will return true or a new key.
-
-		if ($k !== true) {  // Only if the saved key is unset or invalid.  (
-			TouchPointWP::instance()->api->pyPost("auth_key_set", [
-				'apiKey' => $k,
-				'host'   => $host
-			]);
-		}
-	}
 
 	/**
 	 * Determines whether to redirect to the TouchPoint login automatically, and does so if appropriate.
 	 */
-	public static function redirectLoginFormMaybe()
+	public static function redirectLoginFormMaybe(): void
 	{
 		$redirect = TouchPointWP::instance()->settings->auth_default === 'on';
 		/**
@@ -278,19 +173,20 @@ public static function redirectLoginFormMaybe()
 		}
 
 		if (self::wantsToLogin() && $redirect && $_SERVER['REQUEST_METHOD'] === "GET") {
-			wp_redirect(self::getLoginUrl(), 307);
+			wp_redirect(self::getLoginUrl(), Http::SEE_OTHER_TEMP);
 			die();
 		}
 	}
 
+
 	/**
 	 * Prevents the admin bar from being displayed for users who can't edit or change anything.
 	 */
-	public static function removeAdminBarMaybe()
+	public static function removeAdminBarMaybe(): void
 	{
 		$removeBar = (TouchPointWP::instance()->settings->auth_prevent_admin_bar === 'on')
-					 && ! is_admin()
-					 && ! current_user_can('edit_posts');
+					 && !is_admin()
+					 && !current_user_can('edit_posts');
 
 		/**
 		 * Allows for hiding the WordPress-provided Admin bar.
@@ -304,6 +200,7 @@ public static function removeAdminBarMaybe()
 		}
 	}
 
+
 	/**
 	 * Checks to determine if the user wants to log in.
 	 *
@@ -315,7 +212,7 @@ private static function wantsToLogin(): bool
 	{
 		$wantsToLogin = false;
 		// redirect back from TouchPoint after a successful login
-		if (isset($_GET['loginToken'])) {
+		if (isset($_GET[self::LOGIN_PARAMETER])) {
 			return false;
 		}
 
@@ -331,6 +228,7 @@ private static function wantsToLogin(): bool
 		return $wantsToLogin;
 	}
 
+
 	/**
 	 * Replace the default WordPress profile link with a link to the user's TouchPoint profile.
 	 *
@@ -352,6 +250,7 @@ public static function overwriteProfileUrl(string $url): string
 		return $url;
 	}
 
+
 	/**
 	 * Handle API requests
 	 *
@@ -366,15 +265,6 @@ public static function api(array $uri): bool
 		}
 
 		switch (strtolower($uri['path'][2])) {
-			case "token":
-				if ($_SERVER['REQUEST_METHOD'] !== "POST") {
-					http_response_code(Http::METHOD_NOT_ALLOWED);
-
-					return false;
-				}
-				self::handlePostFromTouchPoint();
-				exit;
-
 			case "login.js":   // Some hosts bypass PHP for js extensions, so this doesn't work.
 			case "login.jsr":
 				wp_redirect(content_url('/plugins/touchpoint-wp/ext/login.js'), Http::SEE_OTHER_TEMP);
@@ -384,162 +274,112 @@ public static function api(array $uri): bool
 		return false;
 	}
 
+
 	/**
 	 * Authenticates the user with TouchPoint
 	 *
-	 * @param WP_User|WP_Error $user A WP_User, if the user has already authenticated.
-	 * @param mixed            $username The username provided during form-based sign in. Not used.
-	 * @param mixed            $password The password provided during form-based sign in. Not used.
+	 * @param WP_Error|WP_User|null $user A WP_User, if the user has already authenticated.
+	 * @param mixed                 $username The username provided during form-based sign in. Not used.
+	 * @param mixed                 $password The password provided during form-based sign in. Not used.
 	 *
-	 * @return WP_User|WP_Error The authenticated WP_User, or a WP_Error if there were errors.  The WP API expects
+	 * @return WP_Error|WP_User|null The authenticated WP_User, or a WP_Error if there were errors.  The WP API expects
 	 *     WP_Error
 	 *
 	 * @noinspection PhpUnusedParameterInspection  We don't use the username or password, but they're in the WP API.
 	 */
-	public static function authenticate($user, $username, $password)
+	public static function authenticate(WP_Error|WP_User|null $user, mixed $username, mixed $password): WP_Error|WP_User|null
 	{
 		// Don't re-authenticate if already authenticated
 		if (is_a($user, 'WP_User')) {
 			return $user;
 		}
 
-		// If 'loginToken' is present, this is the Authorization Response looping back through TouchPoint.
-		if (isset($_GET['loginToken'])) {
+		// If parameter token is present, this is the Authorization Response looping back through TouchPoint.
+		if (isset($_GET[self::LOGIN_PARAMETER])) {
 			// Verify that the login token is valid.
-			if ( ! self::AntiForgeryTimestampIsValid($_GET['loginToken'], self::LOGIN_TIMEOUT_STANDARD)) {
-				return new WP_Error(
-					177002,
-					__('Your login token expired.', 'TouchPoint-WP') . "<br />" . $_GET['loginToken']
-				);
+			$api = TouchPointWP::instance()->api;
+
+			try {
+				$r = $api->post("/api/v1/Account/ValidateOneTimeLogin", data: $_GET[self::LOGIN_PARAMETER]);
+			} catch (TouchPointWP_Exception $e) {
+				return $e->toWpError();
+			}
+
+			if ($r['response']['code'] !== Http::OK) {
+				$e = new TouchPointWP_Exception(__('Your login token is invalid.', 'TouchPoint-WP'), 177003);
+				return $e->toWpError();
 			}
 
-			// Find the user with the loginToken in their meta.
+			// other than peopleId and email addresses, this probably shouldn't really be used.  Run through WebPublicPerson.
+			$userData = json_decode($r['body']);
+
+			if (!isset($userData->peopleId)) {
+				$e = new TouchPointWP_Exception(__('Your login token is invalid.', 'TouchPoint-WP'), 177003);
+				return $e->toWpError();
+			}
+
+			// Find person by TouchPoint People ID, $userData->PeopleId
 			$q = new PersonQuery(
 				[
-					'meta_key'     => TouchPointWP::SETTINGS_PREFIX . 'loginToken',
-					'meta_value'   => $_GET['loginToken'],
+					'meta_key'     => Person::META_PEOPLEID,
+					'meta_value'   => $userData->peopleId,
 					'meta_compare' => '='
 				]
 			);
-			if ($q->get_total() !== 1) {
-				return new WP_Error(
-					177003,
-					__('Your login token is invalid.', 'TouchPoint-WP')
-				);
+			if ($q->get_total() > 0) {
+				$p = $q->get_first_result();
+				$user = $p->toNewWpUser();
+
+				self::incrementUserAuthStat();
+				return $user;
 			}
 
-			$p   = $q->get_results()[0];
-			$lst = $p->loginSessionToken;
+			$pq = TouchPointWP::newQueryObject();
+			$pq['pid'] = [$userData->peopleId];
+			$pq['context'] = 'users';
 
-			// Verify that LST from Meta (from TouchPoint) matches Session.  Prevents login by link sharing.
-			$s = Session::instance();
-			if ( ! $lst === $s->auth_sessionToken) {
-				return new WP_Error([
-										177004,
-										__('Session could not be validated.', 'TouchPoint-WP')
-									]);
+			try {
+				$pData = TouchPointWP::instance()->doPersonQuery($pq)->people;
+			} catch (TouchPointWP_Exception $e) {
+				return $e->toWpError();
 			}
 
-			$p->setLoginTokens(null, null);
-			$s->auth_sessionToken = null;
+			if (count($pData) < 1) {
+				$e = new TouchPointWP_Exception(__('No user account found.', 'TouchPoint-WP'), 177008);
+				return $e->toWpError();
+			}
 
-			$user = $p->toNewWpUser();
+			$allowCreation = TouchPointWP::instance()->settings->auth_auto_provision === 'on';
+			$person        = Person::updatePersonFromApiData($pData[0], $allowCreation);
 
-			try {
-				$stats = Stats::instance();
-				$stats->userAuths += 1;
-				$stats->updateDb();
-			} catch (Exception) {}
-
-			// Preload Ident people for potential use with InformalAuth.  Skip if family is already loaded.
-			if ( ! in_array($p->familyId, $s->primaryFam ?? [])) {
-				Person::ident((object)[
-					'fid' => [$p->familyId]
-				]);
+			if ($person === null) {
+				$e = new TouchPointWP_Exception(
+					'No user account found.  If you\'re a site administrator, consider enabling auto-provisioning.',
+					177007
+				);
+				return $e->toWpError();
+			} else {
+				$user = $person->toNewWpUser();
+				self::incrementUserAuthStat();
 			}
 		}
 
 		return $user;
 	}
 
-	/**
-	 * @param string $afId Anti-forgery ID.
-	 *
-	 * @param int    $timeout
-	 *
-	 * @return bool True if the timestamp hasn't expired yet.
-	 */
-	protected static function AntiForgeryTimestampIsValid(string $afId, int $timeout): bool
-	{
-		$afIdTime = hexdec(substr($afId, 37));
-
-		return ($afIdTime >= time() - $timeout) && $afIdTime <= time();
-	}
 
 	/**
-	 * Handles the data POSTed by TouchPoint at the start of a login transaction
+	 * Increments the user authentication statistics.
 	 *
 	 * @return void
 	 */
-	protected static function handlePostFromTouchPoint()
+	protected static function incrementUserAuthStat(): void
 	{
 		try {
-			// Check that the application secret is valid.
-			$apiKeyValidation = self::validateApiKey(Utilities::getAllHeaders()['X-Api-Key']);
-			if ($apiKeyValidation === false) {
-				throw new TouchPointWP_Exception(
-					'Access denied.  API Key is not valid.',
-					177005
-				);
-			}
-
-			// Get data POSTed by TouchPoint
-			$data = file_get_contents('php://input');
-			$data = json_decode($data);
-
-			// Make sure session token is valid if present.
-			if (isset($data->sToken) && ! self::AntiForgeryTimestampIsValid($data->sToken, self::SESSION_TIMEOUT)) {
-				throw new TouchPointWP_Exception("No Session Exists", 177006);
-			}
-
-			// Get user.  Returns WP_User if one is found or created, false otherwise.
-			$allowCreation = TouchPointWP::instance()->settings->auth_auto_provision === 'on';
-			$person        = Person::updatePersonFromApiData($data->p, $allowCreation);
-
-			if ($person === null) {
-				throw new TouchPointWP_Exception(
-					'No user account found.  If you\'re a site administrator, consider enabling auto-provisioning.',
-					177007
-				);
-			}
-
-			// Generate login token and response.
-			$userLoginToken = self::generateAntiForgeryId();
-			$tpwp           = TouchPointWP::instance();
-
-			/** @noinspection SpellCheckingInspection */
-			$resp = [
-				'status'         => 'success',
-				'userLoginToken' => $userLoginToken,
-				'wpid'           => $person->ID,
-				'wpevk'          => $tpwp->settings->people_ev_wpId
-			];
-
-			if ($apiKeyValidation !== true) {
-				$resp['apiKey'] = $apiKeyValidation;
-			}
-
-			$person->setLoginTokens($data->sToken, $userLoginToken);
-
-			header('Content-Type: application/json');
-			echo json_encode($resp);
-
-			exit(0);
-		} catch (TouchPointWP_Exception $e) {
-			header('Content-Type: application/json');
-			http_response_code(Http::BAD_REQUEST);
-			echo $e->toJson();
-			exit(1);
+			$stats            = Stats::instance();
+			$stats->userAuths += 1;
+			$stats->updateDb();
+		} catch (Exception) {
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index bbebb5e8..a220634c 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -17,7 +17,6 @@
 	require_once "InvolvementMembership.php";
 	require_once "Utilities.php";
 	require_once "Utilities/PersonQuery.php";
-	require_once "Utilities/Session.php";
 }
 
 use Exception;
@@ -29,7 +28,6 @@
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
-use tp\TouchPointWP\Utilities\Session;
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Term;
 use WP_User;
@@ -44,9 +42,6 @@
  * @property ?int          campus_term_id    The Campus term ID
  * @property-read ?WP_Term resCode  The ResCode taxonomy, if present
  * @property ?int          rescode_term_id   The ResCode term ID
- * @property ?string       $loginSessionToken  A token that is saved on the Session variable and used to ensure links
- *	 aren't used between sessions.
- * @property ?string       $loginToken    A token used to validate the user.
  */
 class Person extends WP_User implements api, JsonSerializable, module, updatesViaCron
 {
@@ -116,8 +111,6 @@ class Person extends WP_User implements api, JsonSerializable, module, updatesVi
 	private const FIELDS_FOR_META = [
 		'picture',
 		'familyId',
-		'loginToken',
-		'loginSessionToken',
 		'campus_term_id',
 		'rescode_term_id'
 	];
@@ -1094,21 +1087,6 @@ protected function submitUpdate(): void
 		$this->_userMetaToUpdate = [];
 	}
 
-	/**
-	 * Used for setting or clearing a user's login tokens
-	 *
-	 * @param string|null $session
-	 * @param string|null $login
-	 *
-	 * @return void
-	 */
-	public function setLoginTokens(?string $session, ?string $login): void
-	{
-		$this->loginToken        = $login;
-		$this->loginSessionToken = $session;
-		$this->submitUpdate();
-	}
-
 	/**
 	 * Send WordPress User IDs to WordPress for storage in an extra value
 	 *
@@ -1247,6 +1225,29 @@ public static function enqueueUsersForJsInstantiation(): void
 		self::$_enqueueUsersForJsInstantiation = true;
 	}
 
+
+	/**
+	 * TODO there has to be a better way to do this.
+	 *
+	 * @return Person[]
+	 */
+	protected static function getPeopleFromTransient(): array
+	{
+		$loggedInUser = TouchPointWP::currentUserPerson();
+
+		if ($loggedInUser === null) {
+			return [];
+		}
+
+		$peopleTransient = get_transient("tp_person_ident_" . $loggedInUser->peopleId);
+		if (!$peopleTransient || !isset($peopleTransient->people)) {
+			return [];
+		}
+
+		return $peopleTransient->people;
+	}
+
+
 	/**
 	 * Return the instances to be used for instantiation.
 	 *
@@ -1261,8 +1262,7 @@ protected static function getQueueForJsInstantiation(): array
 		}
 
 		if (self::$_enqueueUsersForJsInstantiation) {
-			$s    = Session::instance();
-			$list = array_merge($list, $s->people ?? []);
+			$list = array_merge($list, self::getPeopleFromTransient());
 		}
 
 		// Remove duplicates.  (array_unique won't handle objects cleanly)
@@ -1306,12 +1306,13 @@ public static function getJsInstantiationString(): string
 		$out = "\ttpvm.addOrTriggerEventListener('Person_class_loaded', function() {\n";
 		$out .= "\t\tTP_Person.fromObjArray($listStr);\n";
 
-		if (self::$_enqueueUsersForJsInstantiation) {
-			$s     = Session::instance();
-			$pFids = json_encode($s->primaryFam ?? []);
-			$sFids = json_encode($s->secondaryFam ?? []);
-			$out   .= "\t\tTP_Person.identByFamily($pFids, $sFids);\n";
-		}
+// TODO restore, better.
+//		if (self::$_enqueueUsersForJsInstantiation) {
+//			$s     = Session::instance();
+//			$pFids = json_encode($s->primaryFam ?? []);
+//			$sFids = json_encode($s->secondaryFam ?? []);
+//			$out   .= "\t\tTP_Person.identByFamily($pFids, $sFids);\n";
+//		}
 
 		$out .= "\t});\n";
 
@@ -1607,7 +1608,7 @@ private static function ajaxIdent(): void
 	}
 
 	/**
-	 * Make the API call to get family members, store the results to the Session, and return them.
+	 * Make the API call to get family members and return them.
 	 *
 	 * This is used for both formal and informal auth.  Email addresses should be checked for spam likelihood before this point.
 	 *
@@ -1630,8 +1631,6 @@ public static function ident($inputData): array
 
 		$data->primaryFam = $data->primaryFam ?? [];
 
-		$s = Session::instance();
-
 		try {
 			$stats = Stats::instance();
 			$stats->softAuths += count($people);
@@ -1660,10 +1659,17 @@ public static function ident($inputData): array
 		$sPeople   = array_merge($s->people ?? [], $ret);
 		$ids       = array_map(fn($p) => $p->peopleId, $sPeople);
 		$uniqIds   = array_unique($ids);
-		$s->people = array_values(array_intersect_key($sPeople, $uniqIds));
 
-		$s->primaryFam   = $primaryFam;
-		$s->secondaryFam = $secondaryFam;
+		// TODO determine if this is ever actually used or, more importantly, useful.  There has to be a better way to do this.
+		$primaryPerson = $sPeople[0] ?? null;
+		if ($primaryPerson) {
+			$personTransient = (object)[
+				'people'       => array_values(array_intersect_key($sPeople, $uniqIds)),
+				'primaryFam'   => $primaryFam,
+				'secondaryFam' => $secondaryFam
+			];
+			set_transient("tp_person_ident_" . $primaryPerson->peopleId, $personTransient, 60 * 60 * 12);
+		}
 
 		return [
 			'people'     => $ret,
@@ -1673,6 +1679,8 @@ public static function ident($inputData): array
 
 	/**
 	 * Return JSON for a people search, validating that the person has access to those people.
+	 * 
+	 * @deprecated Needs to be rewritten with proper API.
 	 *
 	 * @return void
 	 */
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 2f90eaa5..14832153 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -28,6 +28,7 @@
  * @property-read string       system_name        What the church calls TouchPoint
  * @property-read string       api_user           Username of a user account with API access
  * @property-read string       api_pass           Password for a user account with API access
+ * @property-read string       api_pat            The Personal Access Token used for newer API calls
  * @property-read string       api_script_name    The name of the script loaded into TouchPoint for API Interfacing
  * @property-read string       google_maps_api_key Google Maps API Key for embedded maps
  * @property-read string       google_geo_api_key Google Maps API Key for geocoding
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 31652417..a17d849d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -2458,7 +2458,9 @@ public static function newQueryObject(): array
 			'src'     => [],
 			'meta'    => [],
 			'groupBy' => null,
-			'context' => null
+			'context' => null,
+			'perPage' => 1000000,
+			'offset'  => 0,
 		];
 	}
 
diff --git a/src/TouchPoint-WP/Utilities/PersonQuery.php b/src/TouchPoint-WP/Utilities/PersonQuery.php
index 330f03bd..2a9e2ceb 100644
--- a/src/TouchPoint-WP/Utilities/PersonQuery.php
+++ b/src/TouchPoint-WP/Utilities/PersonQuery.php
@@ -33,7 +33,7 @@ class PersonQuery extends WP_User_Query
 	 */
 	public function __construct($query = null, bool $forceResultToPerson = true)
 	{
-		$this->forceResultToPerson = ! ! $forceResultToPerson;
+		$this->forceResultToPerson = !!$forceResultToPerson;
 
 		if ($this->forceResultToPerson) {
 			$query['fields'] = 'ID'; // Everything else is eventually dealt with via the getter.
diff --git a/src/TouchPoint-WP/Utilities/Session.php b/src/TouchPoint-WP/Utilities/Session.php
index ed757505..a855018e 100644
--- a/src/TouchPoint-WP/Utilities/Session.php
+++ b/src/TouchPoint-WP/Utilities/Session.php
@@ -10,6 +10,8 @@
 /**
  * This class wraps handlers for $_SESSION to make it more easily workable.
  *
+ * @deprecated
+ *
  * @property array   $people
  * @property int[]   $primaryFam
  * @property int[]   $secondaryFam
@@ -31,6 +33,8 @@ private function __construct()
 	/**
 	 * Start a session if one doesn't already exist.
 	 *
+	 * @deprecated
+	 *
 	 * @param array $options Options passed directly to session_start, but only if the session isn't yet active.
 	 *
 	 * @return bool  True if a session has been started (with this call or previously)
@@ -51,6 +55,8 @@ public static function sessionDestroy(): bool
 	}
 
 	/**
+	 * @deprecated
+	 *
 	 * @return Session|null
 	 */
 	public static function instance(): ?Session
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 49ea6b2d..74108547 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -1241,7 +1241,7 @@ def get_person_info_for_sync(person_obj):
         "<iframe id=\"logoutIFrame\" src=\"/Account/LogOff/\" style=\"position:absolute; top:-1000px; left:-10000px; width:2px; height:2px;\" ></iframe>")
     apiCalled = True
 
-if ("login" in Data.a or Data.r != '') and model.HttpMethod == "get":  # r parameter implies desired redir after login.
+elif ("login" in Data.a or Data.r != '') and model.HttpMethod == "get":  # r parameter implies desired redir after login.
     apiCalled = True
     pid = 0
     if hasattr(model, "UserPeopleId"):
@@ -1255,14 +1255,6 @@ def get_person_info_for_sync(person_obj):
                                                                                                             "the church staff") + "</b>.</p>")
 
     else:
-        po = model.GetPerson(pid)
-
-        body = {
-            "p": get_person_info_for_sync(po)
-        }
-
-        response = ""
-
         try:
             # separate method / host / path
             useSsl = True
@@ -1296,61 +1288,11 @@ def get_person_info_for_sync(person_obj):
             [host, path] = r.split('/', 1)
             host = host.lower()
 
-            apiSettingKey = "wp_api_" + host.replace(".", "_")
-            apiKey = model.Setting(apiSettingKey, "")
-
-            headers = {
-                "X-API-KEY": apiKey,
-                "content-type": "application/json"
-            }
-
-            if apiKey == '':
-                model.Title = "Error"
-                model.Header = "Site not authorized"
-
-                print("<p><b>This site is not authorized to use authentication.</b> (Error 177001)</p>")
-
-            else:
-                if Data.sToken is not '':
-                    body["sToken"] = Data.sToken  # Note that this key is absent if no value is available.
-
-                # noinspection HttpUrlsUsage
-                http = "https://" if useSsl else "http://"
-
-                response = model.RestPostJson(http + host + "/touchpoint-api/auth/token", headers, body)
-                response = response.replace('', '').strip()  # deal with inserted whitespaces by some plugins
-
-                model.Title = "Login"
-                model.Header = "Processing..."
-
-                if response == "":
-                    raise Exception("Could not communicate with WordPress server.")
-
-                response = json.loads(response)
-
-                if "error" in response:
-                    if response['error']['code'] == 177006:
-                        print("Your login session has expired.  Try again.")
-                        model.Header = "Session Expired"
-                    else:
-                        raise Exception(response['error']['message'])
-
-                else:
-                    if ("apiKey" in response) and (model.Setting(apiKey, "") != response["apiKey"]):
-                        model.SetSetting(apiSettingKey, response["apiKey"])
-
-                    if ("wpid" in response and "wpevk" in response and
-                            model.ExtraValueInt(pid, response["wpevk"]) != response["wpid"]):
-                        model.AddExtraValueInt(pid, response["wpevk"], response["wpid"])
-
-                    loginPathSettingKey = "wp_loginPath_" + host.replace(".", "_")
-                    loginPath = model.Setting(loginPathSettingKey, "/wp-login.php")
-                    redir = http + host + loginPath + '?loginToken=' + response["userLoginToken"]
-
-                    if path is not '':
-                        redir += "&redirect_to=" + path
-
-                    print("REDIRECT=" + redir)
+            # noinspection PyUnresolvedReferences
+            redir = urllib.urlencode({'redirect_to': path})
+            # noinspection HttpUrlsUsage
+            redir = ("https://" if useSsl else "http://") + host + "/wp-login.php?tptoken={token}&" + redir
+            print("REDIRECT=" + "/api/v1/Account/RedirectWithCredentials?destination=" + redir)
 
         except Exception as e:
             model.Title = "Error"
@@ -1358,7 +1300,7 @@ def get_person_info_for_sync(person_obj):
 
             print("<p>Please email the following error message to <b>" +
                   model.Setting("AdminMail", "the church staff") + "</b>.</p><pre>")
-            print(response)
+            # print(response)  TODO
             print_exception()
             print("</pre>")
 
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index bdbd82c4..b34c9b0b 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -57,6 +57,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Translation.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/StringableArray.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Session.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateFormats.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateTimeExtended.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";

From 8c3bee2e86ae30fa2df560b002c47ce452aa401f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 8 Apr 2025 19:25:53 -0400
Subject: [PATCH 263/423] Resolve a bunch of todos and remove duplicate code.
 Also resolves an issue with the sync agent becoming the active user in some
 situations. Closes #210. Closes #211.  Closes #203.

---
 docs                               |   2 +-
 src/TouchPoint-WP/Api.php          | 125 ++++++++++++++++++++++-------
 src/TouchPoint-WP/Auth.php         |   6 +-
 src/TouchPoint-WP/Person.php       |   8 +-
 src/TouchPoint-WP/Settings.php     |  29 ++++++-
 src/TouchPoint-WP/TouchPointWP.php |  23 ++++++
 6 files changed, 155 insertions(+), 38 deletions(-)

diff --git a/docs b/docs
index 652a683d..3346e39a 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 652a683d7870a7623f1d0bad5a07a5d15caef5f9
+Subproject commit 3346e39a85f9a7db0426c55790d6bfe11bc9b19e
diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index da02cfed..7e7e4c3a 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -186,18 +186,16 @@ public function pyPost(string $command, mixed $data = null, int $timeout = 5, fl
 
 
 	/**
-	 * Do a GET to the standard API using a PAB.
+	 * Prepares the request to be sent to the API.  Handles common elements between all PAT requests.
 	 *
 	 * @param string $command The API endpoint to call
-	 * @param array  $headers Headers to send with the request.
+	 * @param mixed  $headers Headers to send with the request.
 	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
-	 * @param int    $timeout Amount of time in sec to wait before timing out.
-	 * @param float  $timeTaken The time taken to complete the request.
 	 *
-	 * @return array|WP_Error The response from the Http request call.
-	 * @throws TouchPointWP_Exception  If anything went wrong.
+	 * @return string The URL to call.
+	 * @throws TouchPointWP_Exception
 	 */
-	public function get(string $command, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	protected function prepareRequest(string $command, mixed &$headers, ?int $onBehalfPid): string
 	{
 		if (!is_array($headers)) {
 			$headers = (array)$headers;
@@ -208,7 +206,6 @@ public function get(string $command, array $headers = [], ?int $onBehalfPid = nu
 		$url = $host . $command;
 
 		self::$apiCallLog[] = $url;
-		$tik = microtime(true);
 
 		$headers['Authorization'] = 'PAT ' . $this->getPAT();
 
@@ -220,6 +217,27 @@ public function get(string $command, array $headers = [], ?int $onBehalfPid = nu
 			$headers['X-On-Behalf-Of'] = $onBehalfPid;
 		}
 
+		return $url;
+	}
+
+
+	/**
+	 * Do a GET to the standard API using a PAB.
+	 *
+	 * @param string $command The API endpoint to call
+	 * @param array  $headers Headers to send with the request.
+	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
+	 * @param int    $timeout Amount of time in sec to wait before timing out.
+	 * @param float  $timeTaken The time taken to complete the request.
+	 *
+	 * @return array|WP_Error The response from the Http request call.
+	 * @throws TouchPointWP_Exception  If anything went wrong.
+	 */
+	public function get(string $command, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	{
+		$tik = microtime(true);
+
+		$url = $this->prepareRequest($command,$headers,$onBehalfPid);
 		$r = $this->getHttpClient()->request(
 			$url,
 			[
@@ -250,26 +268,9 @@ public function get(string $command, array $headers = [], ?int $onBehalfPid = nu
 	 */
 	public function post(string $command, mixed $data = null, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
 	{
-		if (!is_array($headers)) {
-			$headers = (array)$headers;
-		}
-
-		$this->checkApiValidity();
-		$host = $this->parent->host();
-		$url = $host . $command;
-
-		self::$apiCallLog[] = $url;
 		$tik = microtime(true);
 
-		$headers['Authorization'] = 'PAT ' . $this->getPAT();
-
-		if (!isset($headers['Content-Type'])) {
-			$headers['Content-Type'] = 'text/plain';
-		}
-
-		if ($onBehalfPid) {
-			$headers['X-On-Behalf-Of'] = $onBehalfPid;
-		}
+		$url = $this->prepareRequest($command,$headers,$onBehalfPid);
 
 		$r = $this->getHttpClient()->request(
 			$url,
@@ -287,6 +288,28 @@ public function post(string $command, mixed $data = null, array $headers = [], ?
 	}
 
 
+	/**
+	 * Determine if PAT has not yet expired.
+	 *
+	 * @return bool
+	 */
+	protected function checkPATValidity(): bool
+	{
+		$expires = $this->settings()->api_pat_expires;
+
+		if ($expires) {
+			$expires = strtotime($expires) - (60 * 60 * 24); // 1 day buffer
+			$now = time();
+
+			if ($now > $expires) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+
 	/**
 	 * Gets the PAT token to use.  Generates one if it doesn't exist.
 	 *
@@ -301,24 +324,68 @@ protected final function getPAT(): string
 		if (!$this->settings()->api_pat) {
 			$this->cyclePAT();
 		}
+		
+		if (!$this->checkPATValidity()) {
+			$this->cyclePAT();
+		}
 
 		return $this->settings()->api_pat;
 	}
 
 
 	/**
+	 * Invalidate the existing PAT and get a new one.
+	 *
 	 * @return void
 	 * @throws TouchPointWP_Exception
 	 * @throws TouchPointWP_WPError
 	 */
 	protected final function cyclePAT(): void
 	{
-//		$this->invalidatePAT(); TODO this.
+		$this->invalidatePAT();
 		$this->getNewPAT();
 	}
 
 
 	/**
+	 * Invalidate the existing PAT, both here and on the server.
+	 *
+	 * @return void
+	 */
+	public final function invalidatePAT(): void
+	{
+		// get existing PAT
+		$pat = $this->settings()->api_pat;
+		$host = $this->parent->host();
+
+		// if existing PAT exists, send delete request to invalidate it on the server
+		if ($pat && $host) {
+			$url = $host . "/api/v1/Account/DeleteUserAccessToken";
+			$this->getHttpClient()->request(
+				$url,
+				[
+					'method' => 'POST',
+					'headers' => [
+						'Authorization' => 'Basic ' . base64_encode(
+								$this->settings()->api_user . ':' . $this->settings()->api_pass
+							),
+						'Content-Type'  => 'text/plain'
+					],
+					'body' => $pat,
+					'blocking' => false
+				]
+			);
+		}
+
+		// remove it and the expiration date from the local settings
+		update_option('tp_api_pat', null);
+		update_option('tp_api_pat_expires', null);
+	}
+
+
+	/**
+	 * Get a new PAT
+	 *
 	 * @throws TouchPointWP_Exception
 	 * @throws TouchPointWP_WPError
 	 */
@@ -340,7 +407,7 @@ private function getNewPAT(): void
 				'method'  => 'POST',
 				'headers' => [
 					'Authorization' => 'Basic ' . base64_encode($this->settings()->api_user . ':' . $this->settings()->api_pass),
-					'Content-Type'  => 'plain/text'
+					'Content-Type'  => 'text/plain'
 				],
 				'body'    => Utilities::dateTimeNowPlus90D()->format("Y-m-d\TH:i:s"),
 			]
@@ -357,7 +424,7 @@ private function getNewPAT(): void
 		$response = json_decode($r['body']);
 
 		update_option('tp_api_pat', $response->personalAccessToken);
-		update_option('tp_api_pat_expires', $response->expirationDate);
+		update_option('tp_api_pat_expires', $response->expirationDate ?? null);
 	}
 
 
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index efadfe34..53a41941 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -86,11 +86,11 @@ public static function load(): bool
 
 	/**
 	 * Clear variables and potentially create a flag for the logout of TouchPoint.
-	 *
-	 * Does NOT actually log out of WordPress as this should be called by wp_logout, which accomplishes that.
 	 */
 	public static function logout(): void
 	{
+		wp_set_current_user(0);
+
 		$tpwp = TouchPointWP::instance();
 		if ($tpwp->settings->auth_full_logout === "on") {
 			$redir = $tpwp->host() . '/PyScript/' . $tpwp->settings->api_script_name . '?' . http_build_query([
@@ -335,7 +335,7 @@ public static function authenticate(WP_Error|WP_User|null $user, mixed $username
 			}
 
 			$pq = TouchPointWP::newQueryObject();
-			$pq['pid'] = [$userData->peopleId];
+			$pq['pid'] = [(string)($userData->peopleId)];
 			$pq['context'] = 'users';
 
 			try {
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index a220634c..8cbc1f88 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -660,10 +660,10 @@ public static function updateCron(): void
 	 *
 	 * @param bool $verbose Whether to print debugging info.
 	 *
-	 * @return false|int False on failure, or the number of partner posts that were updated or deleted.
+	 * @return false|int False on failure, or the number of people that were updated or deleted.
 	 * @throws TouchPointWP_Exception
 	 */
-	protected static function updateFromTouchPoint(bool $verbose = false)
+	protected static function updateFromTouchPoint(bool $verbose = false): bool|int
 	{
 		global $wpdb;
 
@@ -764,8 +764,10 @@ protected static function updateFromTouchPoint(bool $verbose = false)
 		self::$_indexingQueries['meta']['pev'] = TouchPointWP::instance()->getPersonEvFields($pevFieldIds);
 		self::$_indexingQueries['context']     = 'peopleLists';
 
+		$timeout = min((count(self::$_indexingQueries['pid']) / 4) + 10, 50);
+
 		// Submit to API
-		$people = TouchPointWP::instance()->doPersonQuery(self::$_indexingQueries, $verbose, 50);
+		$people = TouchPointWP::instance()->doPersonQuery(self::$_indexingQueries, $verbose, $timeout);
 
 		set_time_limit(count($people->people) * 5 + 10); // a very generous time limit.
 
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 14832153..6188e46e 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -29,6 +29,7 @@
  * @property-read string       api_user           Username of a user account with API access
  * @property-read string       api_pass           Password for a user account with API access
  * @property-read string       api_pat            The Personal Access Token used for newer API calls
+ * @property-read string       api_pat_expires    The date/time when the PAT is expected to expire.
  * @property-read string       api_script_name    The name of the script loaded into TouchPoint for API Interfacing
  * @property-read string       google_maps_api_key Google Maps API Key for embedded maps
  * @property-read string       google_geo_api_key Google Maps API Key for geocoding
@@ -356,7 +357,10 @@ private function settingsFields(bool|string $includeDetail = false): array
 					'default'     => '',
 					'autoload'    => true,
 					'placeholder' => 'mychurch.tpsdb.com',
-					'callback'    => [$this, 'validation_lowercase']
+					'callback'    => function ($new) {
+						$new = $this->validation_lowercase($new);
+						return $this->validation_invalidatePATIfChanged($new, "host");
+					}
 				],
 				[
 					'id'          => 'host_deeplink',
@@ -381,6 +385,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 					'default'     => '',
 					'autoload'    => true,
 					'placeholder' => '',
+					'callback'    => fn($new) => $this->validation_invalidatePATIfChanged($new, 'api_user')
 				],
 				[
 					'id'          => 'api_pass',
@@ -393,7 +398,10 @@ private function settingsFields(bool|string $includeDetail = false): array
 					'default'     => '',
 					'autoload'    => true,
 					'placeholder' => $this->passwordPlaceholder('api_pass'),
-					'callback'    => fn($new) => $this->validation_secret($new, 'api_pass')
+					'callback'    => function($new) {
+						$new = $this->validation_secret($new, 'api_pass');
+						return $this->validation_invalidatePATIfChanged($new, 'api_pass');
+					}
 				],
 				[
 					'id'          => 'api_script_name',
@@ -1905,6 +1913,23 @@ protected function validation_updateScriptsIfChanged(mixed $new, string $field):
 		return $new;
 	}
 
+	/**
+	 * If a setting is changed that impacts the PATs, invalidate the existing PAT.
+	 *
+	 * @param mixed  $new the new value, which could be anything
+	 * @param string $field The name of the field that's getting updated
+	 *
+	 * @return mixed lower-case string
+	 */
+	protected function validation_invalidatePATIfChanged(mixed $new, string $field): mixed
+	{
+		if ($new !== $this->$field) {
+			TouchPointWP::instance()->api->invalidatePAT();
+		}
+
+		return $new;
+	}
+
 	/**
 	 * Cloning is forbidden.
 	 *
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index a17d849d..b01118a0 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -411,6 +411,8 @@ public static function TouchPointIcon(): string
 	 */
 	public function parseRequest($continue, $wp, $extraVars): bool
 	{
+		$this->logOutTpWpUser();
+
 		if ($continue) {
 			$reqUri         = parse_url(trim($_SERVER['REQUEST_URI'], '/'));
 			$reqUri['path'] = $reqUri['path'] ?? "";
@@ -826,6 +828,13 @@ public static function init(): void
 		if (self::$_hasBeenInited)
 			return;
 
+		// If log in/out is happening, cron can make bad things happen.
+		$uri = $_SERVER['REQUEST_URI'] ?? '';
+		if (!defined('DISABLE_WP_CRON') &&
+		    (str_contains($uri, 'login') || str_contains($uri, 'logout'))) {
+			define('DISABLE_WP_CRON', true);
+		}
+
 		self::instance()->loadLocalizations();
 
 		Taxonomies::registerTaxonomies(self::instance());
@@ -2506,6 +2515,20 @@ public function validateThatTpWpUserExists(): bool
 	protected ?WP_User $priorUser = null;
 
 
+	/**
+	 * If the TPWP user is logged in, log them out.  This is useful for testing.  This user should never be used
+	 * interactively.
+	 *
+	 * @return void
+	 */
+	public function logOutTpWpUser(): void
+	{
+		if (self::TPWP_USER === wp_get_current_user()?->user_login) {
+			set_current_user(0);
+		}
+	}
+
+
 	/**
 	 * Make the TPWP user the active one, so permissions are not dependent on whoever happens to be running things
 	 * at the moment.

From 195d48fc9a34a2c109f0c5285ad9f2521bdc59b0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 8 Apr 2025 19:30:11 -0400
Subject: [PATCH 264/423] Some code inspection adjustments

---
 .idea/inspectionProfiles/Project_Default.xml | 4 +++-
 .idea/watcherTasks.xml                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 2ca38701..fd81ac46 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,7 +3,9 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="PhpMethodOrClassCallIsNotCaseSensitiveInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpOverridingMethodVisibilityInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="limit" value="6" />
+    </inspection_tool>
     <inspection_tool class="PhpUsageOfSilenceOperatorInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="SqlGotoInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SqlMissingColumnAliasesInspection" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index dc821a35..49ba7008 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -61,7 +61,7 @@
       <option name="workingDir" value="$ProjectFileDir$" />
       <envs />
     </TaskOptions>
-    <TaskOptions isEnabled="true">
+    <TaskOptions isEnabled="false">
       <option name="arguments" value="$/FilePathRelativeToProjectRoot$ -o build/$/FileDirRelativeToProjectRoot$/$FileNameWithoutAllExtensions$.min.js --source-map" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />

From e6017a92a7cc60a12f3ccbd422052c9c1e653f91 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 22 Apr 2025 23:43:54 -0400
Subject: [PATCH 265/423] A whole bunch of stuff. Related to: #222, #211, #210,
 #203, #200, #198.

---
 README.md                                    |   9 +-
 composer.json                                |   2 +-
 package.json                                 |   2 +-
 src/TouchPoint-WP/Api.php                    |  74 ++++++---
 src/TouchPoint-WP/Auth.php                   | 101 +++++++++++-
 src/TouchPoint-WP/Involvement.php            |   2 +-
 src/TouchPoint-WP/Meeting.php                |   2 +-
 src/TouchPoint-WP/Partner.php                |   6 +-
 src/TouchPoint-WP/Person.php                 |  11 +-
 src/TouchPoint-WP/PostTypeCapable.php        |   2 +-
 src/TouchPoint-WP/Settings.php               |   2 +-
 src/TouchPoint-WP/Stats.php                  |   2 +-
 src/TouchPoint-WP/TouchPointWP.php           |  85 +++++++---
 src/TouchPoint-WP/TouchPointWP_Exception.php |   4 +-
 src/TouchPoint-WP/Utilities/Http.php         |   2 +
 src/python/WebApi.py                         | 164 ++++++++++---------
 touchpoint-wp.php                            |   4 +-
 17 files changed, 322 insertions(+), 152 deletions(-)

diff --git a/README.md b/README.md
index b2427661..b13e3a64 100644
--- a/README.md
+++ b/README.md
@@ -93,21 +93,20 @@ meetings through the plugin.
 Making this work requires notable configuration of your TouchPoint database.  We've scripted what we can, and the
 remainder is in [the Installation Instructions](https://github.com/TenthPres/TouchPoint-WP/wiki/Installation).
 
-Some features require other plugins, which may have fees attached.
-
 You will need a TouchPoint user account with API-level access. New TouchPoint databases do not have one by default. 
 If your church doesn't have one, open a support ticket with TouchPoint to create one, referencing this plugin.
 
 If you're using the Authentication component, your WordPress site **MUST** use HTTPS with a valid certificate.
 
 We don't promise support for old versions of WordPress or PHP.  You will need to keep both up to date.
+[See currently-supported PHP versions here.](https://www.php.net/supported-versions.php)
 
 ## Multisite Support
 
 At the moment, this plugin won't perform very well in a multisite environment.  We're working on that, though, as we 
-plan on moving our own infrastructure toward multisite soon.  As currently planned, ALL sites in a multisite network 
-will share ONE TouchPoint connection, and many (though not all) of the settings would be shared across the network.  If 
-you're interested in using this plugin in a multisite environment, [please get in touch](mailto:jkurtz@tenth.org). 
+plan on moving our own infrastructure toward multisite eventually.  As currently planned, ALL sites in a multisite 
+network will share ONE TouchPoint connection, and many (though not all) of the settings would be shared across the 
+network.  If you're interested in using this plugin in a multisite environment, [please get in touch](mailto:jkurtz@tenth.org). 
 
 ## Credit & Hat-Tips
 
diff --git a/composer.json b/composer.json
index 2a3e2b96..b0b86438 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/package.json b/package.json
index fef681e5..ddbe5cce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 7e7e4c3a..a2486853 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -3,6 +3,7 @@
 namespace tp\TouchPointWP;
 
 use stdClass;
+use tp\TouchPointWP\Utilities\Http;
 use WP_Error;
 use WP_Http;
 
@@ -237,15 +238,31 @@ public function get(string $command, array $headers = [], ?int $onBehalfPid = nu
 	{
 		$tik = microtime(true);
 
-		$url = $this->prepareRequest($command,$headers,$onBehalfPid);
-		$r = $this->getHttpClient()->request(
-			$url,
-			[
-				'method'  => 'GET',
-				'headers' => $headers,
-				'timeout' => $timeout
-			]
-		);
+		for ($attempt = 0; $attempt < 2; $attempt++) {
+			$url = $this->prepareRequest($command, $headers, $onBehalfPid);
+			$r   = $this->getHttpClient()->request(
+				$url,
+				[
+					'method'  => 'GET',
+					'headers' => $headers,
+					'timeout' => $timeout
+				]
+			);
+
+			if ($r instanceof WP_Error) {
+				return $r;
+			}
+
+			if ($r['response']['code'] === Http::FORBIDDEN) {
+				//if unauthorized, cycle PAT
+				$this->cyclePAT();
+			} elseif ($r['response']['code'] === Http::TOO_MANY_REQUESTS) {
+				self::$allowApiCalls = false;
+				throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+			} elseif ($r['response']['code'] === Http::OK) {
+				break;
+			}
+		}
 
 		$timeTaken = microtime(true) - $tik;
 
@@ -270,17 +287,32 @@ public function post(string $command, mixed $data = null, array $headers = [], ?
 	{
 		$tik = microtime(true);
 
-		$url = $this->prepareRequest($command,$headers,$onBehalfPid);
+		for ($attempt = 0; $attempt < 2; $attempt++) {
+			$url = $this->prepareRequest($command, $headers, $onBehalfPid);
+			$r   = $this->getHttpClient()->request(
+				$url,
+				[
+					'method'  => 'POST',
+					'headers' => $headers,
+					'body'    => $data,
+					'timeout' => $timeout
+				]
+			);
 
-		$r = $this->getHttpClient()->request(
-			$url,
-			[
-				'method'  => 'POST',
-				'headers' => $headers,
-				'body'    => $data,
-				'timeout' => $timeout
-			]
-		);
+			if ($r instanceof WP_Error) {
+				return $r;
+			}
+
+			if ($r['response']['code'] === Http::FORBIDDEN) {
+				//if unauthorized, cycle PAT
+				$this->cyclePAT();
+			} elseif ($r['response']['code'] === Http::TOO_MANY_REQUESTS) {
+				self::$allowApiCalls = false;
+				throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
+			} elseif ($r['response']['code'] === Http::OK) {
+				break;
+			}
+		}
 
 		$timeTaken = microtime(true) - $tik;
 
@@ -418,13 +450,15 @@ private function getNewPAT(): void
 		}
 
 		if ($r['response']['code'] !== 200) {
-			throw new TouchPointWP_Exception("Error Creating PAT: " . $r['response']['code'], 179005);
+			throw new TouchPointWP_Exception("Error Creating PAT: " . $r['response']['code'], 179006);
 		}
 
 		$response = json_decode($r['body']);
 
 		update_option('tp_api_pat', $response->personalAccessToken);
 		update_option('tp_api_pat_expires', $response->expirationDate ?? null);
+
+		error_log("TouchPoint-WP INFO: PAT updated.");
 	}
 
 
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 53a41941..ccc79596 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -52,6 +52,9 @@ public static function init(): void
 		// If configured, bypass the login form and redirect straight to TouchPoint
 		add_action('login_init', [self::class, 'redirectLoginFormMaybe'], 20);
 
+		// If configured, upon login, if no redirect is specified, redirect to the homepage
+		add_filter('login_redirect', [self::class, 'redirectLoginCompleteMaybe'], 10, 3);
+
 		// If configured, prevent admin bar from appearing for subscribers
 		add_action('after_setup_theme', [self::class, 'removeAdminBarMaybe']);
 	}
@@ -72,6 +75,9 @@ public static function load(): bool
 
 		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']);
 
+		// If configured, prevent user from accessing the admin area
+		add_action('admin_init', [self::class, 'preventAdminAccessMaybe']);
+
 		//////////////////
 		/// Shortcodes ///
 		//////////////////
@@ -138,7 +144,6 @@ public static function printLoginLink(): void
 	 * Generates the URL used to initiate a sign-in with TouchPoint.
 	 *
 	 * @return string The authorization URL used for a TouchPoint login.
-	 * @noinspection SpellCheckingInspection
 	 */
 	public static function getLoginUrl(): string
 	{
@@ -174,8 +179,35 @@ public static function redirectLoginFormMaybe(): void
 
 		if (self::wantsToLogin() && $redirect && $_SERVER['REQUEST_METHOD'] === "GET") {
 			wp_redirect(self::getLoginUrl(), Http::SEE_OTHER_TEMP);
-			die();
+			exit();
+		}
+	}
+
+
+	/**
+	 * Determines whether to redirect to allow the user to continue to the destination page after logging in.
+	 */
+	public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $requested_redirect_to = null, WP_User|WP_Error|null $user = null): string
+	{
+		if (!is_a($user, 'WP_User')) {
+			return $redirect_to;
+		}
+
+		$redirect = TouchPointWP::instance()->settings->auth_change_profile_urls === 'on';
+
+		/**
+		 * Controls whether to redirect to the TouchPoint login automatically.
+		 *
+		 * @param bool $redirect Value preset from setting TouchPoint login as default.
+		 */
+		$redirect = apply_filters('tp_redirect_after_login', $redirect);
+
+		// if there is no defined redirect page, redirect to the home page
+		if ($redirect && (!isset($_GET['redirect_to']) || $_GET['redirect_to'] == '')) {
+			return home_url();
 		}
+
+		return $redirect_to;
 	}
 
 
@@ -201,6 +233,44 @@ public static function removeAdminBarMaybe(): void
 	}
 
 
+	/**
+	 * Prevents access to the WordPress admin area for users who can't edit or change anything.
+	 *
+	 * @return void
+	 */
+	public static function preventAdminAccessMaybe(): void
+	{
+		$preventAdmin = (TouchPointWP::instance()->settings->auth_change_profile_urls === 'on')
+					 && is_admin()  // means: request is in the admin area, not that user is an admin.
+					 && !current_user_can('edit_posts');
+
+
+		$destination = null;
+
+		if ($preventAdmin) {
+			// if profile.php, redirect to the profile page
+			if (isset($_SERVER['REQUEST_URI']) && str_contains($_SERVER['REQUEST_URI'], 'profile.php')) {
+				$destination = self::getProfileUrl();
+			} else {
+				// otherwise, redirect to the home page
+				$destination = home_url();
+			}
+		}
+
+		/**
+		 * Allows for preventing access to the WordPress admin area.
+		 *
+		 * @param ?string $destination The url to which the user should be redirected, or null to allow default behavior.
+		 */
+		$destination = apply_filters('tp_admin_area_redirect', $destination);
+
+		if ($destination) {
+			wp_redirect($destination, Http::SEE_OTHER_TEMP);
+			exit;
+		}
+	}
+
+
 	/**
 	 * Checks to determine if the user wants to log in.
 	 *
@@ -240,14 +310,33 @@ public static function overwriteProfileUrl(string $url): string
 	{
 		$tpwp = TouchPointWP::instance();
 		if ($tpwp->settings->auth_change_profile_urls === 'on') {
+			$newUrl = self::getProfileUrl();
+			if ($newUrl)
+				return $newUrl;
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Assembles the URL to the TouchPoint profile for a given People ID.  Assumes current user if no peopleId is given.
+	 *
+	 * @param int|null $peopleId
+	 *
+	 * @return string|null
+	 */
+	public static function getProfileUrl(?int $peopleId = null): ?string
+	{
+		$tpwp = TouchPointWP::instance();
+		if ($peopleId === null) {
 			$userId   = get_current_user_id();
 			$peopleId = (int)(get_user_meta($userId, Person::META_PEOPLEID, true));
-			if ($peopleId > 0) { // make sure we have a PeopleId.  Users aren't necessarily TouchPoint users.
-				return $tpwp->host() . '/Person2/' . $peopleId . "#tab-personal";
-			}
+		}
+		if ($peopleId >= 0) {
+			return $tpwp->host() . '/Person2/' . $peopleId . "#tab-personal";
 		}
 
-		return $url;
+		return null;
 	}
 
 
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 11cc13f3..4979a714 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3651,7 +3651,7 @@ public function notableAttributes(array $exclude = []): array
 	 *
 	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false, bool $includeRegister = true): StringableArray
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false, bool $includeRegister = true): StringableArray
 	{
 		if (!$absoluteLinks) {
 			TouchPointWP::requireScript('swal2-defer');
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 7e73eb2e..3101fbab 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -473,7 +473,7 @@ public function notableAttributes(array $exclude = []): array
 	 *
 	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
 	{
 		if (!$absoluteLinks) {
 			TouchPointWP::requireScript('swal2-defer');
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index cbe34916..6fd42d1a 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -352,8 +352,10 @@ public static function updateFromTouchPoint(bool $verbose = false)
 		$q['groupBy']     = 'FamilyId';
 		$q['context']     = 'partner';
 
+		$timeout = max(20, TouchPointWP::instance()->doPersonCount($q, 10) * 3);
+
 		// Submit to API
-		$familyData = TouchPointWP::instance()->doPersonQuery($q, $verbose, 50);
+		$familyData = TouchPointWP::instance()->doPersonQuery($q, $verbose, $timeout);
 
 		$postsToKeep = [];
 		$count       = 0;
@@ -1329,7 +1331,7 @@ protected function enqueueForJsInstantiation(): bool
 	 *
 	 * @return StringableArray
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
 	{
 		$this->enqueueForJsInstantiation();
 
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 8cbc1f88..ffbf237a 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -674,8 +674,6 @@ protected static function updateFromTouchPoint(bool $verbose = false): bool|int
 		$queryNeeded = false;
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
-		
-		TouchPointWP::instance()->setTpWpUserAsCurrent();
 
 		// Existing Users
 		/** @noinspection SqlResolve */
@@ -764,11 +762,13 @@ protected static function updateFromTouchPoint(bool $verbose = false): bool|int
 		self::$_indexingQueries['meta']['pev'] = TouchPointWP::instance()->getPersonEvFields($pevFieldIds);
 		self::$_indexingQueries['context']     = 'peopleLists';
 
-		$timeout = min((count(self::$_indexingQueries['pid']) / 4) + 10, 50);
+		$timeout = max((count(self::$_indexingQueries['pid']) / 2) + (count(self::$_indexingQueries['inv']) * 10) + 10, 50);
 
 		// Submit to API
 		$people = TouchPointWP::instance()->doPersonQuery(self::$_indexingQueries, $verbose, $timeout);
 
+		TouchPointWP::instance()->setTpWpUserAsCurrent();
+
 		set_time_limit(count($people->people) * 5 + 10); // a very generous time limit.
 
 		// Parse the API results
@@ -1156,11 +1156,12 @@ protected function resCode(): ?WP_Term
 	 *
 	 * @param ?string $context A reference to where the action buttons are meant to be used.
 	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
-	 *	 elements.
+	 *     elements.
+	 * @param bool    $withTouchPointLink
 	 *
 	 * @return string
 	 */
-	public function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true): string
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true): string
 	{
 		TouchPointWP::requireScript('swal2-defer');
 		TouchPointWP::requireScript('base-defer');
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 9911b434..448723f0 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -112,7 +112,7 @@ protected function processAttributeExclusions(array $subject, array $exclude): a
 	 *
 	 * @return StringableArray
 	 */
-	public abstract function getActionButtons(string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray;
+	public abstract function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray;
 
 	/**
 	 * Indicates if the given post can be instantiated as the given post type.
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 6188e46e..9e7d4d89 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -572,7 +572,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'auth_change_profile_urls',
-						'label'       => __('Change \'Edit Profile\' links', 'TouchPoint-WP'),
+						'label'       => __('Change Profile Links', 'TouchPoint-WP'),
 						'description' => __(
 							'"Edit Profile" links will take the user to their TouchPoint profile, instead of their WordPress profile.',
 							'TouchPoint-WP'
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 1e2417ad..066c61a6 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -202,7 +202,7 @@ public function updateDb(): bool
 			if ($r) {
 				$this->_dirty = false;
 			} else if (WP_DEBUG) {
-				error_log("TouchPoint-WP Stats: Failed to save update to local database.");
+				error_log("TouchPoint-WP: Stats: Failed to save update to local database.");
 			}
 			return $r;
 		}
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index b01118a0..af2b5502 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -35,7 +35,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.95";
+	public const VERSION = "0.0.96";
 
 	/**
 	 * The Token
@@ -340,7 +340,7 @@ public static function setCaching(int $level): void
 	/**
 	 * Spit out headers that prevent caching.  Useful for API calls.
 	 */
-	public static function doCacheHeaders(int $cacheLevel = null): void
+	public static function doCacheHeaders(?int $cacheLevel = null): void
 	{
 		if ($cacheLevel !== null) {
 			self::setCaching($cacheLevel);
@@ -411,8 +411,6 @@ public static function TouchPointIcon(): string
 	 */
 	public function parseRequest($continue, $wp, $extraVars): bool
 	{
-		$this->logOutTpWpUser();
-
 		if ($continue) {
 			$reqUri         = parse_url(trim($_SERVER['REQUEST_URI'], '/'));
 			$reqUri['path'] = $reqUri['path'] ?? "";
@@ -745,10 +743,16 @@ public static function load($file): TouchPointWP
 	{
 		$instance = self::instance($file);
 
+		register_shutdown_function([$instance, 'handlePhpShutdown']);
+
 		if (is_null($instance->settings)) {
 			$instance->settings = Settings::instance($instance);
 			if (is_admin()) {
-				$instance->migrate();
+				if (!function_exists('get_user_by')) {
+					add_action("init", fn() => $instance->migrate(), 0);
+				} else {
+					$instance->migrate();
+				}
 			}
 		}
 
@@ -852,7 +856,7 @@ public static function init(): void
 		/**
 		 * Fires after the plugin has been initialized.
 		 */
-		do_action("tp_init");
+		do_action(self::INIT_ACTION_HOOK);
 	}
 
 	/**
@@ -965,7 +969,7 @@ public function registerScriptsAndStyles(): void
 	 *
 	 * @param ?string $name
 	 */
-	public static function requireScript(string $name = null): void
+	public static function requireScript(?string $name = null): void
 	{
 		$filename = strtolower($name);
 		/**
@@ -999,7 +1003,7 @@ public static function requireScript(string $name = null): void
 	 *
 	 * @param ?string $name
 	 */
-	public static function requireStyle(string $name = null): void
+	public static function requireStyle(?string $name = null): void
 	{
 		$filename = strtolower($name);
 		
@@ -2310,6 +2314,29 @@ public function extGet(string $url, ?array $parameters = null): array
 		return $r;
 	}
 
+	/**
+	 * Submit a person query to TouchPoint with a structured array with the parameters.
+	 *
+	 * @param array $q
+	 * @param int   $timeout
+	 *
+	 * @return int  The number of people returned.
+	 * @throws TouchPointWP_Exception  Upon failure.
+	 */
+	public function doPersonCount(array $q, int $timeout = 5): int
+	{
+		set_time_limit($timeout + 2);
+		$data = TouchPointWP::instance()->api->pyPost('people_count', $q, $timeout);
+		// An exception may already be thrown.
+
+		// Validate that the API returned something
+		if (!$data->success) {
+			throw new TouchPointWP_Exception(__("People Count Failed", "TouchPoint-WP"), 179004);
+		}
+
+		return intval($data->count);
+	}
+
 	/**
 	 * Submit a person query to TouchPoint with a structured array with the parameters.
 	 *
@@ -2327,7 +2354,7 @@ public function doPersonQuery(array $q, bool $verbose = false, int $timeout = 5)
 		// An exception may already be thrown.
 
 		// Validate that the API returned something
-		if ( ! isset($data->people) || ( ! is_array($data->people) && ! is_object($data->people))) {
+		if (!$data->success || !isset($data->people) || (!is_array($data->people) && ! is_object($data->people))) {
 			throw new TouchPointWP_Exception(__("People Query Failed", "TouchPoint-WP"), 179004);
 		}
 
@@ -2515,20 +2542,6 @@ public function validateThatTpWpUserExists(): bool
 	protected ?WP_User $priorUser = null;
 
 
-	/**
-	 * If the TPWP user is logged in, log them out.  This is useful for testing.  This user should never be used
-	 * interactively.
-	 *
-	 * @return void
-	 */
-	public function logOutTpWpUser(): void
-	{
-		if (self::TPWP_USER === wp_get_current_user()?->user_login) {
-			set_current_user(0);
-		}
-	}
-
-
 	/**
 	 * Make the TPWP user the active one, so permissions are not dependent on whoever happens to be running things
 	 * at the moment.
@@ -2565,4 +2578,30 @@ public function unsetTpWpUserAsCurrent(): void
 			wp_set_current_user(0);
 		}
 	}
+
+
+	/**
+	 * Deal with the fallout should PHP timeout, probably on a sync operation.  This needs to be very VERY
+	 * graceful since its tied into fatal error handling.
+	 *
+	 * @return void
+	 */
+	public static function handlePhpShutdown(): void
+	{
+		$e = error_get_last();
+		if ($e == null)
+			return;
+
+		$tpwp = self::$_instance;
+		if (!$tpwp) {
+			return;
+		}
+
+		// Logout the TPWP user if active.
+		if (function_exists('wp_get_current_user')) {
+			if (self::TPWP_USER === wp_get_current_user()?->user_login) {
+				$tpwp->unsetTpWpUserAsCurrent();
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index 5f7626da..efdddbef 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -38,8 +38,8 @@ public function __construct(string $message = "", int $code = 0, ?Throwable $pre
 			}
 			self::showAdminError($message);
 		}
-		error_log($message);
-		self::debugLog($this->getCode(), $this->getFile(), $this->getLine(), $this->getMessage());
+		error_log("TouchPoint-WP: " . $message);
+		self::debugLog($this->getCode(), $this->getFile(), $this->getLine(), $this->getMessage() . " " . $this->getTraceAsString());
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Utilities/Http.php b/src/TouchPoint-WP/Utilities/Http.php
index 55265402..f7b4837c 100644
--- a/src/TouchPoint-WP/Utilities/Http.php
+++ b/src/TouchPoint-WP/Utilities/Http.php
@@ -51,6 +51,8 @@ abstract class Http
 	const EXPECTATION_FAILED = 417;
 	const IM_A_TEAPOT = 418;
 	const UPGRADE_REQUIRED = 426;
+	const PRECONDITION_REQUIRED = 428;
+	const TOO_MANY_REQUESTS = 429;
 
 	/* 500s - Server Error */
 	const SERVER_ERROR = 500;
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 74108547..3f09b218 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -6,7 +6,7 @@
 import sys
 import urllib
 
-VERSION = "0.0.95"
+VERSION = "0.0.96"
 
 sgContactEvName = "Contact"
 
@@ -947,7 +947,7 @@ def get_person_info_for_sync(person_obj):
             model.EditCommitment(mid, pid, "Regrets")
             Data.success.append(pid)
 
-if "people_get" in Data.a and model.HttpMethod == "post":
+if ("people_get" in Data.a or "people_count" in Data.a) and model.HttpMethod == "post":
     apiCalled = True
 
     Data.Title = 'People Query'
@@ -1065,90 +1065,91 @@ def get_person_info_for_sync(person_obj):
         perPage = int(inData['perPage'])
 
     # Do the query
-    results = q.QueryList(rules, sort.lower(), perPage, offset)
     qCount = q.QueryCount(rules)
 
-    for po in results:
-        pr = get_person_info_for_sync(po)
-
-        if pr is None:  # Make sure person should not be excluded
-            continue
-        if pr.Exclude is True:  # Make sure person should not be excluded if PersonInfo didn't go right.
-            continue
-
-        if len(invsMembershipsToImport) > 0:
-            pr.Inv = q.QuerySql(invSql.format(pr.PeopleId, ', '.join(invsMembershipsToImport)))
-
-        # Make People Extra Values orderly
-        if pevSql != '':
-            pr.PeopleEV = {}
-            for pev in q.QuerySql(pevSql.format(pr.PeopleId)):
-                if pev.Type == 'Int':
-                    pev.Data = pev.IntValue
-                elif pev.Type == 'Bit':
-                    pev.Data = pev.BitValue
-                elif pev.Type == 'Date':
-                    pev.Data = pev.DateValue
-                pr.PeopleEV[pev.Hash] = {
-                    'field': pev.Field,
-                    'type': pev.Type,
-                    'value': pev.Data
-                }
-
-        if not inData.has_key('groupBy') or inData['groupBy'] is None:
-            outPeople.append(pr)
-        else:
-            grpId = getattr(po, inData['groupBy'])
-            if not outPeople.has_key(grpId):  # group key does not yet exist.
-
-                if fevSql != '':  # If grouped by family, and we have Family EVs to return
-                    fevOut = {}
-                    for fev in q.QuerySql(fevSql.format(po.FamilyId)):
-                        if fev.Type == 'Int':
-                            fev.Data = fev.IntValue
-                        elif fev.Type == 'Bit':
-                            fev.Data = fev.BitValue
-                        elif fev.Type == 'Date':
-                            fev.Data = fev.DateValue
-                        elif fev.Type == 'Code':
-                            fev.Data = fev.StrValue
-                        fevOut[fev.Hash] = {
-                            'field': fev.Field,
-                            'type': fev.Type,
-                            'value': fev.Data
-                        }
-
-                    outPeople[grpId] = {
-                        inData['groupBy']: grpId,
-                        "People": [],
-                        "FamilyEV": fevOut,
-                        "Picture": None
+    if "people_get" in Data.a:
+        results = q.QueryList(rules, sort.lower(), perPage, offset)
+        for po in results:
+            pr = get_person_info_for_sync(po)
+
+            if pr is None:  # Make sure person should not be excluded
+                continue
+            if pr.Exclude is True:  # Make sure person should not be excluded if PersonInfo didn't go right.
+                continue
+
+            if len(invsMembershipsToImport) > 0:
+                pr.Inv = q.QuerySql(invSql.format(pr.PeopleId, ', '.join(invsMembershipsToImport)))
+
+            # Make People Extra Values orderly
+            if pevSql != '':
+                pr.PeopleEV = {}
+                for pev in q.QuerySql(pevSql.format(pr.PeopleId)):
+                    if pev.Type == 'Int':
+                        pev.Data = pev.IntValue
+                    elif pev.Type == 'Bit':
+                        pev.Data = pev.BitValue
+                    elif pev.Type == 'Date':
+                        pev.Data = pev.DateValue
+                    pr.PeopleEV[pev.Hash] = {
+                        'field': pev.Field,
+                        'type': pev.Type,
+                        'value': pev.Data
                     }
 
-                    # Family's Picture
-                    if po.Family.Picture is not None:
-                        outPeople[grpId]['Picture'] = {
-                            'large': po.Family.Picture.LargeUrl,
-                            'medium': po.Family.Picture.MediumUrl,
-                            'small': po.Family.Picture.SmallUrl,
-                            'thumb': po.Family.Picture.ThumbUrl,
-                            'x': po.Family.Picture.X,
-                            'y': po.Family.Picture.Y
+            if not inData.has_key('groupBy') or inData['groupBy'] is None:
+                outPeople.append(pr)
+            else:
+                grpId = getattr(po, inData['groupBy'])
+                if not outPeople.has_key(grpId):  # group key does not yet exist.
+
+                    if fevSql != '':  # If grouped by family, and we have Family EVs to return
+                        fevOut = {}
+                        for fev in q.QuerySql(fevSql.format(po.FamilyId)):
+                            if fev.Type == 'Int':
+                                fev.Data = fev.IntValue
+                            elif fev.Type == 'Bit':
+                                fev.Data = fev.BitValue
+                            elif fev.Type == 'Date':
+                                fev.Data = fev.DateValue
+                            elif fev.Type == 'Code':
+                                fev.Data = fev.StrValue
+                            fevOut[fev.Hash] = {
+                                'field': fev.Field,
+                                'type': fev.Type,
+                                'value': fev.Data
+                            }
+
+                        outPeople[grpId] = {
+                            inData['groupBy']: grpId,
+                            "People": [],
+                            "FamilyEV": fevOut,
+                            "Picture": None
+                        }
+
+                        # Family's Picture
+                        if po.Family.Picture is not None:
+                            outPeople[grpId]['Picture'] = {
+                                'large': po.Family.Picture.LargeUrl,
+                                'medium': po.Family.Picture.MediumUrl,
+                                'small': po.Family.Picture.SmallUrl,
+                                'thumb': po.Family.Picture.ThumbUrl,
+                                'x': po.Family.Picture.X,
+                                'y': po.Family.Picture.Y
+                            }
+                    else:
+                        outPeople[grpId] = {
+                            inData['groupBy']: grpId,
+                            "People": []
                         }
-                else:
-                    outPeople[grpId] = {
-                        inData['groupBy']: grpId,
-                        "People": []
-                    }
 
-                if useFamGeo:
-                    outPeople[grpId]['geo'] = q.QuerySqlTop1(famGeoSql.format(po.FamilyId))
+                    if useFamGeo:
+                        outPeople[grpId]['geo'] = q.QuerySqlTop1(famGeoSql.format(po.FamilyId))
 
-            outPeople[grpId]["People"].append(pr)
+                outPeople[grpId]["People"].append(pr)
 
     Data.people = outPeople
-    Data.items = qCount
-    Data.inData = inData
+    Data.count = qCount
+    # Data.inData = inData
     Data.rules = rules  # handy for debugging
     Data.success = True
 
@@ -1289,10 +1290,13 @@ def get_person_info_for_sync(person_obj):
             host = host.lower()
 
             # noinspection PyUnresolvedReferences
-            redir = urllib.urlencode({'redirect_to': path})
+            redir = urllib.urlencode({'redirect_to': path, 'tptoken': 'TOKENJAWN'})
             # noinspection HttpUrlsUsage
-            redir = ("https://" if useSsl else "http://") + host + "/wp-login.php?tptoken={token}&" + redir
-            print("REDIRECT=" + "/api/v1/Account/RedirectWithCredentials?destination=" + redir)
+            redir = ("https://" if useSsl else "http://") + host + "/wp-login.php?" + redir
+            # noinspection PyUnresolvedReferences
+            redir = urllib.urlencode({'destination': redir})
+            redir = redir.replace("TOKENJAWN", "{token}")
+            print("REDIRECT=" + "/api/v1/Account/RedirectWithCredentials?" + redir)
 
         except Exception as e:
             model.Title = "Error"
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index b34c9b0b..2941fb51 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,13 +14,13 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.95
+Version:            0.0.96
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+
 Text Domain:        TouchPoint-WP
 Requires at least:  6.0
-Tested up to:       6.7
+Tested up to:       6.8
 Requires PHP:       8.0
 Release Asset:      true
 */

From e0fb2d210ef3ae32cd1078eb6800f23d9b15c32f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 23 Apr 2025 08:20:39 -0400
Subject: [PATCH 266/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 410 ++++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 410 ++++++++++++++++++------------------
 2 files changed, 414 insertions(+), 406 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 111bfe3b..e689f881 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:980
+#: src/TouchPoint-WP/Settings.php:988
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -183,8 +183,8 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#: src/TouchPoint-WP/Auth.php:309
-#: src/TouchPoint-WP/Auth.php:317
+#: src/TouchPoint-WP/Auth.php:398
+#: src/TouchPoint-WP/Auth.php:406
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
@@ -214,13 +214,13 @@ msgid "Registration Closed"
 msgstr "Registro cerrado"
 
 #: src/TouchPoint-WP/Involvement.php:1747
-#: src/TouchPoint-WP/Partner.php:839
+#: src/TouchPoint-WP/Partner.php:841
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Partner.php:863
+#: src/TouchPoint-WP/Partner.php:865
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
@@ -271,16 +271,16 @@ msgid "Join"
 msgstr "Únete"
 
 #: src/TouchPoint-WP/Involvement.php:3725
-#: src/TouchPoint-WP/Partner.php:1343
+#: src/TouchPoint-WP/Partner.php:1345
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:870
+#: src/TouchPoint-WP/Partner.php:872
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1284
+#: src/TouchPoint-WP/Partner.php:1286
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -292,7 +292,7 @@ msgstr "No se proporcionó una identificación de usuario de WordPress para inic
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1173
+#: src/TouchPoint-WP/Person.php:1176
 msgid "Contact"
 msgstr "Contacta"
 
@@ -302,503 +302,499 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2062
+#: src/TouchPoint-WP/TouchPointWP.php:2075
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2119
+#: src/TouchPoint-WP/TouchPointWP.php:2132
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2122
+#: src/TouchPoint-WP/TouchPointWP.php:2135
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2125
+#: src/TouchPoint-WP/TouchPointWP.php:2138
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2130
-#: src/TouchPoint-WP/TouchPointWP.php:2131
+#: src/TouchPoint-WP/TouchPointWP.php:2143
+#: src/TouchPoint-WP/TouchPointWP.php:2144
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/Api.php:97
-#: src/TouchPoint-WP/Api.php:298
-#: src/TouchPoint-WP/Api.php:385
+#: src/TouchPoint-WP/Api.php:98
+#: src/TouchPoint-WP/Api.php:353
+#: src/TouchPoint-WP/Api.php:486
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/Api.php:111
-#: src/TouchPoint-WP/Api.php:159
-#: src/TouchPoint-WP/Api.php:330
+#: src/TouchPoint-WP/Api.php:112
+#: src/TouchPoint-WP/Api.php:160
+#: src/TouchPoint-WP/Api.php:429
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2322
+#: src/TouchPoint-WP/TouchPointWP.php:2358
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/Settings.php:259
+#: src/TouchPoint-WP/Settings.php:260
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/Settings.php:260
+#: src/TouchPoint-WP/Settings.php:261
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/Settings.php:264
+#: src/TouchPoint-WP/Settings.php:265
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/Settings.php:265
+#: src/TouchPoint-WP/Settings.php:266
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:276
+#: src/TouchPoint-WP/Settings.php:277
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/Settings.php:277
+#: src/TouchPoint-WP/Settings.php:278
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:284
+#: src/TouchPoint-WP/Settings.php:285
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/Settings.php:285
+#: src/TouchPoint-WP/Settings.php:286
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:306
+#: src/TouchPoint-WP/Settings.php:307
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/Settings.php:307
+#: src/TouchPoint-WP/Settings.php:308
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/Settings.php:317
+#: src/TouchPoint-WP/Settings.php:318
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:318
+#: src/TouchPoint-WP/Settings.php:319
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/Settings.php:339
+#: src/TouchPoint-WP/Settings.php:340
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/Settings.php:340
+#: src/TouchPoint-WP/Settings.php:341
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:350
+#: src/TouchPoint-WP/Settings.php:351
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:351
+#: src/TouchPoint-WP/Settings.php:352
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/Settings.php:363
+#: src/TouchPoint-WP/Settings.php:367
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:375
+#: src/TouchPoint-WP/Settings.php:379
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:387
+#: src/TouchPoint-WP/Settings.php:392
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:388
+#: src/TouchPoint-WP/Settings.php:393
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/Settings.php:400
+#: src/TouchPoint-WP/Settings.php:408
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:401
+#: src/TouchPoint-WP/Settings.php:409
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/Settings.php:412
+#: src/TouchPoint-WP/Settings.php:420
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:413
+#: src/TouchPoint-WP/Settings.php:421
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/Settings.php:424
+#: src/TouchPoint-WP/Settings.php:432
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:425
+#: src/TouchPoint-WP/Settings.php:433
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/Settings.php:465
-#: src/TouchPoint-WP/Settings.php:470
+#: src/TouchPoint-WP/Settings.php:473
+#: src/TouchPoint-WP/Settings.php:478
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/Settings.php:469
+#: src/TouchPoint-WP/Settings.php:477
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/Settings.php:486
+#: src/TouchPoint-WP/Settings.php:494
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/Settings.php:487
+#: src/TouchPoint-WP/Settings.php:495
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/Settings.php:491
+#: src/TouchPoint-WP/Settings.php:499
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/Settings.php:492
+#: src/TouchPoint-WP/Settings.php:500
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/Settings.php:503
+#: src/TouchPoint-WP/Settings.php:511
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/Settings.php:504
+#: src/TouchPoint-WP/Settings.php:512
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/Settings.php:514
+#: src/TouchPoint-WP/Settings.php:522
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/Settings.php:515
+#: src/TouchPoint-WP/Settings.php:523
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/Settings.php:525
-#: src/TouchPoint-WP/Settings.php:763
+#: src/TouchPoint-WP/Settings.php:533
+#: src/TouchPoint-WP/Settings.php:771
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/Settings.php:526
+#: src/TouchPoint-WP/Settings.php:534
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/Settings.php:542
+#: src/TouchPoint-WP/Settings.php:550
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/Settings.php:543
+#: src/TouchPoint-WP/Settings.php:551
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:547
+#: src/TouchPoint-WP/Settings.php:555
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/Settings.php:557
+#: src/TouchPoint-WP/Settings.php:565
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/Settings.php:558
+#: src/TouchPoint-WP/Settings.php:566
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:567
-msgid "Change 'Edit Profile' links"
-msgstr "Cambiar los enlaces 'Editar perfil'"
-
-#: src/TouchPoint-WP/Settings.php:568
+#: src/TouchPoint-WP/Settings.php:576
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:577
+#: src/TouchPoint-WP/Settings.php:585
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/Settings.php:578
+#: src/TouchPoint-WP/Settings.php:586
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/Settings.php:584
+#: src/TouchPoint-WP/Settings.php:592
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/Settings.php:585
+#: src/TouchPoint-WP/Settings.php:593
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/Settings.php:599
+#: src/TouchPoint-WP/Settings.php:607
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/Settings.php:600
+#: src/TouchPoint-WP/Settings.php:608
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/Settings.php:605
+#: src/TouchPoint-WP/Settings.php:613
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/Settings.php:635
+#: src/TouchPoint-WP/Settings.php:643
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/Settings.php:636
+#: src/TouchPoint-WP/Settings.php:644
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/Settings.php:640
+#: src/TouchPoint-WP/Settings.php:648
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/Settings.php:641
+#: src/TouchPoint-WP/Settings.php:649
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:651
+#: src/TouchPoint-WP/Settings.php:659
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/Settings.php:652
+#: src/TouchPoint-WP/Settings.php:660
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:662
+#: src/TouchPoint-WP/Settings.php:670
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/Settings.php:663
+#: src/TouchPoint-WP/Settings.php:671
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:673
+#: src/TouchPoint-WP/Settings.php:681
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/Settings.php:674
+#: src/TouchPoint-WP/Settings.php:682
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:684
+#: src/TouchPoint-WP/Settings.php:692
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/Settings.php:685
+#: src/TouchPoint-WP/Settings.php:693
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:697
+#: src/TouchPoint-WP/Settings.php:705
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/Settings.php:698
+#: src/TouchPoint-WP/Settings.php:706
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/Settings.php:708
+#: src/TouchPoint-WP/Settings.php:716
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/Settings.php:709
+#: src/TouchPoint-WP/Settings.php:717
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/Settings.php:719
+#: src/TouchPoint-WP/Settings.php:727
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/Settings.php:720
+#: src/TouchPoint-WP/Settings.php:728
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/Settings.php:730
+#: src/TouchPoint-WP/Settings.php:738
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/Settings.php:731
+#: src/TouchPoint-WP/Settings.php:739
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/Settings.php:741
+#: src/TouchPoint-WP/Settings.php:749
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/Settings.php:742
+#: src/TouchPoint-WP/Settings.php:750
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/Settings.php:752
+#: src/TouchPoint-WP/Settings.php:760
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/Settings.php:753
+#: src/TouchPoint-WP/Settings.php:761
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/Settings.php:764
+#: src/TouchPoint-WP/Settings.php:772
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/Settings.php:775
+#: src/TouchPoint-WP/Settings.php:783
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/Settings.php:776
+#: src/TouchPoint-WP/Settings.php:784
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/Settings.php:819
+#: src/TouchPoint-WP/Settings.php:827
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:824
+#: src/TouchPoint-WP/Settings.php:832
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/Settings.php:839
+#: src/TouchPoint-WP/Settings.php:847
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/Settings.php:840
+#: src/TouchPoint-WP/Settings.php:848
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/Settings.php:938
+#: src/TouchPoint-WP/Settings.php:946
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/Settings.php:939
+#: src/TouchPoint-WP/Settings.php:947
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:943
+#: src/TouchPoint-WP/Settings.php:951
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/Settings.php:944
+#: src/TouchPoint-WP/Settings.php:952
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:955
+#: src/TouchPoint-WP/Settings.php:963
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:956
+#: src/TouchPoint-WP/Settings.php:964
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:967
+#: src/TouchPoint-WP/Settings.php:975
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/Settings.php:968
+#: src/TouchPoint-WP/Settings.php:976
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/Settings.php:981
+#: src/TouchPoint-WP/Settings.php:989
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/Settings.php:1032
+#: src/TouchPoint-WP/Settings.php:1040
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Settings.php:1033
+#: src/TouchPoint-WP/Settings.php:1041
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:1040
+#: src/TouchPoint-WP/Settings.php:1048
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1041
+#: src/TouchPoint-WP/Settings.php:1049
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1052
+#: src/TouchPoint-WP/Settings.php:1060
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:1053
+#: src/TouchPoint-WP/Settings.php:1061
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1064
+#: src/TouchPoint-WP/Settings.php:1072
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/Settings.php:1065
+#: src/TouchPoint-WP/Settings.php:1073
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/Settings.php:1081
+#: src/TouchPoint-WP/Settings.php:1089
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/Settings.php:1082
+#: src/TouchPoint-WP/Settings.php:1090
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/Settings.php:1086
+#: src/TouchPoint-WP/Settings.php:1094
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1087
+#: src/TouchPoint-WP/Settings.php:1095
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1098
+#: src/TouchPoint-WP/Settings.php:1106
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/Settings.php:1099
+#: src/TouchPoint-WP/Settings.php:1107
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1110
+#: src/TouchPoint-WP/Settings.php:1118
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/Settings.php:1111
+#: src/TouchPoint-WP/Settings.php:1119
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/Settings.php:1289
+#: src/TouchPoint-WP/Settings.php:1297
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/Settings.php:1343
-#: src/TouchPoint-WP/Settings.php:1344
+#: src/TouchPoint-WP/Settings.php:1351
+#: src/TouchPoint-WP/Settings.php:1352
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1392
+#: src/TouchPoint-WP/Settings.php:1400
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/Settings.php:1637
+#: src/TouchPoint-WP/Settings.php:1645
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/Settings.php:1759
+#: src/TouchPoint-WP/Settings.php:1767
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1810
+#: src/TouchPoint-WP/Settings.php:1818
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1452
+#: src/TouchPoint-WP/Person.php:1455
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:18
 msgid "and"
@@ -962,7 +958,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/Api.php:449
+#: src/TouchPoint-WP/Api.php:550
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1144,12 +1140,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/Settings.php:1007
-#: src/TouchPoint-WP/Settings.php:1013
+#: src/TouchPoint-WP/Settings.php:1015
+#: src/TouchPoint-WP/Settings.php:1021
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1008
+#: src/TouchPoint-WP/Settings.php:1016
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1200,12 +1196,12 @@ msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
 #: src/TouchPoint-WP/Involvement.php:1963
-#: src/TouchPoint-WP/Partner.php:879
+#: src/TouchPoint-WP/Partner.php:881
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
 #: src/TouchPoint-WP/Involvement.php:1966
-#: src/TouchPoint-WP/Partner.php:882
+#: src/TouchPoint-WP/Partner.php:884
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
@@ -1258,7 +1254,7 @@ msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi l
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/Settings.php:376
+#: src/TouchPoint-WP/Settings.php:380
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1283,7 +1279,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:689
-#: src/TouchPoint-WP/TouchPointWP.php:1052
+#: src/TouchPoint-WP/TouchPointWP.php:1065
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1302,7 +1298,7 @@ msgstr "Datos proporcionados no válidos."
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/Settings.php:328
+#: src/TouchPoint-WP/Settings.php:329
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1367,7 +1363,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/Settings.php:329
+#: src/TouchPoint-WP/Settings.php:330
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1430,16 +1426,16 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1459
+#: src/TouchPoint-WP/Person.php:1462
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:852
+#: src/TouchPoint-WP/Settings.php:860
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/Settings.php:853
+#: src/TouchPoint-WP/Settings.php:861
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1447,28 +1443,28 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/Settings.php:881
+#: src/TouchPoint-WP/Settings.php:889
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:882
+#: src/TouchPoint-WP/Settings.php:890
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
 #: src/TouchPoint-WP/Involvement.php:4037
-#: src/TouchPoint-WP/Person.php:1841
+#: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/Settings.php:548
+#: src/TouchPoint-WP/Settings.php:556
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/Settings.php:364
+#: src/TouchPoint-WP/Settings.php:368
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/Settings.php:468
+#: src/TouchPoint-WP/Settings.php:476
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1476,16 +1472,16 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1696
+#: src/TouchPoint-WP/Person.php:1699
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
 #: src/TouchPoint-WP/Involvement.php:4027
-#: src/TouchPoint-WP/Person.php:1858
+#: src/TouchPoint-WP/Person.php:1861
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1598
+#: src/TouchPoint-WP/Person.php:1601
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
@@ -1500,40 +1496,40 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Settings.php:295
+#: src/TouchPoint-WP/Settings.php:296
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:296
+#: src/TouchPoint-WP/Settings.php:297
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:894
+#: src/TouchPoint-WP/Settings.php:902
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/Settings.php:895
+#: src/TouchPoint-WP/Settings.php:903
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:915
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/Settings.php:920
+#: src/TouchPoint-WP/Settings.php:928
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/Settings.php:992
-#: src/TouchPoint-WP/Settings.php:1123
+#: src/TouchPoint-WP/Settings.php:1000
+#: src/TouchPoint-WP/Settings.php:1131
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/Settings.php:993
+#: src/TouchPoint-WP/Settings.php:1001
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Settings.php:1124
+#: src/TouchPoint-WP/Settings.php:1132
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1612,43 +1608,43 @@ msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1181
+#: src/TouchPoint-WP/Person.php:1184
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/Settings.php:857
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/Settings.php:858
+#: src/TouchPoint-WP/Settings.php:866
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:863
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:871
+#: src/TouchPoint-WP/Settings.php:873
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/Settings.php:863
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:871
+#: src/TouchPoint-WP/Settings.php:873
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Settings.php:869
+#: src/TouchPoint-WP/Settings.php:877
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/Settings.php:870
+#: src/TouchPoint-WP/Settings.php:878
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:875
-#: src/TouchPoint-WP/Settings.php:877
+#: src/TouchPoint-WP/Settings.php:883
+#: src/TouchPoint-WP/Settings.php:885
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/Settings.php:875
-#: src/TouchPoint-WP/Settings.php:877
+#: src/TouchPoint-WP/Settings.php:883
+#: src/TouchPoint-WP/Settings.php:885
 msgid "Event"
 msgstr "Evento"
 
@@ -1755,31 +1751,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/Settings.php:793
+#: src/TouchPoint-WP/Settings.php:801
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/Settings.php:797
+#: src/TouchPoint-WP/Settings.php:805
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:803
+#: src/TouchPoint-WP/Settings.php:811
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/Settings.php:808
+#: src/TouchPoint-WP/Settings.php:816
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/Settings.php:809
+#: src/TouchPoint-WP/Settings.php:817
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/Settings.php:822
+#: src/TouchPoint-WP/Settings.php:830
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/Settings.php:804
+#: src/TouchPoint-WP/Settings.php:812
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1809,11 +1805,11 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:435
+#: src/TouchPoint-WP/Settings.php:443
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/Settings.php:436
+#: src/TouchPoint-WP/Settings.php:444
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
@@ -1846,27 +1842,35 @@ msgstr "Actualizada"
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: src/TouchPoint-WP/Settings.php:908
+#: src/TouchPoint-WP/Settings.php:916
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
 
-#: src/TouchPoint-WP/Settings.php:446
+#: src/TouchPoint-WP/Settings.php:454
 msgid "List Site in Directory"
 msgstr "Listar sitio en directorio"
 
-#: src/TouchPoint-WP/Settings.php:447
+#: src/TouchPoint-WP/Settings.php:455
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:129
+#: src/TouchPoint-WP/Auth.php:135
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
-#: src/TouchPoint-WP/Auth.php:348
+#: src/TouchPoint-WP/Auth.php:437
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
-#: src/TouchPoint-WP/Settings.php:921
+#: src/TouchPoint-WP/Settings.php:929
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días. Si un evento tiene más de esta cantidad, se eliminará. Se recomienda encarecidamente tener poco historial (menos de un mes) o mucho (al menos 15 meses)."
+
+#: src/TouchPoint-WP/Settings.php:575
+msgid "Change Profile Links"
+msgstr "Cambiar enlaces de perfil"
+
+#: src/TouchPoint-WP/TouchPointWP.php:2334
+msgid "People Count Failed"
+msgstr "El recuento de personas falló"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index f45381a2..9e22d613 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.95\n"
+"Project-Id-Version: TouchPoint WP 0.0.96\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-04-07T20:36:47+00:00\n"
+"POT-Creation-Date: 2025-04-23T12:15:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:980
+#: src/TouchPoint-WP/Settings.php:988
 msgid "Divisions to Import"
 msgstr ""
 
@@ -300,33 +300,33 @@ msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi l
 msgid "%2.1fmi"
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:97
-#: src/TouchPoint-WP/Api.php:298
-#: src/TouchPoint-WP/Api.php:385
+#: src/TouchPoint-WP/Api.php:98
+#: src/TouchPoint-WP/Api.php:353
+#: src/TouchPoint-WP/Api.php:486
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:111
-#: src/TouchPoint-WP/Api.php:159
-#: src/TouchPoint-WP/Api.php:330
+#: src/TouchPoint-WP/Api.php:112
+#: src/TouchPoint-WP/Api.php:160
+#: src/TouchPoint-WP/Api.php:429
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:449
+#: src/TouchPoint-WP/Api.php:550
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:129
+#: src/TouchPoint-WP/Auth.php:135
 msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:309
-#: src/TouchPoint-WP/Auth.php:317
+#: src/TouchPoint-WP/Auth.php:398
+#: src/TouchPoint-WP/Auth.php:406
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:348
+#: src/TouchPoint-WP/Auth.php:437
 msgid "No user account found."
 msgstr ""
 
@@ -421,7 +421,7 @@ msgid "%1$s, through %2$s"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1747
-#: src/TouchPoint-WP/Partner.php:839
+#: src/TouchPoint-WP/Partner.php:841
 msgid "Any"
 msgstr ""
 
@@ -454,18 +454,18 @@ msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Partner.php:863
+#: src/TouchPoint-WP/Partner.php:865
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
 #: src/TouchPoint-WP/Involvement.php:1963
-#: src/TouchPoint-WP/Partner.php:879
+#: src/TouchPoint-WP/Partner.php:881
 msgid "Zoom out or %s to see more."
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1966
-#: src/TouchPoint-WP/Partner.php:882
+#: src/TouchPoint-WP/Partner.php:884
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
@@ -495,7 +495,7 @@ msgid "Contact Leaders"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:3725
-#: src/TouchPoint-WP/Partner.php:1343
+#: src/TouchPoint-WP/Partner.php:1345
 msgid "Show on Map"
 msgstr ""
 
@@ -544,12 +544,12 @@ msgid "Invalid Post Type."
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:4027
-#: src/TouchPoint-WP/Person.php:1858
+#: src/TouchPoint-WP/Person.php:1861
 msgid "Contact Blocked for Spam."
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:4037
-#: src/TouchPoint-WP/Person.php:1841
+#: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -585,7 +585,7 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:689
-#: src/TouchPoint-WP/TouchPointWP.php:1052
+#: src/TouchPoint-WP/TouchPointWP.php:1065
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -606,11 +606,11 @@ msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:870
+#: src/TouchPoint-WP/Partner.php:872
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1284
+#: src/TouchPoint-WP/Partner.php:1286
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -622,31 +622,31 @@ msgstr ""
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1173
+#: src/TouchPoint-WP/Person.php:1176
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1181
+#: src/TouchPoint-WP/Person.php:1184
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1452
+#: src/TouchPoint-WP/Person.php:1455
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1459
+#: src/TouchPoint-WP/Person.php:1462
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1598
+#: src/TouchPoint-WP/Person.php:1601
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1696
+#: src/TouchPoint-WP/Person.php:1699
 msgid "You may need to sign in."
 msgstr ""
 
@@ -663,636 +663,636 @@ msgstr ""
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:259
+#: src/TouchPoint-WP/Settings.php:260
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:260
+#: src/TouchPoint-WP/Settings.php:261
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:264
+#: src/TouchPoint-WP/Settings.php:265
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:265
+#: src/TouchPoint-WP/Settings.php:266
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:276
+#: src/TouchPoint-WP/Settings.php:277
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:277
+#: src/TouchPoint-WP/Settings.php:278
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:284
+#: src/TouchPoint-WP/Settings.php:285
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:285
+#: src/TouchPoint-WP/Settings.php:286
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:295
+#: src/TouchPoint-WP/Settings.php:296
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:296
+#: src/TouchPoint-WP/Settings.php:297
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:306
+#: src/TouchPoint-WP/Settings.php:307
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:307
+#: src/TouchPoint-WP/Settings.php:308
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:317
+#: src/TouchPoint-WP/Settings.php:318
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:318
+#: src/TouchPoint-WP/Settings.php:319
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:328
+#: src/TouchPoint-WP/Settings.php:329
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:329
+#: src/TouchPoint-WP/Settings.php:330
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:339
+#: src/TouchPoint-WP/Settings.php:340
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:340
+#: src/TouchPoint-WP/Settings.php:341
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:350
+#: src/TouchPoint-WP/Settings.php:351
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:351
+#: src/TouchPoint-WP/Settings.php:352
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:363
+#: src/TouchPoint-WP/Settings.php:367
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:364
+#: src/TouchPoint-WP/Settings.php:368
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:375
+#: src/TouchPoint-WP/Settings.php:379
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:376
+#: src/TouchPoint-WP/Settings.php:380
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:387
+#: src/TouchPoint-WP/Settings.php:392
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:388
+#: src/TouchPoint-WP/Settings.php:393
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:400
+#: src/TouchPoint-WP/Settings.php:408
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:401
+#: src/TouchPoint-WP/Settings.php:409
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:412
+#: src/TouchPoint-WP/Settings.php:420
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:413
+#: src/TouchPoint-WP/Settings.php:421
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:424
+#: src/TouchPoint-WP/Settings.php:432
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:425
+#: src/TouchPoint-WP/Settings.php:433
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:435
+#: src/TouchPoint-WP/Settings.php:443
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:436
+#: src/TouchPoint-WP/Settings.php:444
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:446
+#: src/TouchPoint-WP/Settings.php:454
 msgid "List Site in Directory"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:447
+#: src/TouchPoint-WP/Settings.php:455
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:465
-#: src/TouchPoint-WP/Settings.php:470
+#: src/TouchPoint-WP/Settings.php:473
+#: src/TouchPoint-WP/Settings.php:478
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:468
+#: src/TouchPoint-WP/Settings.php:476
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:469
+#: src/TouchPoint-WP/Settings.php:477
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:486
+#: src/TouchPoint-WP/Settings.php:494
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:487
+#: src/TouchPoint-WP/Settings.php:495
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:491
+#: src/TouchPoint-WP/Settings.php:499
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:492
+#: src/TouchPoint-WP/Settings.php:500
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:503
+#: src/TouchPoint-WP/Settings.php:511
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:504
+#: src/TouchPoint-WP/Settings.php:512
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:514
+#: src/TouchPoint-WP/Settings.php:522
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:515
+#: src/TouchPoint-WP/Settings.php:523
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:525
-#: src/TouchPoint-WP/Settings.php:763
+#: src/TouchPoint-WP/Settings.php:533
+#: src/TouchPoint-WP/Settings.php:771
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:526
+#: src/TouchPoint-WP/Settings.php:534
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:542
+#: src/TouchPoint-WP/Settings.php:550
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:543
+#: src/TouchPoint-WP/Settings.php:551
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:547
+#: src/TouchPoint-WP/Settings.php:555
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:548
+#: src/TouchPoint-WP/Settings.php:556
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:557
+#: src/TouchPoint-WP/Settings.php:565
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:558
+#: src/TouchPoint-WP/Settings.php:566
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:567
-msgid "Change 'Edit Profile' links"
+#: src/TouchPoint-WP/Settings.php:575
+msgid "Change Profile Links"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:568
+#: src/TouchPoint-WP/Settings.php:576
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:577
+#: src/TouchPoint-WP/Settings.php:585
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:578
+#: src/TouchPoint-WP/Settings.php:586
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:584
+#: src/TouchPoint-WP/Settings.php:592
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:585
+#: src/TouchPoint-WP/Settings.php:593
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:599
+#: src/TouchPoint-WP/Settings.php:607
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:600
+#: src/TouchPoint-WP/Settings.php:608
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:605
+#: src/TouchPoint-WP/Settings.php:613
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:635
+#: src/TouchPoint-WP/Settings.php:643
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:636
+#: src/TouchPoint-WP/Settings.php:644
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:640
+#: src/TouchPoint-WP/Settings.php:648
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:641
+#: src/TouchPoint-WP/Settings.php:649
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:651
+#: src/TouchPoint-WP/Settings.php:659
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:652
+#: src/TouchPoint-WP/Settings.php:660
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:662
+#: src/TouchPoint-WP/Settings.php:670
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:663
+#: src/TouchPoint-WP/Settings.php:671
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:673
+#: src/TouchPoint-WP/Settings.php:681
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:674
+#: src/TouchPoint-WP/Settings.php:682
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:684
+#: src/TouchPoint-WP/Settings.php:692
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:685
+#: src/TouchPoint-WP/Settings.php:693
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:697
+#: src/TouchPoint-WP/Settings.php:705
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:698
+#: src/TouchPoint-WP/Settings.php:706
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:708
+#: src/TouchPoint-WP/Settings.php:716
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:709
+#: src/TouchPoint-WP/Settings.php:717
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:719
+#: src/TouchPoint-WP/Settings.php:727
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:720
+#: src/TouchPoint-WP/Settings.php:728
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:730
+#: src/TouchPoint-WP/Settings.php:738
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:731
+#: src/TouchPoint-WP/Settings.php:739
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:741
+#: src/TouchPoint-WP/Settings.php:749
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:742
+#: src/TouchPoint-WP/Settings.php:750
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:752
+#: src/TouchPoint-WP/Settings.php:760
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:753
+#: src/TouchPoint-WP/Settings.php:761
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:764
+#: src/TouchPoint-WP/Settings.php:772
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:775
+#: src/TouchPoint-WP/Settings.php:783
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:776
+#: src/TouchPoint-WP/Settings.php:784
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:793
+#: src/TouchPoint-WP/Settings.php:801
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:797
+#: src/TouchPoint-WP/Settings.php:805
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:803
+#: src/TouchPoint-WP/Settings.php:811
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:804
+#: src/TouchPoint-WP/Settings.php:812
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:808
+#: src/TouchPoint-WP/Settings.php:816
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:809
+#: src/TouchPoint-WP/Settings.php:817
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:819
+#: src/TouchPoint-WP/Settings.php:827
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:822
+#: src/TouchPoint-WP/Settings.php:830
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:824
+#: src/TouchPoint-WP/Settings.php:832
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:839
+#: src/TouchPoint-WP/Settings.php:847
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:840
+#: src/TouchPoint-WP/Settings.php:848
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:852
+#: src/TouchPoint-WP/Settings.php:860
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:853
+#: src/TouchPoint-WP/Settings.php:861
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:857
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:858
+#: src/TouchPoint-WP/Settings.php:866
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:863
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:871
+#: src/TouchPoint-WP/Settings.php:873
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:863
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:871
+#: src/TouchPoint-WP/Settings.php:873
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:869
+#: src/TouchPoint-WP/Settings.php:877
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:870
+#: src/TouchPoint-WP/Settings.php:878
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:875
-#: src/TouchPoint-WP/Settings.php:877
+#: src/TouchPoint-WP/Settings.php:883
+#: src/TouchPoint-WP/Settings.php:885
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:875
-#: src/TouchPoint-WP/Settings.php:877
+#: src/TouchPoint-WP/Settings.php:883
+#: src/TouchPoint-WP/Settings.php:885
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:881
+#: src/TouchPoint-WP/Settings.php:889
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:882
+#: src/TouchPoint-WP/Settings.php:890
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:894
+#: src/TouchPoint-WP/Settings.php:902
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:895
+#: src/TouchPoint-WP/Settings.php:903
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:915
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:908
+#: src/TouchPoint-WP/Settings.php:916
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:920
+#: src/TouchPoint-WP/Settings.php:928
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:921
+#: src/TouchPoint-WP/Settings.php:929
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:938
+#: src/TouchPoint-WP/Settings.php:946
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:939
+#: src/TouchPoint-WP/Settings.php:947
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:943
+#: src/TouchPoint-WP/Settings.php:951
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:944
+#: src/TouchPoint-WP/Settings.php:952
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:955
+#: src/TouchPoint-WP/Settings.php:963
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:956
+#: src/TouchPoint-WP/Settings.php:964
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:967
+#: src/TouchPoint-WP/Settings.php:975
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:968
+#: src/TouchPoint-WP/Settings.php:976
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:981
+#: src/TouchPoint-WP/Settings.php:989
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:992
-#: src/TouchPoint-WP/Settings.php:1123
+#: src/TouchPoint-WP/Settings.php:1000
+#: src/TouchPoint-WP/Settings.php:1131
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:993
+#: src/TouchPoint-WP/Settings.php:1001
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1007
-#: src/TouchPoint-WP/Settings.php:1013
+#: src/TouchPoint-WP/Settings.php:1015
+#: src/TouchPoint-WP/Settings.php:1021
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1008
+#: src/TouchPoint-WP/Settings.php:1016
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1032
+#: src/TouchPoint-WP/Settings.php:1040
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1033
+#: src/TouchPoint-WP/Settings.php:1041
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1040
+#: src/TouchPoint-WP/Settings.php:1048
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1041
+#: src/TouchPoint-WP/Settings.php:1049
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1052
+#: src/TouchPoint-WP/Settings.php:1060
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1053
+#: src/TouchPoint-WP/Settings.php:1061
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1064
+#: src/TouchPoint-WP/Settings.php:1072
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1065
+#: src/TouchPoint-WP/Settings.php:1073
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1081
+#: src/TouchPoint-WP/Settings.php:1089
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1082
+#: src/TouchPoint-WP/Settings.php:1090
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1086
+#: src/TouchPoint-WP/Settings.php:1094
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1087
+#: src/TouchPoint-WP/Settings.php:1095
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1098
+#: src/TouchPoint-WP/Settings.php:1106
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1099
+#: src/TouchPoint-WP/Settings.php:1107
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1110
+#: src/TouchPoint-WP/Settings.php:1118
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1111
+#: src/TouchPoint-WP/Settings.php:1119
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1124
+#: src/TouchPoint-WP/Settings.php:1132
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1289
+#: src/TouchPoint-WP/Settings.php:1297
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1343
-#: src/TouchPoint-WP/Settings.php:1344
+#: src/TouchPoint-WP/Settings.php:1351
+#: src/TouchPoint-WP/Settings.php:1352
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1392
+#: src/TouchPoint-WP/Settings.php:1400
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1637
+#: src/TouchPoint-WP/Settings.php:1645
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1759
+#: src/TouchPoint-WP/Settings.php:1767
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1810
+#: src/TouchPoint-WP/Settings.php:1818
 msgid "Save Settings"
 msgstr ""
 
@@ -1403,28 +1403,32 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2062
+#: src/TouchPoint-WP/TouchPointWP.php:2075
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2119
+#: src/TouchPoint-WP/TouchPointWP.php:2132
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2122
+#: src/TouchPoint-WP/TouchPointWP.php:2135
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2125
+#: src/TouchPoint-WP/TouchPointWP.php:2138
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2130
-#: src/TouchPoint-WP/TouchPointWP.php:2131
+#: src/TouchPoint-WP/TouchPointWP.php:2143
+#: src/TouchPoint-WP/TouchPointWP.php:2144
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2322
+#: src/TouchPoint-WP/TouchPointWP.php:2334
+msgid "People Count Failed"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2358
 msgid "People Query Failed"
 msgstr ""
 

From ccf8e1673f17f7094f1ed3a1315bf830910cb5f2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 23 Apr 2025 12:27:49 -0400
Subject: [PATCH 267/423] Group adjacent meetings #225

---
 src/TouchPoint-WP/CalendarGrid.php            |   7 +-
 src/TouchPoint-WP/Interfaces/apiMeeting.php   |  19 ++
 src/TouchPoint-WP/Involvement.php             | 269 ++++++++++++------
 .../Involvement_PostTypeSettings.php          |   2 +
 src/TouchPoint-WP/Meeting.php                 |  43 ++-
 src/TouchPoint-WP/MeetingArray.php            | 175 ++++++++++++
 src/TouchPoint-WP/Settings.php                |  21 +-
 src/templates/admin/invKoForm.php             |  14 +
 8 files changed, 445 insertions(+), 105 deletions(-)
 create mode 100644 src/TouchPoint-WP/Interfaces/apiMeeting.php
 create mode 100644 src/TouchPoint-WP/MeetingArray.php

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index d6b7372d..01b8f4e5 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -391,7 +391,12 @@ private static function adjustQueryForRange(WP_Query $q, DateTimeInterface $d1,
 			[
 				'key' => Meeting::MEETING_META_KEY,
 				'value' => 0,
-				'compare' => ">"
+				'compare' => "!="
+			],
+			[
+				'key' => Meeting::MEETING_IS_GROUP_MEMBER,
+				'value' => 0,
+				'compare' => "="
 			],
 			'relation' => 'AND'
 		];
diff --git a/src/TouchPoint-WP/Interfaces/apiMeeting.php b/src/TouchPoint-WP/Interfaces/apiMeeting.php
new file mode 100644
index 00000000..4b5756de
--- /dev/null
+++ b/src/TouchPoint-WP/Interfaces/apiMeeting.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace tp\TouchPointWP\Interfaces;
+
+use DateTimeInterface;
+
+/**
+ * For meeting synchronization to assist with both Meetings and MeetingArrays.
+ *
+ * @property-read string name
+ * @property-read int mtgId
+ * @property-read DateTimeInterface mtgStartDt
+ * @property-read DateTimeInterface mtgEndDt
+ * @property-read ?string location
+ * @property-read int status
+ */
+interface apiMeeting {
+	public function __get(string $what);
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 4979a714..5a305a9c 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2300,6 +2300,22 @@ public static function updateCron(): void
 		}
 	}
 
+	protected static DateTimeImmutable $_updateExpiry;
+
+	protected static function updateExpiry(): DateTimeImmutable
+	{
+		if (!isset(self::$_updateExpiry)) {
+			$diff = TouchPointWP::instance()->settings->mc_archive_days;
+			try {
+				$interval = new DateInterval("P{$diff}D");
+				self::$_updateExpiry = Utilities::dateTimeNow()->sub($interval);
+			} catch (Exception) {
+				self::$_updateExpiry = Utilities::dateTimeNow();
+			}
+		}
+		return self::$_updateExpiry;
+	}
+
 	/**
 	 * Returns distance to the given involvement from the $compareGeo point.
 	 *
@@ -3108,104 +3124,59 @@ protected static function updateMeetingsForInvolvement(
 			// If the main post was previously a single, it needs to have the meeting info removed.
 			self::doMeetingMetaUpdates($post, null, false, $verbose);
 
-			foreach ($inv->meetings as $mtgO) {
+			// Group meetings together if they're adjacent and settings allow.
+			$doGrouping = match($typeSets->meetingGroupingMethod) {
+				Meeting::GROUP_UNSCHEDULED => count($inv->schedules) === 0,
+				Meeting::GROUP_ALL => true,
+				default => false
+			};
 
-				////////////////////
-				// Title and Slug //
-				////////////////////
+			usort($inv->meetings, fn($a, $b) => $a->mtgStartDt <=> $b->mtgStartDt);
 
-				$title = $mtgO->name ?? $inv->titleToUse;
-				$slug = $mtgO->mtgId; // Default slug of the meeting ID -- collision-safe.
-				foreach ($slugFormats as $f) {
-					$s = $mtgO->mtgStartDt->format($f);
-					if ($slugStrategy[$s] == 1) {
-						$slug = $s;
-						break;
-					}
-				}
-
-
-				/////////////////////////
-				// Find or Create Post //
-				/////////////////////////
+			$c = 0;
+			foreach ($inv->meetings as $i => $mtgO) {
+				$mtgO->group = $c;
+				if ($i > 0 && $doGrouping) {
+					$diff = $mtgO->mtgStartDt->diff($inv->meetings[$i - 1]->mtgStartDt);
 
-				$loops = 1;
-				do {
-					$mtgP = new WP_Query([
-						                     'post_type'      => $typeSets->postTypeWithPrefix(),
-						                     'post_name'      => $slug,
-						                     'post_parent'    => $post->ID,
-						                     'posts_per_page' => 10,
-						                     'numberposts'    => 10,
-						                     'meta_key'       => Meeting::MEETING_META_KEY,
-						                     'meta_value'     => $mtgO->mtgId,
-						                     'meta_compare'   => '='
-					                     ]);
-
-					$counts = $mtgP->post_count;
-					$mtgP   = $mtgP->get_posts();
-
-					if ($counts > 1) {  // multiple posts match, which isn't great.
-						new TouchPointWP_Exception("Multiple Posts Exist, Attempting to Remedy Automatically", 170007);
-						if ($verbose) {
-							echo "<p><b>Multiple Posts Exist.  An attempt will be made to remove them.</b></p>";
-						}
-
-						for ($i = 1; $i <= $counts; $i++) {
-							wp_delete_post($mtgP[$i]->ID, true);
-						}
+					if ($diff->days === 0 && $diff->h < 23) {
+						$c--;
+						$mtgO->group = $c;
 					}
-					$loops++;
-				} while ($counts > 1 && $loops < 3);
-
-				$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow();
-
-				if ($counts > 0) { // post exists already.
-					$mtgP = reset($mtgP);
-				} elseif ($eventIsPast) {
-					if ($verbose) {
-						echo "<p>Post not found for Meeting $mtgO->mtgId.  As it is in the past, it will not be created.</p>";
-					}
-					continue;
-				} else {
-					if ($verbose) {
-						echo "<p>Post not found for Meeting $mtgO->mtgId.  Creating.</p>";
-					}
-					// create new
-					$mtgP = wp_insert_post([
-						                       'post_type'   => $typeSets->postTypeWithPrefix(),
-						                       'post_title'  => $title,
-						                       'post_name'   => $slug,
-						                       'post_parent' => $post->ID,
-						                       'post_status' => 'publish',
-						                       'meta_input'  => [
-							                       Meeting::MEETING_META_KEY => $mtgO->mtgId
-						                       ]
-					                       ]);
-					$mtgP = get_post($mtgP);
 				}
-
-				$mtgP->post_title = $title;
-				if (!$eventIsPast) {
-					$mtgP->post_content = Utilities::standardizeHtml($inv->description, "meeting-import");
+				$c++;
+			}
+			unset($c);
+			$grouped = [];
+			foreach ($inv->meetings as $mtgO) {
+				if (!isset($grouped[$mtgO->group])) {
+					$grouped[$mtgO->group] = new MeetingArray(involvement:$inv);
 				}
-				$mtgP->post_parent = $post->ID;
-
-				self::doMeetingMetaUpdates($mtgP, $mtgO, !!$inv->showInSites, $verbose);
+				$grouped[$mtgO->group][] = $mtgO;
+			}
 
-				wp_update_post($mtgP);
+			// execute the changes
+			foreach ($grouped as $g) {
 
-				if ($imagePostId > 0) {
-					set_post_thumbnail($mtgP->ID, $imagePostId);
-				} else {
-					delete_post_thumbnail($mtgP->ID);
+				$groupPost = null;
+				$groupingActive = count($g) > 1;
+				if ($groupingActive) {
+					// A meeting group exists. Create a MeetingGroup post
+					$groupPost = self::updateMeeting($g, $inv, $slugFormats, $slugStrategy, $typeSets, $post, $imagePostId, $verbose);
+					if ($groupPost) {
+						$postsToKeep[] = $groupPost->ID;
+					}
 				}
 
-				if ($mtgP->post_name !== $slug) {
-					Utilities::forceSlugUpdate($mtgP->ID, $slug);
+				foreach ($g as $mtgO) {
+					if ($groupingActive) {
+						$mtgO->isGroupMember = true;
+					}
+					$updatedPost = self::updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy, $typeSets, $groupPost ?? $post, $imagePostId, $verbose);
+					if ($updatedPost) {
+						$postsToKeep[] = $updatedPost->ID;
+					}
 				}
-
-				$postsToKeep[] = $mtgP->ID;
 			}
 		} else { // Single and None
 			$post->post_title = $inv->titleToUse;
@@ -3227,6 +3198,128 @@ protected static function updateMeetingsForInvolvement(
 		return $postsToKeep;
 	}
 
+
+	/**
+	 * Update a meeting post, or create it if it doesn't exist.
+	 *
+	 * @param Interfaces\apiMeeting $mtgO
+	 * @param object                $inv
+	 * @param array                 $slugFormats
+	 * @param array                 $slugStrategy
+	 * @param Involvement_PostTypeSettings $typeSets
+	 * @param ?WP_Post              $parentPost
+	 * @param int                   $imagePostId
+	 * @param bool                  $verbose
+	 *
+	 * @return ?WP_Post
+	 */
+	protected static function updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy, $typeSets, $parentPost, $imagePostId, $verbose): ?WP_Post
+	{
+		////////////////////////////
+		// Meeting Title and Slug //
+		////////////////////////////
+
+		$title = $mtgO->name ?? $inv->titleToUse;
+		$slug  = $mtgO->mtgId; // Default slug of the meeting ID -- collision-safe.
+		foreach ($slugFormats as $f) {
+			$s = $mtgO->mtgStartDt->format($f);
+			if ($slugStrategy[$s] == 1) {
+				$slug = $s;
+				break;
+			}
+		}
+
+
+		/////////////////////////////////
+		// Find or Create Meeting Post //
+		/////////////////////////////////
+
+		$loops = 1;
+		do {
+			$mtgP = new WP_Query([
+				                     'post_type'      => $typeSets->postTypeWithPrefix(),
+				                     'post_name'      => $slug,
+				                     'post_parent'    => $parentPost->ID,
+				                     'posts_per_page' => 10,
+				                     'numberposts'    => 10,
+				                     'meta_key'       => Meeting::MEETING_META_KEY,
+				                     'meta_value'     => $mtgO->mtgId,
+				                     'meta_compare'   => '='
+			                     ]);
+
+			$counts = $mtgP->post_count;
+			$mtgP   = $mtgP->get_posts();
+
+			if ($counts > 1) {  // multiple posts match, which isn't great.
+				new TouchPointWP_Exception(
+					"Multiple Posts Exist, Attempting to Remedy Automatically",
+					170007
+				);
+				if ($verbose) {
+					echo "<p><b>Multiple Posts Exist.  An attempt will be made to remove them.</b></p>";
+				}
+
+				for ($i = 1; $i <= $counts; $i++) {
+					wp_delete_post($mtgP[$i]->ID, true);
+				}
+			}
+			$loops++;
+		} while ($counts > 1 && $loops < 3);
+
+		$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < self::updateExpiry();
+
+		if ($counts > 0) { // post exists already.
+			$mtgP = reset($mtgP);
+		} elseif ($eventIsPast) {
+			if ($verbose) {
+				echo "<p>Post not found for Meeting $mtgO->mtgId.  As it is in the past, it will not be created.</p>";
+			}
+			return null;
+		} else {
+			if ($verbose) {
+				echo "<p>Post not found for Meeting $mtgO->mtgId.  Creating.</p>";
+			}
+			// create new
+			$mtgP = wp_insert_post([
+				                       'post_type'   => $typeSets->postTypeWithPrefix(),
+				                       'post_title'  => $title,
+				                       'post_name'   => $slug,
+				                       'post_parent' => $parentPost->ID,
+				                       'post_status' => 'publish',
+				                       'meta_input'  => [
+					                       Meeting::MEETING_META_KEY => $mtgO->mtgId
+				                       ]
+			                       ]);
+			$mtgP = get_post($mtgP);
+		}
+
+		$mtgP->post_title = $title;
+		if (!$eventIsPast) {
+			if (isset($mtgO->isGroupMember) && $mtgO->isGroupMember) {
+				$mtgP->post_content = "";
+			} else {
+				$mtgP->post_content = Utilities::standardizeHtml($inv->description, "meeting-import");
+			}
+		}
+		$mtgP->post_parent = $parentPost->ID;
+
+		self::doMeetingMetaUpdates($mtgP, $mtgO, ! ! $inv->showInSites, $verbose);
+
+		wp_update_post($mtgP);
+
+		if ($imagePostId > 0) {
+			set_post_thumbnail($mtgP->ID, $imagePostId);
+		} else {
+			delete_post_thumbnail($mtgP->ID);
+		}
+
+		if ($mtgP->post_name !== $slug) {
+			Utilities::forceSlugUpdate($mtgP->ID, $slug);
+		}
+
+		return $mtgP;
+	}
+
 	/**
 	 * Update meta fields specific to Meetings, such as start/end date/time.
 	 *
@@ -3250,6 +3343,7 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			delete_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY);
 			delete_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY);
 			delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
+			delete_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER);
 		} else {
 			$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow();
 
@@ -3259,6 +3353,7 @@ protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, boo
 			update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, !!$feature);
 			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
 			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
+			update_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER, 1 * isset($mtgO->isGroupMember));
 
 			if ($mtgO->location !== null && !$eventIsPast) {
 				update_post_meta($mtgP->ID, Meeting::MEETING_LOCATION_META_KEY, $mtgO->location);
diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index 781df731..aaa53f29 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -24,6 +24,7 @@
  * @property-read bool     $useGeo
  * @property-read bool     $hierarchical
  * @property-read bool     $importMeetings
+ * @property-read string   $meetingGroupingMethod
  * @property-read string   $groupBy
  * @property-read string[] $excludeIf
  * @property-read string[] $leaderTypes
@@ -49,6 +50,7 @@ class Involvement_PostTypeSettings
 	protected bool $useGeo = false;
 	protected bool $hierarchical = false;
 	protected bool $importMeetings = false;
+	protected string $meetingGroupingMethod = Meeting::GROUP_NONE;
 	protected string $groupBy = "";
 	protected array $excludeIf = [];
 	protected array $leaderTypes = [];
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 3101fbab..487290f3 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -47,6 +47,11 @@ class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchic
 	public const MEETING_FEAT_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgFeatured";
 	public const MEETING_STATUS_META_KEY = TouchPointWP::SETTINGS_PREFIX . "status";
 	public const MEETING_INV_ID_META_KEY = TouchPointWP::SETTINGS_PREFIX . "mtgInvId";
+	public const MEETING_IS_GROUP_MEMBER = TouchPointWP::SETTINGS_PREFIX . "isGroupMember";
+
+	public const GROUP_NONE = "none";
+	public const GROUP_UNSCHEDULED = "unscheduled";
+	public const GROUP_ALL = "all";
 
 	public const SHORTCODE_GRID = TouchPointWP::SHORTCODE_PREFIX . "Calendar";
 
@@ -283,14 +288,15 @@ public static function getTypeSettings(): Involvement_PostTypeSettings
 	{
 		if (self::$_typeSet == null) {
 			self::$_typeSet = new Involvement_PostTypeSettings((object)[
-				'namePlural'      => _x("Events", "What Meetings should be called, plural.", 'TouchPoint-WP'),
-				'nameSingular'    => _x("Event", "What Meetings should be called, singular.", 'TouchPoint-WP'),
-				'slug'            => TouchPointWP::instance()->settings->mc_slug,
-				'importMeetings'  => true,
-				'useImages'       => true,
-				'useGeo'          => false,
-				'hierarchical'    => true,
-				'postType'        => self::POST_TYPE_WO_PRE
+				'namePlural'            => _x("Events", "What Meetings should be called, plural.", 'TouchPoint-WP'),
+				'nameSingular'          => _x("Event", "What Meetings should be called, singular.", 'TouchPoint-WP'),
+				'slug'                  => TouchPointWP::instance()->settings->mc_slug,
+				'importMeetings'        => true,
+				'useImages'             => true,
+				'useGeo'                => false,
+				'hierarchical'          => true,
+				'postType'              => self::POST_TYPE_WO_PRE,
+				'meetingGroupingMethod' => TouchPointWP::instance()->settings->mc_grouping_method
 			]);
 		}
 		return self::$_typeSet;
@@ -489,23 +495,25 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 			return new StringableArray();
 		}
 
-		$ret = $inv->getActionButtons($context . "_meeting", $btnClass, false, $absoluteLinks, false);
+		$ret = $inv->getActionButtons($context . "_meeting", $btnClass,
+		                              $withTouchPointLink && $this->isMeetingGroup(),
+		                              $absoluteLinks, false);
 
 		if ($this->status() !== self::STATUS_CANCELLED) {
-			if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
-				$ret['register'] = $inv->getRegisterButton($btnClass, $absoluteLinks, $this);
-			}
-
 			if ($inv->getRegistrationType() === RegistrationType::RSVP) {
 				if ($absoluteLinks) {
 					$ret['register'] = $this->getRsvpLink($btnClass);
 				} else {
 					$ret['register'] = $this->getRsvpButton($btnClass);
 				}
+			} else {
+				if (($this->endDt ?? $this->startDt) > Utilities::dateTimeNow()) {
+					$ret['register'] = $inv->getRegisterButton($btnClass, $absoluteLinks, $this);
+				}
 			}
 		}
 
-		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
+		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin() && !$this->isMeetingGroup()) {
 			$tpHost = TouchPointWP::instance()->host();
 			// Translators: %s is the system name.  "TouchPoint" by default.
 			$title  = wp_sprintf(__("Meeting in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
@@ -530,6 +538,11 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		 */
 		return apply_filters("tp_meeting_actions", $ret, $this, $context, $btnClass);
 	}
+
+	public function isMeetingGroup(): bool
+	{
+		return $this->mtgId < 0;
+	}
 	
 	public function isFeatured(): bool
 	{
@@ -803,7 +816,7 @@ public function getRsvpLink(string $btnClass = ""): string
 	 */
 	public static function postIsType(WP_Post $post): bool
 	{
-		return intval(get_post_meta($post->ID, Meeting::MEETING_META_KEY, true)) > 0;
+		return intval(get_post_meta($post->ID, Meeting::MEETING_META_KEY, true)) != 0;
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/MeetingArray.php b/src/TouchPoint-WP/MeetingArray.php
new file mode 100644
index 00000000..381a8599
--- /dev/null
+++ b/src/TouchPoint-WP/MeetingArray.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace tp\TouchPointWP;
+
+if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+	require_once "Interfaces/apiMeeting.php";
+}
+
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use DateTimeInterface;
+use IteratorAggregate;
+use tp\TouchPointWP\Interfaces\apiMeeting;
+
+/**
+ * Class MeetingArray
+ *
+ * A class to hold an array of meetings grouped into a larger event, like a conference.
+ *
+ * @package tp\TouchPointWP
+ *
+ * @property-read string name
+ * @property-read int mtgId
+ * @property-read DateTimeInterface mtgStartDt
+ * @property-read DateTimeInterface mtgEndDt
+ * @property-read ?string location
+ * @property-read int status
+ */
+class MeetingArray implements apiMeeting, IteratorAggregate, ArrayAccess, Countable
+{
+	protected ?\stdClass $_involvement = null;
+	protected array $_meetings = [];
+
+	public function __construct($meetingArray = [], $involvement = null)
+	{
+		$this->_meetings = $meetingArray;
+		$this->_involvement = $involvement;
+	}
+
+	public function __get(string $what)
+	{
+		if ($this->count() < 1) {
+			return null;
+		}
+
+		return match ($what) {
+			'name' => $this->_involvement?->name ?? "",
+			'mtgId' => -1 * $this[0]->mtgId, // Meeting groups have negative meetingIds, which are the negative of the first meeting in the group
+			'mtgStartDt' => $this->mtgStartDt(),
+			'mtgEndDt' => $this->mtgEndDt(),
+			'location' => $this->_involvement?->location ?? null,
+			'status' => $this->status(),
+			default => null,
+		};
+	}
+
+	/**
+	 * Get the first start time of the meetings in the array.
+	 *
+	 * @return DateTimeInterface
+	 */
+	public function mtgStartDt(): DateTimeInterface
+	{
+		$minDate = null;
+		foreach ($this as $meeting) {
+			if ($minDate === null || $meeting->mtgStartDt < $minDate) {
+				$minDate = $meeting->mtgStartDt;
+			}
+		}
+		return $minDate;
+	}
+
+	/**
+	 * Get the last end time (or start time) of the meetings in the array.
+	 *
+	 * @return DateTimeInterface
+	 */
+	public function mtgEndDt(): DateTimeInterface
+	{
+		$maxDate = null;
+		foreach ($this as $meeting) {
+			if ($maxDate === null || ($meeting->mtgEndDt ?? $meeting->mtgStartDt) > $maxDate) {
+				$maxDate = ($meeting->mtgEndDt ?? $meeting->mtgStartDt);
+			}
+		}
+		return $maxDate;
+	}
+
+	/**
+	 * Get the status of the meetings in the array.
+	 *
+	 * @return int
+	 */
+	public function status(): int
+	{
+		$status = 0;
+		foreach ($this as $meeting) {
+			if ($meeting->status > $status) {
+				$status = $meeting->status;
+			}
+		}
+		return $status;
+	}
+
+	/**
+	 * Retrieve an external iterator
+	 *
+	 * @link https://php.net/manual/en/iteratoraggregate.getiterator.php
+	 */
+	public function getIterator(): ArrayIterator
+	{
+		return new ArrayIterator($this->_meetings);
+	}
+
+	/**
+	 * Whether a offset exists
+	 *
+	 * @link https://php.net/manual/en/arrayaccess.offsetexists.php
+	 */
+	public function offsetExists(mixed $offset): bool
+	{
+		return isset($this->_meetings[$offset]);
+	}
+
+	/**
+	 * Offset to retrieve
+	 *
+	 * @link https://php.net/manual/en/arrayaccess.offsetget.php
+	 */
+	public function offsetGet(mixed $offset): mixed
+	{
+		if (isset($this->_meetings[$offset])) {
+			return $this->_meetings[$offset];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Offset to set
+	 *
+	 * @link https://php.net/manual/en/arrayaccess.offsetset.php
+	 */
+	public function offsetSet(mixed $offset, mixed $value): void
+	{
+		if ($offset === null) {
+			$this->_meetings[] = $value;
+		} else {
+			$this->_meetings[$offset] = $value;
+		}
+	}
+
+	/**
+	 * Offset to unset
+	 *
+	 * @link https://php.net/manual/en/arrayaccess.offsetunset.php
+	 */
+	public function offsetUnset(mixed $offset): void
+	{
+		if (isset($this->_meetings[$offset])) {
+			unset($this->_meetings[$offset]);
+		}
+	}
+
+	/**
+	 * Count meetings in the array
+	 *
+	 * @link https://php.net/manual/en/countable.count.php
+	 */
+	public function count(): int
+	{
+		return count($this->_meetings);
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 9e7d4d89..c1a56d3b 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -81,6 +81,7 @@
  * @property-read int          mc_future_days     Number of days into the future to import.
  * @property-read int          mc_archive_days    Number of days to wait to move something to history.
  * @property-read int|string   mc_hist_days       Number of days of history to keep.  (Can be '' if module isn't enabled.)
+ * @property-read string       mc_grouping_method Whether and how to collect meetings into groups.
  *
  * @property-read string       rc_name_plural     What resident codes should be called, plural (e.g. "Resident Codes" or "Zones")
  * @property-read string       rc_name_singular   What a resident code should be called, singular (e.g. "Resident Code" or "Zone")
@@ -458,7 +459,6 @@ private function settingsFields(bool|string $includeDetail = false): array
 					),
 					'type'        => 'checkbox',
 					'default'     => 'on',
-					'autoload'    => false,
 				],
 			],
 		];
@@ -935,7 +935,24 @@ private function settingsFields(bool|string $includeDetail = false): array
 						'default'     => 1825,
 						'placeholder' => 1825,
 						'max'         => 3650,
-						'min'         => 0
+						'min'         => 0,
+						'auto'
+					],
+					[
+						'id'          => 'mc_grouping_method',
+						'label'       => __("Collect Meetings for Larger Events", "TouchPoint-WP"),
+						'description' => __("Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours.", "TouchPoint-WP"),
+						'type'        => 'select',
+						'options'     => [
+							Meeting::GROUP_NONE => __("No Collecting", "TouchPoint-WP"),
+							Meeting::GROUP_UNSCHEDULED => __(
+								"Collect Meetings only from Involvements without Schedules",
+								"TouchPoint-WP"
+							),
+							Meeting::GROUP_ALL => __("Collect Meetings for all Involvements", "TouchPoint-WP"),
+						],
+						'default'     => Meeting::GROUP_UNSCHEDULED,
+						'autoload'    => false
 					],
 				],
 			];
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index c23013c1..fe88f491 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -103,6 +103,19 @@
             </th>
             <td colspan="2"><input id="it-importMeetings" type="checkbox" data-bind="checked: importMeetings, attr: { id: 'it-' + slug() + '-importMeetings'}" /></td>
         </tr>
+
+        <tr data-bind="visible: importMeetings">
+            <th>
+                <label for="it-meetingGroupingMethod" data-bind="attr: { for: 'it-' + slug() + '-meetingGroupingMethod'}"><?php _e("Collect Meetings for Larger Events", "TouchPoint-WP"); ?></label>
+            </th>
+            <td colspan="2">
+                <select id="it-meetingGroupingMethod" data-bind="value: meetingGroupingMethod, attr: { id: 'it-' + slug() + '-meetingGroupingMethod'}">
+                    <option value="<?php echo Meeting::GROUP_NONE; ?>"><?php _e("No Collecting", "TouchPoint-WP"); ?></option>
+                    <option value="<?php echo Meeting::GROUP_UNSCHEDULED; ?>"><?php _e("Collect Meetings only from Involvements without Schedules", "TouchPoint-WP"); ?></option>
+                    <option value="<?php echo Meeting::GROUP_ALL; ?>"><?php _e("Collect Meetings for all Involvements", "TouchPoint-WP"); ?></option>
+                </select>
+                <br /><label for="it-meetingGroupingMethod" data-bind="attr: { for: 'it-' + slug() + '-meetingGroupingMethod'}"><?php _e("Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours.", "TouchPoint-WP"); ?></label></td>
+        </tr>
         <?php } ?>
 
         <tr>
@@ -302,6 +315,7 @@ function InvType(data) {
         this.excludeIf = ko.observable(data.excludeIf ?? []);
         this.hierarchical = ko.observable(data.hierarchical ?? false);
         this.importMeetings = ko.observable(data.importMeetings ?? false);
+        this.meetingGroupingMethod = ko.observable(data.meetingGroupingMethod ?? <?php echo Meeting::GROUP_NONE ?>);
         this.groupBy = ko.observable(data.groupBy ?? "");
         this.leaderTypes = ko.observableArray(data.leaderTypes ?? []);
         this.hostTypes = ko.observableArray(data.hostTypes ?? []);

From 92d4a15eb4977c17671065228debc9dfc873be50 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 23 Apr 2025 15:13:36 -0400
Subject: [PATCH 268/423] Fixed slugs. Closes #225

---
 src/TouchPoint-WP/Involvement.php  | 163 +++++++++++++++++++----------
 src/TouchPoint-WP/Meeting.php      |  25 +++--
 src/TouchPoint-WP/MeetingArray.php |   3 +
 src/TouchPoint-WP/Utilities.php    |  20 ++++
 4 files changed, 150 insertions(+), 61 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 5a305a9c..c56ef334 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2000,6 +2000,30 @@ public static function fromPost(WP_Post $post): ?Involvement
 	}
 
 
+	/**
+	 * Create an Involvement object from an object from its involvement ID.
+	 *
+	 * @param string $postType
+	 * @param int    $involvementId
+	 *
+	 * @return ?Involvement
+	 *
+	 * @throws TouchPointWP_Exception If the involvement can't be created, an exception is thrown.
+	 */
+	public static function fromInvolvementId(string $postType, int $involvementId): ?Involvement
+	{
+		if ( ! isset(self::$_instances[$involvementId])) {
+			$post = self::getWpPostByInvolvementId($postType, $involvementId);
+			if ($post === null) {
+				return null;
+			}
+			self::$_instances[$involvementId] = Involvement::fromPost($post);
+		}
+
+		return self::$_instances[$involvementId];
+	}
+
+
 	/**
 	 * Handle API requests
 	 *
@@ -2739,7 +2763,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 	/**
 	 * Does the heavy-lifting of updating a given post, with the given information.
 	 *
-	 * @param mixed                        $post TODO give a firm type
+	 * @param mixed                        $post
 	 * @param object                       $inv
 	 * @param Involvement_PostTypeSettings $typeSets
 	 * @param bool                         $verbose
@@ -3058,6 +3082,67 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 		return $postsToKeep;
 	}
 
+	/**
+	 * Compute the slug strategy for a set of meetings.
+	 *
+	 * @param apiMeeting[] $set An array of Meeting objects, grouped by their start date.
+	 *
+	 * @noinspection PhpUndefinedClassInspection
+	 */
+	protected static function computeSlugs(iterable $set, $inv, $includeTitle = false): void
+	{
+		// Slugs for groups (or ungrouped meetings)
+		$slugStrategy = [];
+
+		$slugFormats = [ // Define possible slugs, in increasing specificity.
+			//'Y',  Causes issues with Core. https://wordpress.stackexchange.com/a/367757/185189
+			'Y-m',
+			'Y-m-d',
+			'Y-m-d-g',
+			'Y-m-d-ga',
+			'Y-m-d-gia',
+			'Y-m-d-His',
+		];
+		foreach ($set as $mtgO) {
+			$mtgO->titleToUse = $mtgO->name ?? $inv->titleToUse;
+			if ($includeTitle && isset($mtgO->titleToUse)) {
+				$s = Utilities::stringToSlug($mtgO->titleToUse);
+				if (!isset($slugStrategy[$s])) {
+					$slugStrategy[$s] = 1;
+				} else {
+					$slugStrategy[$s]++;
+				}
+			}
+			foreach ($slugFormats as $f) {
+				$s = $mtgO->mtgStartDt->format($f);
+				if (!isset($slugStrategy[$s])) {
+					$slugStrategy[$s] = 1;
+				} else {
+					$slugStrategy[$s]++;
+				}
+			}
+		}
+
+		foreach ($set as $mtgO) {
+			$slug  = $mtgO->mtgId; // Default slug of the meeting ID -- collision-safe.
+			if ($includeTitle && isset($mtgO->titleToUse)) {
+				$s = Utilities::stringToSlug($mtgO->titleToUse);
+				if ($slugStrategy[$s] == 1) {
+					$mtgO->slugToUse = $s;
+					continue;
+				}
+			}
+			foreach ($slugFormats as $f) {
+				$s = $mtgO->mtgStartDt->format($f);
+				if ($slugStrategy[$s] == 1) {
+					$slug = $s;
+					break;
+				}
+			}
+			$mtgO->slugToUse = $slug;
+		}
+	}
+
 	/**
 	 * @param WP_Post|object               $post  The parent post, which could be a group or Meeting.
 	 * @param object                       $inv   The involvement object from the API.
@@ -3088,35 +3173,6 @@ protected static function updateMeetingsForInvolvement(
 			default => self::MEETING_STRATEGY_MULTIPLE,
 		};
 
-		////////////////////
-		// Title and Slug //
-		////////////////////
-
-		$slugStrategy = [];
-		$slugFormats = [ // Define possible slugs, in increasing specificity.
-			//'Y',  Causes issues with Core. https://wordpress.stackexchange.com/a/367757/185189
-			'Y-m',
-			'Y-m-d',
-			'Y-m-d-g',
-			'Y-m-d-ga',
-			'Y-m-d-gia',
-			'Y-m-d-His',
-		];
-		if ($strategy === self::MEETING_STRATEGY_SINGLE) {
-			$inv->titleToUse = $inv->meetings[0]->name ?? $inv->titleToUse;
-		} elseif ($strategy === self::MEETING_STRATEGY_MULTIPLE) {
-			foreach ($inv->meetings as $mtgO) {
-				foreach ($slugFormats as $f) {
-					$s = $mtgO->mtgStartDt->format($f);
-					if (!isset($slugStrategy[$s])) {
-						$slugStrategy[$s] = 1;
-					} else {
-						$slugStrategy[$s]++;
-					}
-				}
-			}
-		}
-
 		$postsToKeep = [];
 
 		if ($strategy === self::MEETING_STRATEGY_MULTIPLE) {
@@ -3155,30 +3211,41 @@ protected static function updateMeetingsForInvolvement(
 				$grouped[$mtgO->group][] = $mtgO;
 			}
 
+			self::computeSlugs($grouped, $inv);
+
 			// execute the changes
 			foreach ($grouped as $g) {
 
 				$groupPost = null;
 				$groupingActive = count($g) > 1;
+
+				// A Meeting group, if it exists.
 				if ($groupingActive) {
-					// A meeting group exists. Create a MeetingGroup post
-					$groupPost = self::updateMeeting($g, $inv, $slugFormats, $slugStrategy, $typeSets, $post, $imagePostId, $verbose);
+					$groupPost = self::updateMeeting($g, $inv, $typeSets, $post, $imagePostId, $verbose);
 					if ($groupPost) {
 						$postsToKeep[] = $groupPost->ID;
 					}
+					self::computeSlugs($g, $inv, true);
 				}
 
+				// Meetings within group
 				foreach ($g as $mtgO) {
 					if ($groupingActive) {
 						$mtgO->isGroupMember = true;
+					} else {
+						$mtgO->slugToUse    = $g->slugToUse;
+						$mtgO->titleToUse   = $g->titleToUse;
 					}
-					$updatedPost = self::updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy, $typeSets, $groupPost ?? $post, $imagePostId, $verbose);
+					$updatedPost = self::updateMeeting($mtgO, $inv, $typeSets, $groupPost ?? $post, $imagePostId, $verbose);
 					if ($updatedPost) {
 						$postsToKeep[] = $updatedPost->ID;
 					}
 				}
 			}
 		} else { // Single and None
+			if ($strategy == self::MEETING_STRATEGY_SINGLE) {
+				$inv->titleToUse = $inv->meetings[0]->name ?? $inv->titleToUse;
+			}
 			$post->post_title = $inv->titleToUse;
 
 			// TODO resolve $post declarations.
@@ -3213,32 +3280,18 @@ protected static function updateMeetingsForInvolvement(
 	 *
 	 * @return ?WP_Post
 	 */
-	protected static function updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy, $typeSets, $parentPost, $imagePostId, $verbose): ?WP_Post
+	protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $imagePostId, $verbose): ?WP_Post
 	{
-		////////////////////////////
-		// Meeting Title and Slug //
-		////////////////////////////
-
-		$title = $mtgO->name ?? $inv->titleToUse;
-		$slug  = $mtgO->mtgId; // Default slug of the meeting ID -- collision-safe.
-		foreach ($slugFormats as $f) {
-			$s = $mtgO->mtgStartDt->format($f);
-			if ($slugStrategy[$s] == 1) {
-				$slug = $s;
-				break;
-			}
-		}
-
-
 		/////////////////////////////////
 		// Find or Create Meeting Post //
 		/////////////////////////////////
 
+		var_dump($mtgO);
+
 		$loops = 1;
 		do {
 			$mtgP = new WP_Query([
 				                     'post_type'      => $typeSets->postTypeWithPrefix(),
-				                     'post_name'      => $slug,
 				                     'post_parent'    => $parentPost->ID,
 				                     'posts_per_page' => 10,
 				                     'numberposts'    => 10,
@@ -3282,8 +3335,8 @@ protected static function updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy
 			// create new
 			$mtgP = wp_insert_post([
 				                       'post_type'   => $typeSets->postTypeWithPrefix(),
-				                       'post_title'  => $title,
-				                       'post_name'   => $slug,
+				                       'post_title'  => $mtgO->titleToUse,
+				                       'post_name'   => $mtgO->slugToUse,
 				                       'post_parent' => $parentPost->ID,
 				                       'post_status' => 'publish',
 				                       'meta_input'  => [
@@ -3293,7 +3346,7 @@ protected static function updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy
 			$mtgP = get_post($mtgP);
 		}
 
-		$mtgP->post_title = $title;
+		$mtgP->post_title = $mtgO->titleToUse;
 		if (!$eventIsPast) {
 			if (isset($mtgO->isGroupMember) && $mtgO->isGroupMember) {
 				$mtgP->post_content = "";
@@ -3313,8 +3366,8 @@ protected static function updateMeeting($mtgO, $inv, $slugFormats, $slugStrategy
 			delete_post_thumbnail($mtgP->ID);
 		}
 
-		if ($mtgP->post_name !== $slug) {
-			Utilities::forceSlugUpdate($mtgP->ID, $slug);
+		if ($mtgP->post_name !== $mtgO->slugToUse) {
+			Utilities::forceSlugUpdate($mtgP->ID, $mtgO->slugToUse);
 		}
 
 		return $mtgP;
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 487290f3..5cdd5d55 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -350,9 +350,9 @@ public function involvement(): Involvement
 		if (Involvement::postIsType($this->post)) {
 			return Involvement::fromPost($this->post);
 		}
-		$parent = get_post_parent($this->post_id);
-		if (Involvement::postIsType($parent)) {
-			return Involvement::fromPost(get_post($parent));
+		$inv = Involvement::fromInvolvementId($this->post->post_type, $this->involvementId());
+		if ($inv) {
+			return $inv;
 		}
 		throw new TouchPointWP_Exception("Meeting is not associated with an Involvement.", 171002);
 	}
@@ -365,10 +365,19 @@ public function involvement(): Involvement
 	 *
 	 * In cases where a meeting post is also an involvement post, it will return the involvement, which has the same post_id.
 	 *
-	 * @return ?Involvement
+	 * @return ?Involvement|Meeting
 	 */
-	public function getParent(): ?Involvement
+	public function getParent(): Involvement|Meeting|null
 	{
+		if (!$this->isMeetingGroup() && $this->isMeetingGroupMember()) {
+			$parent = get_post($this->post->post_parent);
+			if ($parent) {
+				try {
+					return Meeting::fromPost($parent);
+				} catch (TouchPointWP_Exception) {
+				}
+			}
+		}
 		try {
 			return $this->involvement();
 		} catch (TouchPointWP_Exception) {
@@ -452,7 +461,6 @@ public function notableAttributes(array $exclude = []): array
 		}
 
 
-
 		$attrs = $this->processAttributeExclusions($attrs, $exclude);
 
 		/**
@@ -543,6 +551,11 @@ public function isMeetingGroup(): bool
 	{
 		return $this->mtgId < 0;
 	}
+
+	public function isMeetingGroupMember(): bool
+	{
+		return !!get_post_meta($this->post_id, Meeting::MEETING_IS_GROUP_MEMBER, true);
+	}
 	
 	public function isFeatured(): bool
 	{
diff --git a/src/TouchPoint-WP/MeetingArray.php b/src/TouchPoint-WP/MeetingArray.php
index 381a8599..85ceb7c8 100644
--- a/src/TouchPoint-WP/MeetingArray.php
+++ b/src/TouchPoint-WP/MeetingArray.php
@@ -32,6 +32,9 @@ class MeetingArray implements apiMeeting, IteratorAggregate, ArrayAccess, Counta
 	protected ?\stdClass $_involvement = null;
 	protected array $_meetings = [];
 
+	public string $slugToUse = "";
+	public string $titleToUse = "";
+
 	public function __construct($meetingArray = [], $involvement = null)
 	{
 		$this->_meetings = $meetingArray;
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 5b4776da..a44d5f1d 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -762,6 +762,26 @@ public static function forceSlugUpdate($postId, $newSlug): void
 		$wpdb->update($wpdb->posts, ['post_name' => $newSlug], ['ID' => $postId]);
 	}
 
+	/**
+	 * Convert a string to something that's acceptable for use as a slug.
+	 *
+	 * @param string $s
+	 *
+	 * @return string
+	 */
+	public static function stringToSlug(string $s): string
+	{
+		// split $s to only include anything before punctuation
+		$pos = strcspn($s, ".,:;!|?");
+		if ($pos > 0) {
+			$s = substr($s, 0, $pos);
+		}
+		$s = trim($s);
+		$s = preg_replace("/[^a-zA-Z0-9]/", "-", $s);
+		$s = strtolower($s);
+		return preg_replace("/-+/", "-", $s);
+	}
+
 	/**
 	 * Returns true if a new release is available.
 	 *

From fdc255713fd562cd8402bcad4e930c3046fb69d2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 23 Apr 2025 15:16:40 -0400
Subject: [PATCH 269/423] i18n for #225

---
 i18n/TouchPoint-WP-es_ES.po | 321 ++++++++++++++++++-----------------
 i18n/TouchPoint-WP.pot      | 323 +++++++++++++++++++-----------------
 2 files changed, 347 insertions(+), 297 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index e689f881..ce4cb169 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:988
+#: src/TouchPoint-WP/Settings.php:1005
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -63,118 +63,118 @@ msgstr "Divisiones a Importar"
 msgid "Import Hierarchically (Parent-Child Relationships)"
 msgstr "Importar jerárquicamente (relaciones padre-hijo)"
 
-#: src/templates/admin/invKoForm.php:110
+#: src/templates/admin/invKoForm.php:123
 msgid "Use Geographic Location"
 msgstr "Usar ubicación geográfica"
 
-#: src/templates/admin/invKoForm.php:116
+#: src/templates/admin/invKoForm.php:129
 msgid "Exclude Involvements if"
 msgstr "Excluir participaciones si"
 
-#: src/templates/admin/invKoForm.php:120
+#: src/templates/admin/invKoForm.php:133
 msgid "Involvement is Closed"
 msgstr "La participación está cerrada"
 
-#: src/templates/admin/invKoForm.php:124
+#: src/templates/admin/invKoForm.php:137
 msgid "Involvement is a Child Involvement"
 msgstr "La participación es una participación infantil"
 
-#: src/templates/admin/invKoForm.php:146
+#: src/templates/admin/invKoForm.php:159
 msgid "Leader Member Types"
 msgstr "Tipos de miembros de líder"
 
 #: src/templates/admin/invKoForm.php:63
-#: src/templates/admin/invKoForm.php:149
-#: src/templates/admin/invKoForm.php:165
-#: src/templates/admin/invKoForm.php:318
+#: src/templates/admin/invKoForm.php:162
+#: src/templates/admin/invKoForm.php:178
+#: src/templates/admin/invKoForm.php:332
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:763
+#: src/TouchPoint-WP/Meeting.php:789
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/templates/admin/invKoForm.php:161
+#: src/templates/admin/invKoForm.php:174
 msgid "Host Member Types"
 msgstr "Tipos de miembros anfitriones"
 
-#: src/templates/admin/invKoForm.php:177
+#: src/templates/admin/invKoForm.php:190
 msgid "Default Grouping"
 msgstr "Agrupación Predeterminada"
 
-#: src/templates/admin/invKoForm.php:181
+#: src/templates/admin/invKoForm.php:194
 msgid "No Grouping"
 msgstr "Sin agrupar"
 
-#: src/templates/admin/invKoForm.php:182
+#: src/templates/admin/invKoForm.php:195
 msgid "Upcoming / Current"
 msgstr "Próximo / Actual"
 
-#: src/templates/admin/invKoForm.php:183
+#: src/templates/admin/invKoForm.php:196
 msgid "Current / Upcoming"
 msgstr "Actual / Próximo"
 
-#: src/templates/admin/invKoForm.php:191
+#: src/templates/admin/invKoForm.php:204
 msgid "Default Filters"
 msgstr "Filtros predeterminados"
 
-#: src/templates/admin/invKoForm.php:223
+#: src/templates/admin/invKoForm.php:236
 msgid "Gender"
 msgstr "Género"
 
-#: src/templates/admin/invKoForm.php:237
+#: src/templates/admin/invKoForm.php:250
 #: src/TouchPoint-WP/Involvement.php:1872
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr "Día laborable"
 
-#: src/templates/admin/invKoForm.php:241
+#: src/templates/admin/invKoForm.php:254
 #: src/TouchPoint-WP/Involvement.php:1898
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr "Hora del día"
 
-#: src/templates/admin/invKoForm.php:245
+#: src/templates/admin/invKoForm.php:258
 msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
-#: src/templates/admin/invKoForm.php:249
+#: src/templates/admin/invKoForm.php:262
 #: src/TouchPoint-WP/Taxonomies.php:837
 msgid "Age Group"
 msgstr "Grupo de edad"
 
-#: src/templates/admin/invKoForm.php:254
+#: src/templates/admin/invKoForm.php:267
 msgid "Task Owner"
 msgstr "Propietario de la tarea"
 
-#: src/templates/admin/invKoForm.php:261
+#: src/templates/admin/invKoForm.php:274
 msgid "Contact Leader Task Keywords"
 msgstr "Palabras clave de la tarea del líder de contacto"
 
-#: src/templates/admin/invKoForm.php:272
+#: src/templates/admin/invKoForm.php:285
 msgid "Join Task Keywords"
 msgstr "Unirse a las palabras clave de la tarea"
 
-#: src/templates/admin/invKoForm.php:288
+#: src/templates/admin/invKoForm.php:301
 msgid "Add Involvement Post Type"
 msgstr "Agregar tipo de publicación de participación"
 
-#: src/templates/admin/invKoForm.php:295
+#: src/templates/admin/invKoForm.php:308
 msgid "Small Group"
 msgstr "Grupo Pequeño"
 
-#: src/templates/admin/invKoForm.php:296
+#: src/templates/admin/invKoForm.php:309
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:442
+#: src/templates/admin/invKoForm.php:456
 msgid "Select..."
 msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2118
+#: src/TouchPoint-WP/Involvement.php:2142
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
@@ -224,53 +224,53 @@ msgstr "Cualquier"
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3628
+#: src/TouchPoint-WP/Involvement.php:3741
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3631
+#: src/TouchPoint-WP/Involvement.php:3744
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3708
+#: src/TouchPoint-WP/Involvement.php:3821
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3778
-#: src/TouchPoint-WP/Involvement.php:3837
+#: src/TouchPoint-WP/Involvement.php:3891
+#: src/TouchPoint-WP/Involvement.php:3950
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3784
+#: src/TouchPoint-WP/Involvement.php:3897
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3788
+#: src/TouchPoint-WP/Involvement.php:3901
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3793
+#: src/TouchPoint-WP/Involvement.php:3906
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3796
+#: src/TouchPoint-WP/Involvement.php:3909
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3799
+#: src/TouchPoint-WP/Involvement.php:3912
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3802
+#: src/TouchPoint-WP/Involvement.php:3915
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3828
+#: src/TouchPoint-WP/Involvement.php:3941
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3725
+#: src/TouchPoint-WP/Involvement.php:3838
 #: src/TouchPoint-WP/Partner.php:1345
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -296,8 +296,8 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:762
-#: src/TouchPoint-WP/Meeting.php:783
+#: src/TouchPoint-WP/Meeting.php:788
+#: src/TouchPoint-WP/Meeting.php:809
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr "RSVP"
@@ -339,107 +339,107 @@ msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/Settings.php:260
+#: src/TouchPoint-WP/Settings.php:261
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/Settings.php:261
+#: src/TouchPoint-WP/Settings.php:262
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/Settings.php:265
+#: src/TouchPoint-WP/Settings.php:266
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/Settings.php:266
+#: src/TouchPoint-WP/Settings.php:267
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:277
+#: src/TouchPoint-WP/Settings.php:278
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/Settings.php:278
+#: src/TouchPoint-WP/Settings.php:279
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:285
+#: src/TouchPoint-WP/Settings.php:286
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/Settings.php:286
+#: src/TouchPoint-WP/Settings.php:287
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:307
+#: src/TouchPoint-WP/Settings.php:308
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/Settings.php:308
+#: src/TouchPoint-WP/Settings.php:309
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/Settings.php:318
+#: src/TouchPoint-WP/Settings.php:319
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:319
+#: src/TouchPoint-WP/Settings.php:320
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/Settings.php:340
+#: src/TouchPoint-WP/Settings.php:341
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/Settings.php:341
+#: src/TouchPoint-WP/Settings.php:342
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:351
+#: src/TouchPoint-WP/Settings.php:352
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:352
+#: src/TouchPoint-WP/Settings.php:353
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/Settings.php:367
+#: src/TouchPoint-WP/Settings.php:368
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:379
+#: src/TouchPoint-WP/Settings.php:380
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:392
+#: src/TouchPoint-WP/Settings.php:393
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:393
+#: src/TouchPoint-WP/Settings.php:394
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/Settings.php:408
+#: src/TouchPoint-WP/Settings.php:409
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:409
+#: src/TouchPoint-WP/Settings.php:410
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/Settings.php:420
+#: src/TouchPoint-WP/Settings.php:421
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:421
+#: src/TouchPoint-WP/Settings.php:422
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/Settings.php:432
+#: src/TouchPoint-WP/Settings.php:433
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:433
+#: src/TouchPoint-WP/Settings.php:434
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
@@ -669,128 +669,128 @@ msgstr "Usar hoja de estilo de estandarización"
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/Settings.php:946
+#: src/TouchPoint-WP/Settings.php:963
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/Settings.php:947
+#: src/TouchPoint-WP/Settings.php:964
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:951
+#: src/TouchPoint-WP/Settings.php:968
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/Settings.php:952
+#: src/TouchPoint-WP/Settings.php:969
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:963
+#: src/TouchPoint-WP/Settings.php:980
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:964
+#: src/TouchPoint-WP/Settings.php:981
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:975
+#: src/TouchPoint-WP/Settings.php:992
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/Settings.php:976
+#: src/TouchPoint-WP/Settings.php:993
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/Settings.php:989
+#: src/TouchPoint-WP/Settings.php:1006
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/Settings.php:1040
+#: src/TouchPoint-WP/Settings.php:1057
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Settings.php:1041
+#: src/TouchPoint-WP/Settings.php:1058
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:1048
+#: src/TouchPoint-WP/Settings.php:1065
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1049
+#: src/TouchPoint-WP/Settings.php:1066
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1060
+#: src/TouchPoint-WP/Settings.php:1077
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:1061
+#: src/TouchPoint-WP/Settings.php:1078
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1072
+#: src/TouchPoint-WP/Settings.php:1089
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/Settings.php:1073
+#: src/TouchPoint-WP/Settings.php:1090
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/Settings.php:1089
+#: src/TouchPoint-WP/Settings.php:1106
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/Settings.php:1090
+#: src/TouchPoint-WP/Settings.php:1107
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/Settings.php:1094
+#: src/TouchPoint-WP/Settings.php:1111
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1095
+#: src/TouchPoint-WP/Settings.php:1112
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1106
+#: src/TouchPoint-WP/Settings.php:1123
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/Settings.php:1107
+#: src/TouchPoint-WP/Settings.php:1124
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1118
+#: src/TouchPoint-WP/Settings.php:1135
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/Settings.php:1119
+#: src/TouchPoint-WP/Settings.php:1136
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/Settings.php:1297
+#: src/TouchPoint-WP/Settings.php:1314
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/Settings.php:1351
-#: src/TouchPoint-WP/Settings.php:1352
+#: src/TouchPoint-WP/Settings.php:1368
+#: src/TouchPoint-WP/Settings.php:1369
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1400
+#: src/TouchPoint-WP/Settings.php:1417
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/Settings.php:1645
+#: src/TouchPoint-WP/Settings.php:1662
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/Settings.php:1767
+#: src/TouchPoint-WP/Settings.php:1784
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1818
+#: src/TouchPoint-WP/Settings.php:1835
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -1096,15 +1096,15 @@ msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/templates/admin/invKoForm.php:128
+#: src/templates/admin/invKoForm.php:141
 msgid "Based on Involvement setting in TouchPoint"
 msgstr "Basado en la configuración de participación en TouchPoint"
 
-#: src/templates/admin/invKoForm.php:128
+#: src/templates/admin/invKoForm.php:141
 msgid "Involvement does not meet weekly"
 msgstr "La participación no se reúne semanalmente"
 
-#: src/templates/admin/invKoForm.php:132
+#: src/templates/admin/invKoForm.php:145
 msgid "Involvement does not have a Schedule"
 msgstr "La participación no tiene horario"
 
@@ -1140,12 +1140,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/Settings.php:1015
-#: src/TouchPoint-WP/Settings.php:1021
+#: src/TouchPoint-WP/Settings.php:1032
+#: src/TouchPoint-WP/Settings.php:1038
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1016
+#: src/TouchPoint-WP/Settings.php:1033
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1249,56 +1249,56 @@ msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3649
+#: src/TouchPoint-WP/Involvement.php:3762
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/Settings.php:380
+#: src/TouchPoint-WP/Settings.php:381
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
-#: src/templates/admin/invKoForm.php:136
+#: src/templates/admin/invKoForm.php:149
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr "La participación tiene un tipo de registro de \"No Online Registration\""
 
-#: src/templates/admin/invKoForm.php:140
+#: src/templates/admin/invKoForm.php:153
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2059
+#: src/TouchPoint-WP/Involvement.php:2083
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2069
+#: src/TouchPoint-WP/Involvement.php:2093
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2088
+#: src/TouchPoint-WP/Involvement.php:2112
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:689
+#: src/TouchPoint-WP/Meeting.php:715
 #: src/TouchPoint-WP/TouchPointWP.php:1065
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:717
+#: src/TouchPoint-WP/Meeting.php:743
 #: src/TouchPoint-WP/TouchPointWP.php:370
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:727
+#: src/TouchPoint-WP/Meeting.php:753
 #: src/TouchPoint-WP/TouchPointWP.php:379
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:3945
-#: src/TouchPoint-WP/Involvement.php:4050
+#: src/TouchPoint-WP/Involvement.php:4058
+#: src/TouchPoint-WP/Involvement.php:4163
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/Settings.php:329
+#: src/TouchPoint-WP/Settings.php:330
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1363,7 +1363,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/Settings.php:330
+#: src/TouchPoint-WP/Settings.php:331
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1451,7 +1451,7 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4037
+#: src/TouchPoint-WP/Involvement.php:4150
 #: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1460,7 +1460,7 @@ msgstr "Contacto prohibido."
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/Settings.php:368
+#: src/TouchPoint-WP/Settings.php:369
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
@@ -1476,7 +1476,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4027
+#: src/TouchPoint-WP/Involvement.php:4140
 #: src/TouchPoint-WP/Person.php:1861
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1486,21 +1486,21 @@ msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:286
+#: src/TouchPoint-WP/Meeting.php:291
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:287
+#: src/TouchPoint-WP/Meeting.php:292
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Settings.php:296
+#: src/TouchPoint-WP/Settings.php:297
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:297
+#: src/TouchPoint-WP/Settings.php:298
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
@@ -1520,16 +1520,16 @@ msgstr "Archivo después de días"
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/Settings.php:1000
-#: src/TouchPoint-WP/Settings.php:1131
+#: src/TouchPoint-WP/Settings.php:1017
+#: src/TouchPoint-WP/Settings.php:1148
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1001
+#: src/TouchPoint-WP/Settings.php:1018
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Settings.php:1132
+#: src/TouchPoint-WP/Settings.php:1149
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1548,7 +1548,7 @@ msgstr "hoy"
 msgid "Tomorrow"
 msgstr "mañana"
 
-#: src/templates/admin/invKoForm.php:405
+#: src/templates/admin/invKoForm.php:419
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
@@ -1556,11 +1556,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:566
+#: src/TouchPoint-WP/Meeting.php:592
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:567
+#: src/TouchPoint-WP/Meeting.php:593
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1594,16 +1594,16 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3737
+#: src/TouchPoint-WP/Involvement.php:3850
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:439
+#: src/TouchPoint-WP/Meeting.php:454
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:511
+#: src/TouchPoint-WP/Meeting.php:527
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
@@ -1668,7 +1668,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:568
+#: src/TouchPoint-WP/Meeting.php:594
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
@@ -1683,7 +1683,7 @@ msgstr "Aún no se admite la creación de un objeto de participación a partir d
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:101
+#: src/TouchPoint-WP/Meeting.php:106
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
@@ -1784,15 +1784,15 @@ msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el ca
 msgid "This %s has been Cancelled."
 msgstr "Este %s ha sido Cancelado."
 
-#: src/templates/admin/invKoForm.php:197
+#: src/templates/admin/invKoForm.php:210
 msgid "Division"
 msgstr "Division"
 
-#: src/templates/admin/invKoForm.php:204
+#: src/templates/admin/invKoForm.php:217
 msgid "Resident Code"
 msgstr "Código de Residente"
 
-#: src/templates/admin/invKoForm.php:211
+#: src/templates/admin/invKoForm.php:224
 msgid "Campus"
 msgstr "Campus"
 
@@ -1805,11 +1805,11 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:443
+#: src/TouchPoint-WP/Settings.php:444
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/Settings.php:444
+#: src/TouchPoint-WP/Settings.php:445
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
@@ -1846,11 +1846,11 @@ msgstr "Ayer"
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
 
-#: src/TouchPoint-WP/Settings.php:454
+#: src/TouchPoint-WP/Settings.php:455
 msgid "List Site in Directory"
 msgstr "Listar sitio en directorio"
 
-#: src/TouchPoint-WP/Settings.php:455
+#: src/TouchPoint-WP/Settings.php:456
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
@@ -1874,3 +1874,28 @@ msgstr "Cambiar enlaces de perfil"
 #: src/TouchPoint-WP/TouchPointWP.php:2334
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
+
+#: src/templates/admin/invKoForm.php:109
+#: src/TouchPoint-WP/Settings.php:943
+msgid "Collect Meetings for Larger Events"
+msgstr "Recopilar reuniones para eventos más grandes"
+
+#: src/templates/admin/invKoForm.php:113
+#: src/TouchPoint-WP/Settings.php:947
+msgid "No Collecting"
+msgstr "sin recoger"
+
+#: src/templates/admin/invKoForm.php:114
+#: src/TouchPoint-WP/Settings.php:948
+msgid "Collect Meetings only from Involvements without Schedules"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:115
+#: src/TouchPoint-WP/Settings.php:952
+msgid "Collect Meetings for all Involvements"
+msgstr "Recopilar reuniones solo de participaciones sin horarios"
+
+#: src/templates/admin/invKoForm.php:117
+#: src/TouchPoint-WP/Settings.php:944
+msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
+msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 9e22d613..030b0d42 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-04-23T12:15:45+00:00\n"
+"POT-Creation-Date: 2025-04-23T19:14:47+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:988
+#: src/TouchPoint-WP/Settings.php:1005
 msgid "Divisions to Import"
 msgstr ""
 
@@ -67,11 +67,11 @@ msgid "Import Campuses"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:63
-#: src/templates/admin/invKoForm.php:149
-#: src/templates/admin/invKoForm.php:165
-#: src/templates/admin/invKoForm.php:318
+#: src/templates/admin/invKoForm.php:162
+#: src/templates/admin/invKoForm.php:178
+#: src/templates/admin/invKoForm.php:332
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:763
+#: src/TouchPoint-WP/Meeting.php:789
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:192
 #: assets/js/base-defer.js:1133
@@ -102,136 +102,161 @@ msgstr ""
 msgid "Import All Meetings to Calendar"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:110
+#: src/templates/admin/invKoForm.php:109
+#: src/TouchPoint-WP/Settings.php:943
+msgid "Collect Meetings for Larger Events"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:113
+#: src/TouchPoint-WP/Settings.php:947
+msgid "No Collecting"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:114
+#: src/TouchPoint-WP/Settings.php:948
+msgid "Collect Meetings only from Involvements without Schedules"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:115
+#: src/TouchPoint-WP/Settings.php:952
+msgid "Collect Meetings for all Involvements"
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:117
+#: src/TouchPoint-WP/Settings.php:944
+msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:123
 msgid "Use Geographic Location"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:116
+#: src/templates/admin/invKoForm.php:129
 msgid "Exclude Involvements if"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:120
+#: src/templates/admin/invKoForm.php:133
 msgid "Involvement is Closed"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:124
+#: src/templates/admin/invKoForm.php:137
 msgid "Involvement is a Child Involvement"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:128
+#: src/templates/admin/invKoForm.php:141
 msgid "Based on Involvement setting in TouchPoint"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:128
+#: src/templates/admin/invKoForm.php:141
 msgid "Involvement does not meet weekly"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:132
+#: src/templates/admin/invKoForm.php:145
 msgid "Involvement does not have a Schedule"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:136
+#: src/templates/admin/invKoForm.php:149
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:140
+#: src/templates/admin/invKoForm.php:153
 msgid "Involvement registration has ended (end date is past)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:146
+#: src/templates/admin/invKoForm.php:159
 msgid "Leader Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:161
+#: src/templates/admin/invKoForm.php:174
 msgid "Host Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:177
+#: src/templates/admin/invKoForm.php:190
 msgid "Default Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:181
+#: src/templates/admin/invKoForm.php:194
 msgid "No Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:182
+#: src/templates/admin/invKoForm.php:195
 msgid "Upcoming / Current"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:183
+#: src/templates/admin/invKoForm.php:196
 msgid "Current / Upcoming"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:191
+#: src/templates/admin/invKoForm.php:204
 msgid "Default Filters"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:197
+#: src/templates/admin/invKoForm.php:210
 msgid "Division"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:204
+#: src/templates/admin/invKoForm.php:217
 msgid "Resident Code"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:211
+#: src/templates/admin/invKoForm.php:224
 msgid "Campus"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:223
+#: src/templates/admin/invKoForm.php:236
 msgid "Gender"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:237
+#: src/templates/admin/invKoForm.php:250
 #: src/TouchPoint-WP/Involvement.php:1872
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:241
+#: src/templates/admin/invKoForm.php:254
 #: src/TouchPoint-WP/Involvement.php:1898
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:245
+#: src/templates/admin/invKoForm.php:258
 msgid "Prevailing Marital Status"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:249
+#: src/templates/admin/invKoForm.php:262
 #: src/TouchPoint-WP/Taxonomies.php:837
 msgid "Age Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:254
+#: src/templates/admin/invKoForm.php:267
 msgid "Task Owner"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:261
+#: src/templates/admin/invKoForm.php:274
 msgid "Contact Leader Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:272
+#: src/templates/admin/invKoForm.php:285
 msgid "Join Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:288
+#: src/templates/admin/invKoForm.php:301
 msgid "Add Involvement Post Type"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:295
+#: src/templates/admin/invKoForm.php:308
 msgid "Small Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:296
+#: src/templates/admin/invKoForm.php:309
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:405
+#: src/templates/admin/invKoForm.php:419
 msgid "(named person)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:442
+#: src/templates/admin/invKoForm.php:456
 msgid "Select..."
 msgstr ""
 
@@ -277,14 +302,14 @@ msgid "This %s has been Cancelled."
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:286
+#: src/TouchPoint-WP/Meeting.php:291
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2118
+#: src/TouchPoint-WP/Involvement.php:2142
 msgid "No %s Found."
 msgstr ""
 
@@ -295,7 +320,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3649
+#: src/TouchPoint-WP/Involvement.php:3762
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -470,137 +495,137 @@ msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2059
+#: src/TouchPoint-WP/Involvement.php:2083
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2069
+#: src/TouchPoint-WP/Involvement.php:2093
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2088
+#: src/TouchPoint-WP/Involvement.php:2112
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3628
+#: src/TouchPoint-WP/Involvement.php:3741
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3631
+#: src/TouchPoint-WP/Involvement.php:3744
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3708
+#: src/TouchPoint-WP/Involvement.php:3821
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3725
+#: src/TouchPoint-WP/Involvement.php:3838
 #: src/TouchPoint-WP/Partner.php:1345
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3737
+#: src/TouchPoint-WP/Involvement.php:3850
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3778
-#: src/TouchPoint-WP/Involvement.php:3837
+#: src/TouchPoint-WP/Involvement.php:3891
+#: src/TouchPoint-WP/Involvement.php:3950
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3784
+#: src/TouchPoint-WP/Involvement.php:3897
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3788
+#: src/TouchPoint-WP/Involvement.php:3901
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3793
+#: src/TouchPoint-WP/Involvement.php:3906
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3796
+#: src/TouchPoint-WP/Involvement.php:3909
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3799
+#: src/TouchPoint-WP/Involvement.php:3912
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3802
+#: src/TouchPoint-WP/Involvement.php:3915
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3828
+#: src/TouchPoint-WP/Involvement.php:3941
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3945
-#: src/TouchPoint-WP/Involvement.php:4050
+#: src/TouchPoint-WP/Involvement.php:4058
+#: src/TouchPoint-WP/Involvement.php:4163
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4027
+#: src/TouchPoint-WP/Involvement.php:4140
 #: src/TouchPoint-WP/Person.php:1861
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4037
+#: src/TouchPoint-WP/Involvement.php:4150
 #: src/TouchPoint-WP/Person.php:1844
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:101
+#: src/TouchPoint-WP/Meeting.php:106
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:287
+#: src/TouchPoint-WP/Meeting.php:292
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:439
+#: src/TouchPoint-WP/Meeting.php:454
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:511
+#: src/TouchPoint-WP/Meeting.php:527
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:566
+#: src/TouchPoint-WP/Meeting.php:592
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:567
+#: src/TouchPoint-WP/Meeting.php:593
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:568
+#: src/TouchPoint-WP/Meeting.php:594
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:689
+#: src/TouchPoint-WP/Meeting.php:715
 #: src/TouchPoint-WP/TouchPointWP.php:1065
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:717
+#: src/TouchPoint-WP/Meeting.php:743
 #: src/TouchPoint-WP/TouchPointWP.php:370
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:727
+#: src/TouchPoint-WP/Meeting.php:753
 #: src/TouchPoint-WP/TouchPointWP.php:379
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:762
-#: src/TouchPoint-WP/Meeting.php:783
+#: src/TouchPoint-WP/Meeting.php:788
+#: src/TouchPoint-WP/Meeting.php:809
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr ""
@@ -663,147 +688,147 @@ msgstr ""
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:260
+#: src/TouchPoint-WP/Settings.php:261
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:261
+#: src/TouchPoint-WP/Settings.php:262
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:265
+#: src/TouchPoint-WP/Settings.php:266
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:266
+#: src/TouchPoint-WP/Settings.php:267
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:277
+#: src/TouchPoint-WP/Settings.php:278
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:278
+#: src/TouchPoint-WP/Settings.php:279
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:285
+#: src/TouchPoint-WP/Settings.php:286
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:286
+#: src/TouchPoint-WP/Settings.php:287
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:296
+#: src/TouchPoint-WP/Settings.php:297
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:297
+#: src/TouchPoint-WP/Settings.php:298
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:307
+#: src/TouchPoint-WP/Settings.php:308
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:308
+#: src/TouchPoint-WP/Settings.php:309
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:318
+#: src/TouchPoint-WP/Settings.php:319
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:319
+#: src/TouchPoint-WP/Settings.php:320
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:329
+#: src/TouchPoint-WP/Settings.php:330
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:330
+#: src/TouchPoint-WP/Settings.php:331
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:340
+#: src/TouchPoint-WP/Settings.php:341
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:341
+#: src/TouchPoint-WP/Settings.php:342
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:351
+#: src/TouchPoint-WP/Settings.php:352
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:352
+#: src/TouchPoint-WP/Settings.php:353
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:367
+#: src/TouchPoint-WP/Settings.php:368
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:368
+#: src/TouchPoint-WP/Settings.php:369
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:379
+#: src/TouchPoint-WP/Settings.php:380
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:380
+#: src/TouchPoint-WP/Settings.php:381
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:392
+#: src/TouchPoint-WP/Settings.php:393
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:393
+#: src/TouchPoint-WP/Settings.php:394
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:408
+#: src/TouchPoint-WP/Settings.php:409
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:409
+#: src/TouchPoint-WP/Settings.php:410
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:420
+#: src/TouchPoint-WP/Settings.php:421
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:421
+#: src/TouchPoint-WP/Settings.php:422
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:432
+#: src/TouchPoint-WP/Settings.php:433
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:433
+#: src/TouchPoint-WP/Settings.php:434
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:443
+#: src/TouchPoint-WP/Settings.php:444
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:444
+#: src/TouchPoint-WP/Settings.php:445
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:454
+#: src/TouchPoint-WP/Settings.php:455
 msgid "List Site in Directory"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:455
+#: src/TouchPoint-WP/Settings.php:456
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
@@ -1149,150 +1174,150 @@ msgstr ""
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:946
+#: src/TouchPoint-WP/Settings.php:963
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:947
+#: src/TouchPoint-WP/Settings.php:964
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:951
+#: src/TouchPoint-WP/Settings.php:968
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:952
+#: src/TouchPoint-WP/Settings.php:969
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:963
+#: src/TouchPoint-WP/Settings.php:980
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:964
+#: src/TouchPoint-WP/Settings.php:981
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:975
+#: src/TouchPoint-WP/Settings.php:992
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:976
+#: src/TouchPoint-WP/Settings.php:993
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:989
+#: src/TouchPoint-WP/Settings.php:1006
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1000
-#: src/TouchPoint-WP/Settings.php:1131
+#: src/TouchPoint-WP/Settings.php:1017
+#: src/TouchPoint-WP/Settings.php:1148
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1001
+#: src/TouchPoint-WP/Settings.php:1018
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1015
-#: src/TouchPoint-WP/Settings.php:1021
+#: src/TouchPoint-WP/Settings.php:1032
+#: src/TouchPoint-WP/Settings.php:1038
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1016
+#: src/TouchPoint-WP/Settings.php:1033
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1040
+#: src/TouchPoint-WP/Settings.php:1057
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1041
+#: src/TouchPoint-WP/Settings.php:1058
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1048
+#: src/TouchPoint-WP/Settings.php:1065
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1049
+#: src/TouchPoint-WP/Settings.php:1066
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1060
+#: src/TouchPoint-WP/Settings.php:1077
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1061
+#: src/TouchPoint-WP/Settings.php:1078
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1072
+#: src/TouchPoint-WP/Settings.php:1089
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1073
+#: src/TouchPoint-WP/Settings.php:1090
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1089
+#: src/TouchPoint-WP/Settings.php:1106
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1090
+#: src/TouchPoint-WP/Settings.php:1107
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1094
+#: src/TouchPoint-WP/Settings.php:1111
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1095
+#: src/TouchPoint-WP/Settings.php:1112
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1106
+#: src/TouchPoint-WP/Settings.php:1123
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1107
+#: src/TouchPoint-WP/Settings.php:1124
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1118
+#: src/TouchPoint-WP/Settings.php:1135
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1119
+#: src/TouchPoint-WP/Settings.php:1136
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1132
+#: src/TouchPoint-WP/Settings.php:1149
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1297
+#: src/TouchPoint-WP/Settings.php:1314
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1351
-#: src/TouchPoint-WP/Settings.php:1352
+#: src/TouchPoint-WP/Settings.php:1368
+#: src/TouchPoint-WP/Settings.php:1369
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1400
+#: src/TouchPoint-WP/Settings.php:1417
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1645
+#: src/TouchPoint-WP/Settings.php:1662
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1767
+#: src/TouchPoint-WP/Settings.php:1784
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1818
+#: src/TouchPoint-WP/Settings.php:1835
 msgid "Save Settings"
 msgstr ""
 

From 8bbfd611f9b6b7fe8554964ca188b705d4607d29 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 23 Apr 2025 16:03:03 -0400
Subject: [PATCH 270/423] Resolve an issue where meeting groups may not have an
 involvementId and therefore stuff fails.

---
 src/TouchPoint-WP/MeetingArray.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/TouchPoint-WP/MeetingArray.php b/src/TouchPoint-WP/MeetingArray.php
index 85ceb7c8..89336e59 100644
--- a/src/TouchPoint-WP/MeetingArray.php
+++ b/src/TouchPoint-WP/MeetingArray.php
@@ -26,6 +26,7 @@
  * @property-read DateTimeInterface mtgEndDt
  * @property-read ?string location
  * @property-read int status
+ * @property-read ?int involvementId
  */
 class MeetingArray implements apiMeeting, IteratorAggregate, ArrayAccess, Countable
 {
@@ -54,6 +55,7 @@ public function __get(string $what)
 			'mtgEndDt' => $this->mtgEndDt(),
 			'location' => $this->_involvement?->location ?? null,
 			'status' => $this->status(),
+			'involvementId' => $this->_involvement?->involvementId ?? null,
 			default => null,
 		};
 	}

From b065c4cc9731b2f0b0ef06c530e372ec5fb1e505 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 23 Apr 2025 21:46:10 -0400
Subject: [PATCH 271/423] A variety of minor cleanup items, mostly related to
 #225.

---
 src/TouchPoint-WP/Interfaces/apiMeeting.php |  1 +
 src/TouchPoint-WP/Involvement.php           | 26 ++++++++++++++-------
 src/TouchPoint-WP/MeetingArray.php          |  3 ++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/TouchPoint-WP/Interfaces/apiMeeting.php b/src/TouchPoint-WP/Interfaces/apiMeeting.php
index 4b5756de..c7d46b39 100644
--- a/src/TouchPoint-WP/Interfaces/apiMeeting.php
+++ b/src/TouchPoint-WP/Interfaces/apiMeeting.php
@@ -13,6 +13,7 @@
  * @property-read DateTimeInterface mtgEndDt
  * @property-read ?string location
  * @property-read int status
+ * @property-read ?int involvementId
  */
 interface apiMeeting {
 	public function __get(string $what);
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index c56ef334..41e4d5f8 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2812,7 +2812,11 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 				}
 			}
 
-			$post->post_parent = $parent;
+			if ($parent > 0) {
+				$post->post_parent = $parent;
+			} else {
+				$post->post_parent = 0;
+			}
 		}
 
 		// Status & Submit
@@ -3228,13 +3232,13 @@ protected static function updateMeetingsForInvolvement(
 					self::computeSlugs($g, $inv, true);
 				}
 
-				// Meetings within group
+				// Meetings within group (or ungrouped)
 				foreach ($g as $mtgO) {
 					if ($groupingActive) {
 						$mtgO->isGroupMember = true;
 					} else {
-						$mtgO->slugToUse    = $g->slugToUse;
-						$mtgO->titleToUse   = $g->titleToUse;
+						$mtgO->slugToUse     = $g->slugToUse;
+						$mtgO->titleToUse    = $mtgO->name ?? $g->titleToUse;
 					}
 					$updatedPost = self::updateMeeting($mtgO, $inv, $typeSets, $groupPost ?? $post, $imagePostId, $verbose);
 					if ($updatedPost) {
@@ -3286,8 +3290,6 @@ protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $im
 		// Find or Create Meeting Post //
 		/////////////////////////////////
 
-		var_dump($mtgO);
-
 		$loops = 1;
 		do {
 			$mtgP = new WP_Query([
@@ -3551,10 +3553,16 @@ public static function filterAuthor($author): string
 
 		if (in_array(get_post_type($postId), $invTypes)) {
 			$post = get_post($postId);
-			try {
-				$i = Involvement::fromPost($post);
 
-				$author = $i->leaders()->__toString();
+			$author = null;
+			try {
+				if (Involvement::postIsType($post)) {
+					$inv    = Involvement::fromPost($post);
+					$author = $inv->leaders()->__toString();
+				} elseif (Meeting::postIsType($post)) {
+					$mtg    = Meeting::fromPost($post);
+					$author = $mtg->involvement()->leaders()->__toString();
+				}
 			} catch (TouchPointWP_Exception) {
 			}
 		}
diff --git a/src/TouchPoint-WP/MeetingArray.php b/src/TouchPoint-WP/MeetingArray.php
index 89336e59..f136d112 100644
--- a/src/TouchPoint-WP/MeetingArray.php
+++ b/src/TouchPoint-WP/MeetingArray.php
@@ -11,6 +11,7 @@
 use Countable;
 use DateTimeInterface;
 use IteratorAggregate;
+use stdClass;
 use tp\TouchPointWP\Interfaces\apiMeeting;
 
 /**
@@ -30,7 +31,7 @@
  */
 class MeetingArray implements apiMeeting, IteratorAggregate, ArrayAccess, Countable
 {
-	protected ?\stdClass $_involvement = null;
+	protected ?stdClass $_involvement = null; // This is NOT an Involvement class instance.
 	protected array $_meetings = [];
 
 	public string $slugToUse = "";

From 992a8cada11e5a6d393252a372f0b7c42403c117 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Apr 2025 10:56:35 -0400
Subject: [PATCH 272/423] Resolving login with tokens.  Closes #211.

---
 src/TouchPoint-WP/Api.php      | 4 ++--
 src/TouchPoint-WP/Settings.php | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index a2486853..00ef508e 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -253,7 +253,7 @@ public function get(string $command, array $headers = [], ?int $onBehalfPid = nu
 				return $r;
 			}
 
-			if ($r['response']['code'] === Http::FORBIDDEN) {
+			if ($r['response']['code'] === Http::UNAUTHORIZED) {
 				//if unauthorized, cycle PAT
 				$this->cyclePAT();
 			} elseif ($r['response']['code'] === Http::TOO_MANY_REQUESTS) {
@@ -303,7 +303,7 @@ public function post(string $command, mixed $data = null, array $headers = [], ?
 				return $r;
 			}
 
-			if ($r['response']['code'] === Http::FORBIDDEN) {
+			if ($r['response']['code'] === Http::UNAUTHORIZED) {
 				//if unauthorized, cycle PAT
 				$this->cyclePAT();
 			} elseif ($r['response']['code'] === Http::TOO_MANY_REQUESTS) {
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index c1a56d3b..47e65d8b 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -1640,6 +1640,10 @@ public function migrate(): void
 		// 0.0.95 - Remove never-really-used option for deletion handling
 		delete_option('tp_mc_deletion_method');
 
+		// 0.0.96 - Remove old API key settings -- all options that start with tp_api_key
+		/** @noinspection SqlResolve */
+		$wpdb->query("DELETE FROM $wpdb->options WHERE option_name LIKE 'tp_api_key%'");
+
 		// Update version string
 		$this->set('version', TouchPointWP::VERSION);
 	}

From daeb4046b0339a08e98651b4c6985b238ab672a5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 24 Apr 2025 12:12:50 -0400
Subject: [PATCH 273/423] Resolving overly-aggressive redirection.  Closes
 #228.

---
 src/TouchPoint-WP/Auth.php         |  2 +-
 src/TouchPoint-WP/TouchPointWP.php | 41 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index ccc79596..7e7199d2 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -242,7 +242,7 @@ public static function preventAdminAccessMaybe(): void
 	{
 		$preventAdmin = (TouchPointWP::instance()->settings->auth_change_profile_urls === 'on')
 					 && is_admin()  // means: request is in the admin area, not that user is an admin.
-					 && !current_user_can('edit_posts');
+					 && !TouchPointWP::userHasEditingPermissions();
 
 
 		$destination = null;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index af2b5502..16412a63 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -550,6 +550,47 @@ public static function currentUserIsAdmin(): bool
 		return current_user_can('manage_options');
 	}
 
+
+	/**
+	 * Determine if the current user can edit anything and therefore may need access to wp-admin.
+	 *
+	 * @param int|null $userId
+	 *
+	 * @return bool
+	 */
+	public static function userHasEditingPermissions(?int $userId = null): bool
+	{
+		if (!function_exists('get_current_user_id')) {
+			return false;
+		}
+
+		if ($userId === null) {
+			$userId = get_current_user_id();
+		}
+
+		$user = get_user($userId);
+
+		foreach ($user->roles as $role) {
+			$role = get_role($role);
+			if ($role === null) {
+				continue;
+			}
+			$caps = $role->capabilities;
+			foreach ($caps as $cap) {
+				// if cap starts with any of several terms "edit", "Manage", etc, return true.
+				if (str_starts_with($cap, 'edit_') ||
+				    str_starts_with($cap, 'manage_') ||
+				    str_starts_with($cap, 'publish_') ||
+				    str_starts_with($cap, 'delete_') ||
+				    str_starts_with($cap, 'create_')
+				) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Print Dynamic Instantiation scripts.
 	 *

From 0d29b3398afa34630b7b8e62a1551c8c6d886b17 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 27 Apr 2025 14:08:59 -0400
Subject: [PATCH 274/423] Resolving overly-aggressive redirection.  Closes
 #228.  For real this time.

---
 src/TouchPoint-WP/TouchPointWP.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 16412a63..43eb63aa 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -575,14 +575,18 @@ public static function userHasEditingPermissions(?int $userId = null): bool
 			if ($role === null) {
 				continue;
 			}
-			$caps = $role->capabilities;
-			foreach ($caps as $cap) {
+			foreach ($role->capabilities as $cap => $enabled) {
+				if (!$enabled) {
+					continue;
+				}
+
 				// if cap starts with any of several terms "edit", "Manage", etc, return true.
 				if (str_starts_with($cap, 'edit_') ||
 				    str_starts_with($cap, 'manage_') ||
 				    str_starts_with($cap, 'publish_') ||
 				    str_starts_with($cap, 'delete_') ||
-				    str_starts_with($cap, 'create_')
+				    str_starts_with($cap, 'create_') ||
+				    str_starts_with($cap, 'switch_')
 				) {
 					return true;
 				}

From ea7be2152ad0493fcfc27c9937333c0ec56c2367 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 28 Apr 2025 13:29:00 -0400
Subject: [PATCH 275/423] Handle some variables more gracefully for unusual
 circumstances.

---
 src/TouchPoint-WP/Person.php | 13 ++++++++++++-
 src/TouchPoint-WP/Report.php |  7 ++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index ffbf237a..c6855aa9 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -687,14 +687,25 @@ protected static function updateFromTouchPoint(bool $verbose = false): bool|int
 		if (TouchPointWP::instance()->settings->enable_people_lists) {
 			$posts = Utilities::getPostContentWithShortcode(self::SHORTCODE_PEOPLE_LIST);
 
+			global $post;
+			$originalPost = $post;
+
 			self::$_indexingMode = true;
 			foreach ($posts as $postI) {
-				global $post;
+				if (!is_object($postI)) {
+					continue;
+				}
+				if (!property_exists($postI, 'post_content')) {
+					continue;
+				}
+
 				$post = $postI;
 				set_time_limit(10);
 				apply_shortcodes($postI->post_content);
 			}
 			self::$_indexingMode = false;
+
+			$post = $originalPost;
 		}
 
 		// Add Involvement Leaders to the query.
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 27eee523..4a5dbe36 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -588,14 +588,19 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 		//////////////////
 
 		self::$_indexingMode = true;
+
+		global $post;
+		$originalPost = $post;
+
 		foreach ($referencingPosts as $postI) {
-			global $post;
 			$post = $postI;
 			set_time_limit(10);
 			apply_shortcodes($postI->post_content);
 		}
 		self::$_indexingMode = false;
 
+		$post = $originalPost;
+
 		$needsUpdate = [];
 		foreach (self::$_instances as $report) {
 			if ($report->getPost()) {

From 74a43e5e5c0e0bf479ceedeb255bc918268f0f6d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 28 Apr 2025 13:54:55 -0400
Subject: [PATCH 276/423] Resolving an issue where not all children of
 involvements are involvements.

---
 src/templates/parts/meeting-list-item.php | 65 ++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/templates/parts/meeting-list-item.php b/src/templates/parts/meeting-list-item.php
index 291787d8..f3e45507 100644
--- a/src/templates/parts/meeting-list-item.php
+++ b/src/templates/parts/meeting-list-item.php
@@ -48,17 +48,31 @@
     <div class="actions involvement-actions <?php echo $postTypeClass; ?>-actions">
         <?php echo $mtg->getActionButtons('list-item', "btn button"); ?>
     </div>
+
     <?php if (isset($settings) && $settings->hierarchical) {
         $children = get_children([
             'post_parent' => $post->ID,
             'orderby' => 'title',
             'order' => 'ASC',
-            'post_type' => get_post_type($post)
+            'post_type' => get_post_type($post),
+            'meta_query' => [
+                [
+                 'key' => TouchPointWP::INVOLVEMENT_META_KEY,
+                 'value' => 0,
+                 'compare' => '>'
+                ],
+            ]
         ]);
         if (count($children) > 0) {
             echo "<div class='child-involvements'>";
         }
         foreach ($children as $child) {
+            
+            if (!Involvement::postIsType($child)) {
+                // This is just a precaution; it shouldn't happen because the query above only includes involvements.
+                continue;
+            }
+            
             /** @var WP_Post $child */
             echo "<div>";
             $link = get_permalink($child);
@@ -82,4 +96,53 @@
             echo "</div>";
         }
     } ?>
+
+
+	<?php if (isset($settings) && $settings->hierarchical) {
+		$children = get_children([
+			                         'post_parent' => $post->ID,
+			                         'orderby' => 'title',
+			                         'order' => 'ASC',
+			                         'post_type' => get_post_type($post),
+			                         'meta_query' => [
+				                         [
+					                         'key' => Meeting::MEETING_META_KEY,
+					                         'value' => 0,
+					                         'compare' => '!='
+				                         ],
+			                         ]
+		                         ]);
+		if (count($children) > 0) {
+			echo "<div class='child-involvements'>";
+		}
+		foreach ($children as $child) {
+
+			if (!Meeting::postIsType($child)) {
+				// This is just a precaution; it shouldn't happen because the query above only includes involvements.
+				continue;
+			}
+
+			/** @var WP_Post $child */
+			echo "<div>";
+			$link = get_permalink($child);
+			echo "<h3 class='inline'><a href=\"$link\" class='small'>$child->post_title</a></h3>";
+
+			$childInv = Meeting::fromPost($child);
+
+			$metaStrings = [];
+			foreach ($childInv->notableAttributes($notableAttributes) as $a)
+			{
+				$metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
+			}
+			$m = implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
+			if ($m !== "") {
+				echo "<span class=\"post-meta\">$m</span>";
+			}
+
+			echo "</div>";
+		}
+		if (count($children) > 0) {
+			echo "</div>";
+		}
+	} ?>
 </article>
\ No newline at end of file

From 764b10854eea7d867ec52d6487390a9ab2c77b6c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 1 May 2025 10:35:47 -0400
Subject: [PATCH 277/423] i18n update

---
 i18n/TouchPoint-WP-es_ES.po | 78 ++++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 80 ++++++++++++++++++-------------------
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index ce4cb169..c0e984b8 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -224,53 +224,53 @@ msgstr "Cualquier"
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3741
+#: src/TouchPoint-WP/Involvement.php:3749
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3744
+#: src/TouchPoint-WP/Involvement.php:3752
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3821
+#: src/TouchPoint-WP/Involvement.php:3829
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3891
-#: src/TouchPoint-WP/Involvement.php:3950
+#: src/TouchPoint-WP/Involvement.php:3899
+#: src/TouchPoint-WP/Involvement.php:3958
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3897
+#: src/TouchPoint-WP/Involvement.php:3905
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3901
+#: src/TouchPoint-WP/Involvement.php:3909
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3906
+#: src/TouchPoint-WP/Involvement.php:3914
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3909
+#: src/TouchPoint-WP/Involvement.php:3917
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3912
+#: src/TouchPoint-WP/Involvement.php:3920
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3915
+#: src/TouchPoint-WP/Involvement.php:3923
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3941
+#: src/TouchPoint-WP/Involvement.php:3949
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3838
+#: src/TouchPoint-WP/Involvement.php:3846
 #: src/TouchPoint-WP/Partner.php:1345
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -292,7 +292,7 @@ msgstr "No se proporcionó una identificación de usuario de WordPress para inic
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1176
+#: src/TouchPoint-WP/Person.php:1187
 msgid "Contact"
 msgstr "Contacta"
 
@@ -302,24 +302,24 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2075
+#: src/TouchPoint-WP/TouchPointWP.php:2120
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2132
+#: src/TouchPoint-WP/TouchPointWP.php:2177
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2135
+#: src/TouchPoint-WP/TouchPointWP.php:2180
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2138
+#: src/TouchPoint-WP/TouchPointWP.php:2183
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2143
-#: src/TouchPoint-WP/TouchPointWP.php:2144
+#: src/TouchPoint-WP/TouchPointWP.php:2188
+#: src/TouchPoint-WP/TouchPointWP.php:2189
 msgid "Current Value"
 msgstr "Valor actual"
 
@@ -335,7 +335,7 @@ msgstr "Configuración de API no válida o incompleta."
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2358
+#: src/TouchPoint-WP/TouchPointWP.php:2403
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -782,19 +782,19 @@ msgstr "TouchPoint-WP"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/Settings.php:1662
+#: src/TouchPoint-WP/Settings.php:1666
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/Settings.php:1784
+#: src/TouchPoint-WP/Settings.php:1788
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1835
+#: src/TouchPoint-WP/Settings.php:1839
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1455
+#: src/TouchPoint-WP/Person.php:1466
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:18
 msgid "and"
@@ -1249,7 +1249,7 @@ msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3762
+#: src/TouchPoint-WP/Involvement.php:3770
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1279,7 +1279,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:715
-#: src/TouchPoint-WP/TouchPointWP.php:1065
+#: src/TouchPoint-WP/TouchPointWP.php:1110
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1293,8 +1293,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:4058
-#: src/TouchPoint-WP/Involvement.php:4163
+#: src/TouchPoint-WP/Involvement.php:4066
+#: src/TouchPoint-WP/Involvement.php:4171
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1426,7 +1426,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1462
+#: src/TouchPoint-WP/Person.php:1473
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1451,8 +1451,8 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4150
-#: src/TouchPoint-WP/Person.php:1844
+#: src/TouchPoint-WP/Involvement.php:4158
+#: src/TouchPoint-WP/Person.php:1855
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1472,16 +1472,16 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1699
+#: src/TouchPoint-WP/Person.php:1710
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4140
-#: src/TouchPoint-WP/Person.php:1861
+#: src/TouchPoint-WP/Involvement.php:4148
+#: src/TouchPoint-WP/Person.php:1872
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1601
+#: src/TouchPoint-WP/Person.php:1612
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
@@ -1594,7 +1594,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3850
+#: src/TouchPoint-WP/Involvement.php:3858
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
@@ -1608,7 +1608,7 @@ msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1184
+#: src/TouchPoint-WP/Person.php:1195
 msgid "Person in %s"
 msgstr "Persona en %s"
 
@@ -1871,7 +1871,7 @@ msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2334
+#: src/TouchPoint-WP/TouchPointWP.php:2379
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 030b0d42..88f43662 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-04-23T19:14:47+00:00\n"
+"POT-Creation-Date: 2025-04-28T21:13:40+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -320,7 +320,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3762
+#: src/TouchPoint-WP/Involvement.php:3770
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -507,74 +507,74 @@ msgstr ""
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3741
+#: src/TouchPoint-WP/Involvement.php:3749
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3744
+#: src/TouchPoint-WP/Involvement.php:3752
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3821
+#: src/TouchPoint-WP/Involvement.php:3829
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3838
+#: src/TouchPoint-WP/Involvement.php:3846
 #: src/TouchPoint-WP/Partner.php:1345
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3850
+#: src/TouchPoint-WP/Involvement.php:3858
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3891
-#: src/TouchPoint-WP/Involvement.php:3950
+#: src/TouchPoint-WP/Involvement.php:3899
+#: src/TouchPoint-WP/Involvement.php:3958
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3897
+#: src/TouchPoint-WP/Involvement.php:3905
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3901
+#: src/TouchPoint-WP/Involvement.php:3909
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3906
+#: src/TouchPoint-WP/Involvement.php:3914
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3909
+#: src/TouchPoint-WP/Involvement.php:3917
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3912
+#: src/TouchPoint-WP/Involvement.php:3920
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3915
+#: src/TouchPoint-WP/Involvement.php:3923
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3941
+#: src/TouchPoint-WP/Involvement.php:3949
 #: assets/js/base-defer.js:1001
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4058
-#: src/TouchPoint-WP/Involvement.php:4163
+#: src/TouchPoint-WP/Involvement.php:4066
+#: src/TouchPoint-WP/Involvement.php:4171
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4140
-#: src/TouchPoint-WP/Person.php:1861
+#: src/TouchPoint-WP/Involvement.php:4148
+#: src/TouchPoint-WP/Person.php:1872
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4150
-#: src/TouchPoint-WP/Person.php:1844
+#: src/TouchPoint-WP/Involvement.php:4158
+#: src/TouchPoint-WP/Person.php:1855
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -610,7 +610,7 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:715
-#: src/TouchPoint-WP/TouchPointWP.php:1065
+#: src/TouchPoint-WP/TouchPointWP.php:1110
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -647,31 +647,31 @@ msgstr ""
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1176
+#: src/TouchPoint-WP/Person.php:1187
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1184
+#: src/TouchPoint-WP/Person.php:1195
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1455
+#: src/TouchPoint-WP/Person.php:1466
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:18
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1462
+#: src/TouchPoint-WP/Person.php:1473
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1601
+#: src/TouchPoint-WP/Person.php:1612
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1699
+#: src/TouchPoint-WP/Person.php:1710
 msgid "You may need to sign in."
 msgstr ""
 
@@ -1309,15 +1309,15 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1662
+#: src/TouchPoint-WP/Settings.php:1666
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1784
+#: src/TouchPoint-WP/Settings.php:1788
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1835
+#: src/TouchPoint-WP/Settings.php:1839
 msgid "Save Settings"
 msgstr ""
 
@@ -1428,32 +1428,32 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2075
+#: src/TouchPoint-WP/TouchPointWP.php:2120
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2132
+#: src/TouchPoint-WP/TouchPointWP.php:2177
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2135
+#: src/TouchPoint-WP/TouchPointWP.php:2180
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2138
+#: src/TouchPoint-WP/TouchPointWP.php:2183
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2143
-#: src/TouchPoint-WP/TouchPointWP.php:2144
+#: src/TouchPoint-WP/TouchPointWP.php:2188
+#: src/TouchPoint-WP/TouchPointWP.php:2189
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2334
+#: src/TouchPoint-WP/TouchPointWP.php:2379
 msgid "People Count Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2358
+#: src/TouchPoint-WP/TouchPointWP.php:2403
 msgid "People Query Failed"
 msgstr ""
 

From 0befb4dffce2c492d84b9d351ca69c27dc9e095a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 1 May 2025 14:07:25 -0400
Subject: [PATCH 278/423] Starting to resolve issue of calling translations too
 early.

---
 i18n/TouchPoint-WP-es_ES.po    | 340 ++++++++++++++++----------------
 i18n/TouchPoint-WP.pot         | 342 ++++++++++++++++-----------------
 src/TouchPoint-WP/Settings.php |  41 ++--
 3 files changed, 364 insertions(+), 359 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index c0e984b8..dc607190 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:1005
+#: src/TouchPoint-WP/Settings.php:1010
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -339,458 +339,458 @@ msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/Settings.php:261
+#: src/TouchPoint-WP/Settings.php:266
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/Settings.php:262
+#: src/TouchPoint-WP/Settings.php:267
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/Settings.php:266
+#: src/TouchPoint-WP/Settings.php:271
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/Settings.php:267
+#: src/TouchPoint-WP/Settings.php:272
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:278
+#: src/TouchPoint-WP/Settings.php:283
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/Settings.php:279
+#: src/TouchPoint-WP/Settings.php:284
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:286
+#: src/TouchPoint-WP/Settings.php:291
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/Settings.php:287
+#: src/TouchPoint-WP/Settings.php:292
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:308
+#: src/TouchPoint-WP/Settings.php:313
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/Settings.php:309
+#: src/TouchPoint-WP/Settings.php:314
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/Settings.php:319
+#: src/TouchPoint-WP/Settings.php:324
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:320
+#: src/TouchPoint-WP/Settings.php:325
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/Settings.php:341
+#: src/TouchPoint-WP/Settings.php:346
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/Settings.php:342
+#: src/TouchPoint-WP/Settings.php:347
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:352
+#: src/TouchPoint-WP/Settings.php:357
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:353
+#: src/TouchPoint-WP/Settings.php:358
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/Settings.php:368
+#: src/TouchPoint-WP/Settings.php:373
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:380
+#: src/TouchPoint-WP/Settings.php:385
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:393
+#: src/TouchPoint-WP/Settings.php:398
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:394
+#: src/TouchPoint-WP/Settings.php:399
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/Settings.php:409
+#: src/TouchPoint-WP/Settings.php:414
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:410
+#: src/TouchPoint-WP/Settings.php:415
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/Settings.php:421
+#: src/TouchPoint-WP/Settings.php:426
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:422
+#: src/TouchPoint-WP/Settings.php:427
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/Settings.php:433
+#: src/TouchPoint-WP/Settings.php:438
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:434
+#: src/TouchPoint-WP/Settings.php:439
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/Settings.php:473
 #: src/TouchPoint-WP/Settings.php:478
+#: src/TouchPoint-WP/Settings.php:483
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/Settings.php:477
+#: src/TouchPoint-WP/Settings.php:482
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/Settings.php:494
+#: src/TouchPoint-WP/Settings.php:499
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/Settings.php:495
+#: src/TouchPoint-WP/Settings.php:500
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/Settings.php:499
+#: src/TouchPoint-WP/Settings.php:504
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/Settings.php:500
+#: src/TouchPoint-WP/Settings.php:505
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/Settings.php:511
+#: src/TouchPoint-WP/Settings.php:516
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/Settings.php:512
+#: src/TouchPoint-WP/Settings.php:517
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/Settings.php:522
+#: src/TouchPoint-WP/Settings.php:527
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/Settings.php:523
+#: src/TouchPoint-WP/Settings.php:528
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/Settings.php:533
-#: src/TouchPoint-WP/Settings.php:771
+#: src/TouchPoint-WP/Settings.php:538
+#: src/TouchPoint-WP/Settings.php:776
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/Settings.php:534
+#: src/TouchPoint-WP/Settings.php:539
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/Settings.php:550
+#: src/TouchPoint-WP/Settings.php:555
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/Settings.php:551
+#: src/TouchPoint-WP/Settings.php:556
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:555
+#: src/TouchPoint-WP/Settings.php:560
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/Settings.php:565
+#: src/TouchPoint-WP/Settings.php:570
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/Settings.php:566
+#: src/TouchPoint-WP/Settings.php:571
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:576
+#: src/TouchPoint-WP/Settings.php:581
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:585
+#: src/TouchPoint-WP/Settings.php:590
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/Settings.php:586
+#: src/TouchPoint-WP/Settings.php:591
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/Settings.php:592
+#: src/TouchPoint-WP/Settings.php:597
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/Settings.php:593
+#: src/TouchPoint-WP/Settings.php:598
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/Settings.php:607
+#: src/TouchPoint-WP/Settings.php:612
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/Settings.php:608
+#: src/TouchPoint-WP/Settings.php:613
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/Settings.php:613
+#: src/TouchPoint-WP/Settings.php:618
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/Settings.php:643
+#: src/TouchPoint-WP/Settings.php:648
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/Settings.php:644
+#: src/TouchPoint-WP/Settings.php:649
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/Settings.php:648
+#: src/TouchPoint-WP/Settings.php:653
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/Settings.php:649
+#: src/TouchPoint-WP/Settings.php:654
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:659
+#: src/TouchPoint-WP/Settings.php:664
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/Settings.php:660
+#: src/TouchPoint-WP/Settings.php:665
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:670
+#: src/TouchPoint-WP/Settings.php:675
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/Settings.php:671
+#: src/TouchPoint-WP/Settings.php:676
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:681
+#: src/TouchPoint-WP/Settings.php:686
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/Settings.php:682
+#: src/TouchPoint-WP/Settings.php:687
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:692
+#: src/TouchPoint-WP/Settings.php:697
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/Settings.php:693
+#: src/TouchPoint-WP/Settings.php:698
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:705
+#: src/TouchPoint-WP/Settings.php:710
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/Settings.php:706
+#: src/TouchPoint-WP/Settings.php:711
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/Settings.php:716
+#: src/TouchPoint-WP/Settings.php:721
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/Settings.php:717
+#: src/TouchPoint-WP/Settings.php:722
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/Settings.php:727
+#: src/TouchPoint-WP/Settings.php:732
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/Settings.php:728
+#: src/TouchPoint-WP/Settings.php:733
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/Settings.php:738
+#: src/TouchPoint-WP/Settings.php:743
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/Settings.php:739
+#: src/TouchPoint-WP/Settings.php:744
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/Settings.php:749
+#: src/TouchPoint-WP/Settings.php:754
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/Settings.php:750
+#: src/TouchPoint-WP/Settings.php:755
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/Settings.php:760
+#: src/TouchPoint-WP/Settings.php:765
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/Settings.php:761
+#: src/TouchPoint-WP/Settings.php:766
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/Settings.php:772
+#: src/TouchPoint-WP/Settings.php:777
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/Settings.php:783
+#: src/TouchPoint-WP/Settings.php:788
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/Settings.php:784
+#: src/TouchPoint-WP/Settings.php:789
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/Settings.php:827
+#: src/TouchPoint-WP/Settings.php:832
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:832
+#: src/TouchPoint-WP/Settings.php:837
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/Settings.php:847
+#: src/TouchPoint-WP/Settings.php:852
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/Settings.php:848
+#: src/TouchPoint-WP/Settings.php:853
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/Settings.php:963
+#: src/TouchPoint-WP/Settings.php:968
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/Settings.php:964
+#: src/TouchPoint-WP/Settings.php:969
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:968
+#: src/TouchPoint-WP/Settings.php:973
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/Settings.php:969
+#: src/TouchPoint-WP/Settings.php:974
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:980
+#: src/TouchPoint-WP/Settings.php:985
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:981
+#: src/TouchPoint-WP/Settings.php:986
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:992
+#: src/TouchPoint-WP/Settings.php:997
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/Settings.php:993
+#: src/TouchPoint-WP/Settings.php:998
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/Settings.php:1006
+#: src/TouchPoint-WP/Settings.php:1011
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/Settings.php:1057
+#: src/TouchPoint-WP/Settings.php:1062
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Settings.php:1058
+#: src/TouchPoint-WP/Settings.php:1063
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:1065
+#: src/TouchPoint-WP/Settings.php:1070
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1066
+#: src/TouchPoint-WP/Settings.php:1071
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1077
+#: src/TouchPoint-WP/Settings.php:1082
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:1078
+#: src/TouchPoint-WP/Settings.php:1083
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1089
+#: src/TouchPoint-WP/Settings.php:1094
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/Settings.php:1090
+#: src/TouchPoint-WP/Settings.php:1095
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/Settings.php:1106
+#: src/TouchPoint-WP/Settings.php:1111
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/Settings.php:1107
+#: src/TouchPoint-WP/Settings.php:1112
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/Settings.php:1111
+#: src/TouchPoint-WP/Settings.php:1116
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1112
+#: src/TouchPoint-WP/Settings.php:1117
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1123
+#: src/TouchPoint-WP/Settings.php:1128
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/Settings.php:1124
+#: src/TouchPoint-WP/Settings.php:1129
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1135
+#: src/TouchPoint-WP/Settings.php:1140
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/Settings.php:1136
+#: src/TouchPoint-WP/Settings.php:1141
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/Settings.php:1314
+#: src/TouchPoint-WP/Settings.php:1317
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/Settings.php:1368
-#: src/TouchPoint-WP/Settings.php:1369
+#: src/TouchPoint-WP/Settings.php:1371
+#: src/TouchPoint-WP/Settings.php:1372
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1417
+#: src/TouchPoint-WP/Settings.php:1420
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/Settings.php:1666
+#: src/TouchPoint-WP/Settings.php:1671
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/Settings.php:1788
+#: src/TouchPoint-WP/Settings.php:1793
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1839
+#: src/TouchPoint-WP/Settings.php:1844
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -1140,12 +1140,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/Settings.php:1032
-#: src/TouchPoint-WP/Settings.php:1038
+#: src/TouchPoint-WP/Settings.php:1037
+#: src/TouchPoint-WP/Settings.php:1043
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1033
+#: src/TouchPoint-WP/Settings.php:1038
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1254,7 +1254,7 @@ msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi l
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/Settings.php:381
+#: src/TouchPoint-WP/Settings.php:386
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1298,7 +1298,7 @@ msgstr "Datos proporcionados no válidos."
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/Settings.php:330
+#: src/TouchPoint-WP/Settings.php:335
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1363,7 +1363,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/Settings.php:331
+#: src/TouchPoint-WP/Settings.php:336
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1431,11 +1431,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:860
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/Settings.php:861
+#: src/TouchPoint-WP/Settings.php:866
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1443,11 +1443,11 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/Settings.php:889
+#: src/TouchPoint-WP/Settings.php:894
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:890
+#: src/TouchPoint-WP/Settings.php:895
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
@@ -1456,15 +1456,15 @@ msgstr "La ruta raíz para las reuniones"
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/Settings.php:556
+#: src/TouchPoint-WP/Settings.php:561
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/Settings.php:369
+#: src/TouchPoint-WP/Settings.php:374
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/Settings.php:476
+#: src/TouchPoint-WP/Settings.php:481
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1496,40 +1496,40 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Settings.php:297
+#: src/TouchPoint-WP/Settings.php:302
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:298
+#: src/TouchPoint-WP/Settings.php:303
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:902
+#: src/TouchPoint-WP/Settings.php:907
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/Settings.php:903
+#: src/TouchPoint-WP/Settings.php:908
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/Settings.php:915
+#: src/TouchPoint-WP/Settings.php:920
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/Settings.php:928
+#: src/TouchPoint-WP/Settings.php:933
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/Settings.php:1017
-#: src/TouchPoint-WP/Settings.php:1148
+#: src/TouchPoint-WP/Settings.php:1022
+#: src/TouchPoint-WP/Settings.php:1153
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1018
+#: src/TouchPoint-WP/Settings.php:1023
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Settings.php:1149
+#: src/TouchPoint-WP/Settings.php:1154
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1612,39 +1612,39 @@ msgstr "Reunión en %s"
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:870
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/Settings.php:866
+#: src/TouchPoint-WP/Settings.php:871
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:871
-#: src/TouchPoint-WP/Settings.php:873
+#: src/TouchPoint-WP/Settings.php:876
+#: src/TouchPoint-WP/Settings.php:878
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/Settings.php:871
-#: src/TouchPoint-WP/Settings.php:873
+#: src/TouchPoint-WP/Settings.php:876
+#: src/TouchPoint-WP/Settings.php:878
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Settings.php:877
+#: src/TouchPoint-WP/Settings.php:882
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/Settings.php:878
+#: src/TouchPoint-WP/Settings.php:883
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:883
-#: src/TouchPoint-WP/Settings.php:885
+#: src/TouchPoint-WP/Settings.php:888
+#: src/TouchPoint-WP/Settings.php:890
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/Settings.php:883
-#: src/TouchPoint-WP/Settings.php:885
+#: src/TouchPoint-WP/Settings.php:888
+#: src/TouchPoint-WP/Settings.php:890
 msgid "Event"
 msgstr "Evento"
 
@@ -1751,31 +1751,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/Settings.php:801
+#: src/TouchPoint-WP/Settings.php:806
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/Settings.php:805
+#: src/TouchPoint-WP/Settings.php:810
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:811
+#: src/TouchPoint-WP/Settings.php:816
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/Settings.php:816
+#: src/TouchPoint-WP/Settings.php:821
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/Settings.php:817
+#: src/TouchPoint-WP/Settings.php:822
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/Settings.php:830
+#: src/TouchPoint-WP/Settings.php:835
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/Settings.php:812
+#: src/TouchPoint-WP/Settings.php:817
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1805,11 +1805,11 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:444
+#: src/TouchPoint-WP/Settings.php:449
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/Settings.php:445
+#: src/TouchPoint-WP/Settings.php:450
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
@@ -1842,15 +1842,15 @@ msgstr "Actualizada"
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: src/TouchPoint-WP/Settings.php:916
+#: src/TouchPoint-WP/Settings.php:921
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
 
-#: src/TouchPoint-WP/Settings.php:455
+#: src/TouchPoint-WP/Settings.php:460
 msgid "List Site in Directory"
 msgstr "Listar sitio en directorio"
 
-#: src/TouchPoint-WP/Settings.php:456
+#: src/TouchPoint-WP/Settings.php:461
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
@@ -1863,11 +1863,11 @@ msgstr "Iniciar sesión con %s"
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
-#: src/TouchPoint-WP/Settings.php:929
+#: src/TouchPoint-WP/Settings.php:934
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días. Si un evento tiene más de esta cantidad, se eliminará. Se recomienda encarecidamente tener poco historial (menos de un mes) o mucho (al menos 15 meses)."
 
-#: src/TouchPoint-WP/Settings.php:575
+#: src/TouchPoint-WP/Settings.php:580
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
@@ -1876,26 +1876,26 @@ msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
 #: src/templates/admin/invKoForm.php:109
-#: src/TouchPoint-WP/Settings.php:943
+#: src/TouchPoint-WP/Settings.php:948
 msgid "Collect Meetings for Larger Events"
 msgstr "Recopilar reuniones para eventos más grandes"
 
 #: src/templates/admin/invKoForm.php:113
-#: src/TouchPoint-WP/Settings.php:947
+#: src/TouchPoint-WP/Settings.php:952
 msgid "No Collecting"
 msgstr "sin recoger"
 
 #: src/templates/admin/invKoForm.php:114
-#: src/TouchPoint-WP/Settings.php:948
+#: src/TouchPoint-WP/Settings.php:953
 msgid "Collect Meetings only from Involvements without Schedules"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:115
-#: src/TouchPoint-WP/Settings.php:952
+#: src/TouchPoint-WP/Settings.php:957
 msgid "Collect Meetings for all Involvements"
 msgstr "Recopilar reuniones solo de participaciones sin horarios"
 
 #: src/templates/admin/invKoForm.php:117
-#: src/TouchPoint-WP/Settings.php:944
+#: src/TouchPoint-WP/Settings.php:949
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 88f43662..99d60c8f 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-04-28T21:13:40+00:00\n"
+"POT-Creation-Date: 2025-05-01T18:06:39+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:1005
+#: src/TouchPoint-WP/Settings.php:1010
 msgid "Divisions to Import"
 msgstr ""
 
@@ -103,27 +103,27 @@ msgid "Import All Meetings to Calendar"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:109
-#: src/TouchPoint-WP/Settings.php:943
+#: src/TouchPoint-WP/Settings.php:948
 msgid "Collect Meetings for Larger Events"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:113
-#: src/TouchPoint-WP/Settings.php:947
+#: src/TouchPoint-WP/Settings.php:952
 msgid "No Collecting"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:114
-#: src/TouchPoint-WP/Settings.php:948
+#: src/TouchPoint-WP/Settings.php:953
 msgid "Collect Meetings only from Involvements without Schedules"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:115
-#: src/TouchPoint-WP/Settings.php:952
+#: src/TouchPoint-WP/Settings.php:957
 msgid "Collect Meetings for all Involvements"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:117
-#: src/TouchPoint-WP/Settings.php:944
+#: src/TouchPoint-WP/Settings.php:949
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr ""
 
@@ -688,636 +688,636 @@ msgstr ""
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:261
+#: src/TouchPoint-WP/Settings.php:266
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:262
+#: src/TouchPoint-WP/Settings.php:267
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:266
+#: src/TouchPoint-WP/Settings.php:271
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:267
+#: src/TouchPoint-WP/Settings.php:272
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:278
+#: src/TouchPoint-WP/Settings.php:283
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:279
+#: src/TouchPoint-WP/Settings.php:284
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:286
+#: src/TouchPoint-WP/Settings.php:291
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:287
+#: src/TouchPoint-WP/Settings.php:292
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:297
+#: src/TouchPoint-WP/Settings.php:302
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:298
+#: src/TouchPoint-WP/Settings.php:303
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:308
+#: src/TouchPoint-WP/Settings.php:313
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:309
+#: src/TouchPoint-WP/Settings.php:314
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:319
+#: src/TouchPoint-WP/Settings.php:324
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:320
+#: src/TouchPoint-WP/Settings.php:325
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:330
+#: src/TouchPoint-WP/Settings.php:335
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:331
+#: src/TouchPoint-WP/Settings.php:336
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:341
+#: src/TouchPoint-WP/Settings.php:346
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:342
+#: src/TouchPoint-WP/Settings.php:347
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:352
+#: src/TouchPoint-WP/Settings.php:357
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:353
+#: src/TouchPoint-WP/Settings.php:358
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:368
+#: src/TouchPoint-WP/Settings.php:373
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:369
+#: src/TouchPoint-WP/Settings.php:374
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:380
+#: src/TouchPoint-WP/Settings.php:385
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:381
+#: src/TouchPoint-WP/Settings.php:386
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:393
+#: src/TouchPoint-WP/Settings.php:398
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:394
+#: src/TouchPoint-WP/Settings.php:399
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:409
+#: src/TouchPoint-WP/Settings.php:414
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:410
+#: src/TouchPoint-WP/Settings.php:415
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:421
+#: src/TouchPoint-WP/Settings.php:426
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:422
+#: src/TouchPoint-WP/Settings.php:427
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:433
+#: src/TouchPoint-WP/Settings.php:438
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:434
+#: src/TouchPoint-WP/Settings.php:439
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:444
+#: src/TouchPoint-WP/Settings.php:449
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:445
+#: src/TouchPoint-WP/Settings.php:450
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:455
+#: src/TouchPoint-WP/Settings.php:460
 msgid "List Site in Directory"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:456
+#: src/TouchPoint-WP/Settings.php:461
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:473
 #: src/TouchPoint-WP/Settings.php:478
+#: src/TouchPoint-WP/Settings.php:483
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:476
+#: src/TouchPoint-WP/Settings.php:481
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:477
+#: src/TouchPoint-WP/Settings.php:482
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:494
+#: src/TouchPoint-WP/Settings.php:499
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:495
+#: src/TouchPoint-WP/Settings.php:500
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:499
+#: src/TouchPoint-WP/Settings.php:504
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:500
+#: src/TouchPoint-WP/Settings.php:505
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:511
+#: src/TouchPoint-WP/Settings.php:516
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:512
+#: src/TouchPoint-WP/Settings.php:517
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:522
+#: src/TouchPoint-WP/Settings.php:527
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:523
+#: src/TouchPoint-WP/Settings.php:528
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:533
-#: src/TouchPoint-WP/Settings.php:771
+#: src/TouchPoint-WP/Settings.php:538
+#: src/TouchPoint-WP/Settings.php:776
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:534
+#: src/TouchPoint-WP/Settings.php:539
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:550
+#: src/TouchPoint-WP/Settings.php:555
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:551
+#: src/TouchPoint-WP/Settings.php:556
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:555
+#: src/TouchPoint-WP/Settings.php:560
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:556
+#: src/TouchPoint-WP/Settings.php:561
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:565
+#: src/TouchPoint-WP/Settings.php:570
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:566
+#: src/TouchPoint-WP/Settings.php:571
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:575
+#: src/TouchPoint-WP/Settings.php:580
 msgid "Change Profile Links"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:576
+#: src/TouchPoint-WP/Settings.php:581
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:585
+#: src/TouchPoint-WP/Settings.php:590
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:586
+#: src/TouchPoint-WP/Settings.php:591
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:592
+#: src/TouchPoint-WP/Settings.php:597
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:593
+#: src/TouchPoint-WP/Settings.php:598
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:607
+#: src/TouchPoint-WP/Settings.php:612
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:608
+#: src/TouchPoint-WP/Settings.php:613
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:613
+#: src/TouchPoint-WP/Settings.php:618
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:643
+#: src/TouchPoint-WP/Settings.php:648
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:644
+#: src/TouchPoint-WP/Settings.php:649
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:648
+#: src/TouchPoint-WP/Settings.php:653
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:649
+#: src/TouchPoint-WP/Settings.php:654
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:659
+#: src/TouchPoint-WP/Settings.php:664
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:660
+#: src/TouchPoint-WP/Settings.php:665
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:670
+#: src/TouchPoint-WP/Settings.php:675
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:671
+#: src/TouchPoint-WP/Settings.php:676
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:681
+#: src/TouchPoint-WP/Settings.php:686
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:682
+#: src/TouchPoint-WP/Settings.php:687
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:692
+#: src/TouchPoint-WP/Settings.php:697
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:693
+#: src/TouchPoint-WP/Settings.php:698
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:705
+#: src/TouchPoint-WP/Settings.php:710
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:706
+#: src/TouchPoint-WP/Settings.php:711
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:716
+#: src/TouchPoint-WP/Settings.php:721
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:717
+#: src/TouchPoint-WP/Settings.php:722
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:727
+#: src/TouchPoint-WP/Settings.php:732
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:728
+#: src/TouchPoint-WP/Settings.php:733
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:738
+#: src/TouchPoint-WP/Settings.php:743
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:739
+#: src/TouchPoint-WP/Settings.php:744
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:749
+#: src/TouchPoint-WP/Settings.php:754
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:750
+#: src/TouchPoint-WP/Settings.php:755
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:760
+#: src/TouchPoint-WP/Settings.php:765
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:761
+#: src/TouchPoint-WP/Settings.php:766
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:772
+#: src/TouchPoint-WP/Settings.php:777
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:783
+#: src/TouchPoint-WP/Settings.php:788
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:784
+#: src/TouchPoint-WP/Settings.php:789
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:801
+#: src/TouchPoint-WP/Settings.php:806
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:805
+#: src/TouchPoint-WP/Settings.php:810
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:811
+#: src/TouchPoint-WP/Settings.php:816
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:812
+#: src/TouchPoint-WP/Settings.php:817
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:816
+#: src/TouchPoint-WP/Settings.php:821
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:817
+#: src/TouchPoint-WP/Settings.php:822
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:827
+#: src/TouchPoint-WP/Settings.php:832
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:830
+#: src/TouchPoint-WP/Settings.php:835
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:832
+#: src/TouchPoint-WP/Settings.php:837
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:847
+#: src/TouchPoint-WP/Settings.php:852
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:848
+#: src/TouchPoint-WP/Settings.php:853
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:860
+#: src/TouchPoint-WP/Settings.php:865
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:861
+#: src/TouchPoint-WP/Settings.php:866
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:870
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:866
+#: src/TouchPoint-WP/Settings.php:871
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:871
-#: src/TouchPoint-WP/Settings.php:873
+#: src/TouchPoint-WP/Settings.php:876
+#: src/TouchPoint-WP/Settings.php:878
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:871
-#: src/TouchPoint-WP/Settings.php:873
+#: src/TouchPoint-WP/Settings.php:876
+#: src/TouchPoint-WP/Settings.php:878
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:877
+#: src/TouchPoint-WP/Settings.php:882
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:878
+#: src/TouchPoint-WP/Settings.php:883
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:883
-#: src/TouchPoint-WP/Settings.php:885
+#: src/TouchPoint-WP/Settings.php:888
+#: src/TouchPoint-WP/Settings.php:890
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:883
-#: src/TouchPoint-WP/Settings.php:885
+#: src/TouchPoint-WP/Settings.php:888
+#: src/TouchPoint-WP/Settings.php:890
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:889
+#: src/TouchPoint-WP/Settings.php:894
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:890
+#: src/TouchPoint-WP/Settings.php:895
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:902
+#: src/TouchPoint-WP/Settings.php:907
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:903
+#: src/TouchPoint-WP/Settings.php:908
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:915
+#: src/TouchPoint-WP/Settings.php:920
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:916
+#: src/TouchPoint-WP/Settings.php:921
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:928
+#: src/TouchPoint-WP/Settings.php:933
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:929
+#: src/TouchPoint-WP/Settings.php:934
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:963
+#: src/TouchPoint-WP/Settings.php:968
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:964
+#: src/TouchPoint-WP/Settings.php:969
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:968
+#: src/TouchPoint-WP/Settings.php:973
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:969
+#: src/TouchPoint-WP/Settings.php:974
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:980
+#: src/TouchPoint-WP/Settings.php:985
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:981
+#: src/TouchPoint-WP/Settings.php:986
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:992
+#: src/TouchPoint-WP/Settings.php:997
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:993
+#: src/TouchPoint-WP/Settings.php:998
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1006
+#: src/TouchPoint-WP/Settings.php:1011
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1017
-#: src/TouchPoint-WP/Settings.php:1148
+#: src/TouchPoint-WP/Settings.php:1022
+#: src/TouchPoint-WP/Settings.php:1153
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1018
+#: src/TouchPoint-WP/Settings.php:1023
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1032
-#: src/TouchPoint-WP/Settings.php:1038
+#: src/TouchPoint-WP/Settings.php:1037
+#: src/TouchPoint-WP/Settings.php:1043
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1033
+#: src/TouchPoint-WP/Settings.php:1038
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1057
+#: src/TouchPoint-WP/Settings.php:1062
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1058
+#: src/TouchPoint-WP/Settings.php:1063
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1065
+#: src/TouchPoint-WP/Settings.php:1070
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1066
+#: src/TouchPoint-WP/Settings.php:1071
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1077
+#: src/TouchPoint-WP/Settings.php:1082
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1078
+#: src/TouchPoint-WP/Settings.php:1083
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1089
+#: src/TouchPoint-WP/Settings.php:1094
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1090
+#: src/TouchPoint-WP/Settings.php:1095
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1106
+#: src/TouchPoint-WP/Settings.php:1111
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1107
+#: src/TouchPoint-WP/Settings.php:1112
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1111
+#: src/TouchPoint-WP/Settings.php:1116
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1112
+#: src/TouchPoint-WP/Settings.php:1117
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1123
+#: src/TouchPoint-WP/Settings.php:1128
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1124
+#: src/TouchPoint-WP/Settings.php:1129
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1135
+#: src/TouchPoint-WP/Settings.php:1140
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1136
+#: src/TouchPoint-WP/Settings.php:1141
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1149
+#: src/TouchPoint-WP/Settings.php:1154
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1314
+#: src/TouchPoint-WP/Settings.php:1317
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1368
-#: src/TouchPoint-WP/Settings.php:1369
+#: src/TouchPoint-WP/Settings.php:1371
+#: src/TouchPoint-WP/Settings.php:1372
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1417
+#: src/TouchPoint-WP/Settings.php:1420
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1666
+#: src/TouchPoint-WP/Settings.php:1671
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1788
+#: src/TouchPoint-WP/Settings.php:1793
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1839
+#: src/TouchPoint-WP/Settings.php:1844
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 47e65d8b..2fc65d47 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -127,8 +127,6 @@ public function __construct(TouchPointWP $parent)
 	{
 		$this->parent = $parent;
 
-		$this->initSettings();
-
 		// Register plugin settings.
 		add_action('admin_init', [$this, 'registerSettings']);
 
@@ -174,6 +172,11 @@ public static function instance(?TouchPointWP $parent = null): Settings
 	 */
 	public function initSettings(): void
 	{
+		if (count($this->settings) > 0) {
+			// Settings are already loaded.
+			return;
+		}
+
 		$this->settings = $this->settingsFields();
 	}
 
@@ -257,7 +260,9 @@ private function settingsFields(bool|string $includeDetail = false): array
 			return $this->settings;
 		}
 
-		$this->settings['basic'] = [
+		$settings = [];
+
+		$settings['basic'] = [
 			'title'       => __('Basic Settings', 'TouchPoint-WP'),
 			'description' => __('Connect to TouchPoint and choose which features you wish to use.', 'TouchPoint-WP'),
 			'fields'      => [
@@ -468,7 +473,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 			&& $this->getWithoutDefault('system_name') !== self::UNDEFINED_PLACEHOLDER
 			&& $this->hasValidApiSettings()) {
 			/** @noinspection HtmlUnknownTarget */
-			$this->settings['basic']['fields'][] = [
+			$settings['basic']['fields'][] = [
 				'id'          => 'generate-scripts',
 				'label'       => __('Generate Scripts', 'TouchPoint-WP'),
 				'type'        => 'instructions',
@@ -490,7 +495,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 			$includeThis              = $includeDetail === true || $includeDetail === 'people';
 			$urlParts = wp_parse_url(home_url());
 			$defaultUserPev = $urlParts['host'] . " User ID";
-			$this->settings['people'] = [
+			$settings['people'] = [
 				'title'       => __('People', 'TouchPoint-WP'),
 				'description' => __('Manage how people are synchronized between TouchPoint and WordPress.', 'TouchPoint-WP'),
 				'fields'      => [
@@ -546,7 +551,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_authentication') === "on") { // TODO MULTI
 //			$includeThis = $includeDetail === true || $includeDetail === 'authentication';
-			$this->settings['authentication'] = [
+			$settings['authentication'] = [
 				'title'       => __('Authentication', 'TouchPoint-WP'),
 				'description' => __('Allow users to log into WordPress using TouchPoint.', 'TouchPoint-WP'),
 				'fields'      => [
@@ -603,7 +608,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_involvements') === "on") {  // TODO MULTI
 			$includeThis                    = $includeDetail === true || $includeDetail === 'involvements';
-			$this->settings['involvements'] = [
+			$settings['involvements'] = [
 				'title'       => __('Involvements', 'TouchPoint-WP'),
 				'description' => __('Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here.', 'TouchPoint-WP'),
 				'fields'      => [
@@ -639,7 +644,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_global') === "on") { // TODO MULTI
 			$includeThis              = $includeDetail === true || $includeDetail === 'global';
-			$this->settings['global'] = [
+			$settings['global'] = [
 				'title'       => __('Global Partners', 'TouchPoint-WP'),
 				'description' => __('Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records.', 'TouchPoint-WP'),
 				'fields'      => [
@@ -807,7 +812,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 			}
 
 			/** @noinspection HtmlUnknownTarget */
-			$this->settings['events_calendar'] = [
+			$settings['events_calendar'] = [
 				'title'       => __('App 2.0 Calendar', 'TouchPoint-WP'),
 				'description' => __('Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe.', 'TouchPoint-WP'),
 				'fields'      => [
@@ -856,7 +861,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_meeting_cal') === "on") { // TODO MULTI
 //			$includeThis = $includeDetail === true || $includeDetail === 'events';
 			$tribe = TouchPointWP::useTribeCalendar();
-			$this->settings['meetCal'] = [
+			$settings['meetCal'] = [
 				'title'       => __('Meeting Calendars', 'TouchPoint-WP'),
 				'description' => __('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
 				'fields'      => [
@@ -959,7 +964,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 		}
 
 		$includeThis = $includeDetail === true || $includeDetail === 'divisions';
-		$this->settings['divisions'] = [
+		$settings['divisions'] = [
 			'title'       => __('Divisions', 'TouchPoint-WP'),
 			'description' => __('Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.', 'TouchPoint-WP'),
 			'fields'      => [
@@ -1028,7 +1033,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 			],
 		];
 
-		$this->settings['locations'] = [
+		$settings['locations'] = [
 			'title'       => __('Locations', 'TouchPoint-WP'),
 			'description' => __('Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly.', 'TouchPoint-WP'),
 			'fields'      => [
@@ -1053,7 +1058,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 		];
 
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_campuses') === "on") { // TODO MULTI
-			$this->settings['campuses'] = [
+			$settings['campuses'] = [
 				'title'       => __('Campuses', 'TouchPoint-WP'),
 				'description' => __(
 					'Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.',
@@ -1102,7 +1107,7 @@ private function settingsFields(bool|string $includeDetail = false): array
 		}
 
 		$includeThis = $includeDetail === true || $includeDetail === 'resident_codes';
-		$this->settings['resident_codes'] = [
+		$settings['resident_codes'] = [
 			'title'       => __('Resident Codes', 'TouchPoint-WP'),
 			'description' => __('Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations.', 'TouchPoint-WP'),
 			'fields'      => [
@@ -1289,11 +1294,9 @@ private function settingsFields(bool|string $includeDetail = false): array
 		 *
 		 * @since 0.0.90 Added
 		 *
-		 * @params array $this->settings The settings array.
+		 * @params array $settings The settings array.
 		 */
-		$this->settings = apply_filters('tp_settings_fields', $this->settings);
-
-		return $this->settings;
+		return apply_filters('tp_settings_fields', $settings);
 	}
 
 	/**
@@ -1442,6 +1445,8 @@ public function __get(string $what)
 	 */
 	public function get(string $what): mixed
 	{
+		$this->initSettings();
+
 		$v = $this->getWithoutDefault($what);
 
 		$meta = $this->getFieldMeta($what); // $meta can be null if option isn't in settings (e.g. cached meta fields)

From 1a516b9596e6bdbe7621a40dde4ba4aa35a729b1 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 1 May 2025 15:22:17 -0400
Subject: [PATCH 279/423] Resolve issue of calling translations too early.
 Closes #230

---
 i18n/TouchPoint-WP-es_ES.po    | 342 ++++++++++++++---------------
 i18n/TouchPoint-WP.pot         | 344 ++++++++++++++---------------
 src/TouchPoint-WP/Settings.php | 381 ++++++++++++++++++---------------
 3 files changed, 548 insertions(+), 519 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index dc607190..7a3d69d6 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -55,7 +55,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:1010
+#: src/TouchPoint-WP/Settings.php:1041
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
@@ -339,458 +339,458 @@ msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
-#: src/TouchPoint-WP/Settings.php:266
+#: src/TouchPoint-WP/Settings.php:297
 msgid "Basic Settings"
 msgstr "Ajustes básicos"
 
-#: src/TouchPoint-WP/Settings.php:267
+#: src/TouchPoint-WP/Settings.php:298
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr "Conéctese a TouchPoint y elija qué funciones desea usar."
 
-#: src/TouchPoint-WP/Settings.php:271
+#: src/TouchPoint-WP/Settings.php:302
 msgid "Enable Authentication"
 msgstr "Habilitar autenticación"
 
-#: src/TouchPoint-WP/Settings.php:272
+#: src/TouchPoint-WP/Settings.php:303
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr "Permita que los usuarios de TouchPoint inicien sesión en este sitio web con TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:283
+#: src/TouchPoint-WP/Settings.php:314
 msgid "Enable RSVP Tool"
 msgstr "Habilitar la herramienta RSVP"
 
-#: src/TouchPoint-WP/Settings.php:284
+#: src/TouchPoint-WP/Settings.php:315
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr "Agregue un botón RSVP muy simple a las páginas de eventos de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:291
+#: src/TouchPoint-WP/Settings.php:322
 msgid "Enable Involvements"
 msgstr "Habilitar Participaciones"
 
-#: src/TouchPoint-WP/Settings.php:292
+#: src/TouchPoint-WP/Settings.php:323
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr "Cargue participaciones desde TouchPoint para obtener listas de participación y entradas nativas en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:313
+#: src/TouchPoint-WP/Settings.php:344
 msgid "Enable Public People Lists"
 msgstr "Habilitar listas de personas públicas"
 
-#: src/TouchPoint-WP/Settings.php:314
+#: src/TouchPoint-WP/Settings.php:345
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr "Importe listados públicos de personas desde TouchPoint (por ejemplo, personal o ancianos)"
 
-#: src/TouchPoint-WP/Settings.php:324
+#: src/TouchPoint-WP/Settings.php:355
 msgid "Enable Global Partner Listings"
 msgstr "Habilitar listados de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:325
+#: src/TouchPoint-WP/Settings.php:356
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr "Importe socios ministeriales de TouchPoint para incluirlos en una lista pública."
 
-#: src/TouchPoint-WP/Settings.php:346
+#: src/TouchPoint-WP/Settings.php:377
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
-#: src/TouchPoint-WP/Settings.php:347
+#: src/TouchPoint-WP/Settings.php:378
 msgid "What your church calls your TouchPoint database."
 msgstr "Lo que su iglesia llama su base de datos TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:357
+#: src/TouchPoint-WP/Settings.php:388
 msgid "TouchPoint Host Name"
 msgstr "Nombre de host del TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:358
+#: src/TouchPoint-WP/Settings.php:389
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr "El dominio de su base de datos TouchPoint, sin https ni barras."
 
-#: src/TouchPoint-WP/Settings.php:373
+#: src/TouchPoint-WP/Settings.php:404
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr "Nombre de host de enlace profundo de aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:385
+#: src/TouchPoint-WP/Settings.php:416
 msgid "TouchPoint API Username"
 msgstr "Nombre de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:398
+#: src/TouchPoint-WP/Settings.php:429
 msgid "TouchPoint API User Password"
 msgstr "Contraseña de usuario de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:399
+#: src/TouchPoint-WP/Settings.php:430
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr "La contraseña de una cuenta de usuario en TouchPoint con permisos de API."
 
-#: src/TouchPoint-WP/Settings.php:414
+#: src/TouchPoint-WP/Settings.php:445
 msgid "TouchPoint API Script Name"
 msgstr "Nombre de la secuencia de comandos de la API de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:415
+#: src/TouchPoint-WP/Settings.php:446
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr "El nombre de la secuencia de comandos de Python cargada en TouchPoint. No cambies esto a menos que sepas lo que estás haciendo."
 
-#: src/TouchPoint-WP/Settings.php:426
+#: src/TouchPoint-WP/Settings.php:457
 msgid "Google Maps Javascript API Key"
 msgstr "Clave de la API de Javascript de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:427
+#: src/TouchPoint-WP/Settings.php:458
 msgid "Required for embedding maps."
 msgstr "Necesario para incrustar mapas."
 
-#: src/TouchPoint-WP/Settings.php:438
+#: src/TouchPoint-WP/Settings.php:469
 msgid "Google Maps Geocoding API Key"
 msgstr "Clave API de codificación geográfica de Google Maps"
 
-#: src/TouchPoint-WP/Settings.php:439
+#: src/TouchPoint-WP/Settings.php:470
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr "Opcional. Permite la geocodificación inversa de las ubicaciones de los usuarios."
 
-#: src/TouchPoint-WP/Settings.php:478
-#: src/TouchPoint-WP/Settings.php:483
+#: src/TouchPoint-WP/Settings.php:509
+#: src/TouchPoint-WP/Settings.php:514
 msgid "Generate Scripts"
 msgstr "Generar secuencias de comandos"
 
-#: src/TouchPoint-WP/Settings.php:482
+#: src/TouchPoint-WP/Settings.php:513
 msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
-#: src/TouchPoint-WP/Settings.php:499
+#: src/TouchPoint-WP/Settings.php:530
 msgid "People"
 msgstr "Gente"
 
-#: src/TouchPoint-WP/Settings.php:500
+#: src/TouchPoint-WP/Settings.php:531
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr "Administre cómo se sincronizan las personas entre TouchPoint y WordPress."
 
-#: src/TouchPoint-WP/Settings.php:504
+#: src/TouchPoint-WP/Settings.php:535
 msgid "Contact Keywords"
 msgstr "Palabras clave de contacto"
 
-#: src/TouchPoint-WP/Settings.php:505
+#: src/TouchPoint-WP/Settings.php:536
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr "Estas palabras clave se utilizarán cuando alguien haga clic en el botón \"Contactar\" en la lista o el perfil de una Persona."
 
-#: src/TouchPoint-WP/Settings.php:516
+#: src/TouchPoint-WP/Settings.php:547
 msgid "Extra Value for WordPress User ID"
 msgstr "Valor Adicional para la ID de usuario de WordPress"
 
-#: src/TouchPoint-WP/Settings.php:517
+#: src/TouchPoint-WP/Settings.php:548
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr "El nombre del valor adicional que se usará para el ID de usuario de WordPress. Si está utilizando varias instancias de WordPress con una base de datos de TouchPoint, necesitará que estos valores sean únicos entre las instancias de WordPress. En la mayoría de los casos, el valor predeterminado está bien."
 
-#: src/TouchPoint-WP/Settings.php:527
+#: src/TouchPoint-WP/Settings.php:558
 msgid "Extra Value: Biography"
 msgstr "Valor Adicional: Biografía"
 
-#: src/TouchPoint-WP/Settings.php:528
+#: src/TouchPoint-WP/Settings.php:559
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr "Importe una biografía desde un campo de Valor Adicional de Persona. Puede ser un Valor Adicional HTML o de texto. Esto sobrescribirá cualquier valor establecido por WordPress. Dejar en blanco para no importar."
 
-#: src/TouchPoint-WP/Settings.php:538
-#: src/TouchPoint-WP/Settings.php:776
+#: src/TouchPoint-WP/Settings.php:569
+#: src/TouchPoint-WP/Settings.php:807
 msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
-#: src/TouchPoint-WP/Settings.php:539
+#: src/TouchPoint-WP/Settings.php:570
 msgid "Import People Extra Value fields as User Meta data."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
-#: src/TouchPoint-WP/Settings.php:555
+#: src/TouchPoint-WP/Settings.php:586
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/TouchPoint-WP/Settings.php:556
+#: src/TouchPoint-WP/Settings.php:587
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr "Permita que los usuarios inicien sesión en WordPress usando TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:560
+#: src/TouchPoint-WP/Settings.php:591
 msgid "Make TouchPoint the default authentication method."
 msgstr "Haga que TouchPoint sea el método de autenticación predeterminado."
 
-#: src/TouchPoint-WP/Settings.php:570
+#: src/TouchPoint-WP/Settings.php:601
 msgid "Enable Auto-Provisioning"
 msgstr "Habilitar el aprovisionamiento automático"
 
-#: src/TouchPoint-WP/Settings.php:571
+#: src/TouchPoint-WP/Settings.php:602
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr "Cree automáticamente usuarios de WordPress, si es necesario, para que coincidan con los usuarios autenticados de TouchPoint."
 
-#: src/TouchPoint-WP/Settings.php:581
+#: src/TouchPoint-WP/Settings.php:612
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr "Los enlaces \"Editar perfil\" llevarán al usuario a su perfil de TouchPoint, en lugar de a su perfil de WordPress."
 
-#: src/TouchPoint-WP/Settings.php:590
+#: src/TouchPoint-WP/Settings.php:621
 msgid "Enable full logout"
 msgstr "Habilitar cierre de sesión completo"
 
-#: src/TouchPoint-WP/Settings.php:591
+#: src/TouchPoint-WP/Settings.php:622
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr "Cierre sesión en TouchPoint al cerrar sesión en WordPress."
 
-#: src/TouchPoint-WP/Settings.php:597
+#: src/TouchPoint-WP/Settings.php:628
 msgid "Prevent Subscriber Admin Bar"
 msgstr "Prevenir la barra de administración de suscriptores"
 
-#: src/TouchPoint-WP/Settings.php:598
+#: src/TouchPoint-WP/Settings.php:629
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
-#: src/TouchPoint-WP/Settings.php:612
+#: src/TouchPoint-WP/Settings.php:643
 msgid "Involvements"
 msgstr "Involucramientos"
 
-#: src/TouchPoint-WP/Settings.php:613
+#: src/TouchPoint-WP/Settings.php:644
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr "Importe participaciones desde TouchPoint para enumerarlas en su sitio web, para grupos pequeños, clases y más. Seleccione la(s) división(es) que corresponda(n) inmediatamente al tipo de participación que desea enumerar. Por ejemplo, si desea una lista de grupos pequeños y tiene una división de grupos pequeños, solo seleccione la división de grupos pequeños. Si desea que las participaciones se puedan filtrar por divisiones adicionales, seleccione esas divisiones en la pestaña Divisiones, no aquí."
 
-#: src/TouchPoint-WP/Settings.php:618
+#: src/TouchPoint-WP/Settings.php:649
 msgid "Involvement Post Types"
 msgstr "Tipos de publicaciones de Involucramientos"
 
-#: src/TouchPoint-WP/Settings.php:648
+#: src/TouchPoint-WP/Settings.php:679
 msgid "Global Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/Settings.php:649
+#: src/TouchPoint-WP/Settings.php:680
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr "Administre cómo se importan los socios globales desde TouchPoint para incluirlos en WordPress. Los socios se agrupan por familia y el contenido se proporciona a través de Valor Extra Familiar. Esto funciona tanto para registros de personas como de empresas."
 
-#: src/TouchPoint-WP/Settings.php:653
+#: src/TouchPoint-WP/Settings.php:684
 msgid "Global Partner Name (Plural)"
 msgstr "Nombre de los misioneros (plural)"
 
-#: src/TouchPoint-WP/Settings.php:654
+#: src/TouchPoint-WP/Settings.php:685
 msgid "What you call Global Partners at your church"
 msgstr "Lo que llamas los Misioneros en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:664
+#: src/TouchPoint-WP/Settings.php:695
 msgid "Global Partner Name (Singular)"
 msgstr "Nombre de un misionero (singular)"
 
-#: src/TouchPoint-WP/Settings.php:665
+#: src/TouchPoint-WP/Settings.php:696
 msgid "What you call a Global Partner at your church"
 msgstr "Lo que llamas un Misionero en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:675
+#: src/TouchPoint-WP/Settings.php:706
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr "Nombre de los misioneros para lugares seguros (plural)"
 
-#: src/TouchPoint-WP/Settings.php:676
+#: src/TouchPoint-WP/Settings.php:707
 msgid "What you call Secure Global Partners at your church"
 msgstr "Lo que llamas un Misionero seguro en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:686
+#: src/TouchPoint-WP/Settings.php:717
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr "Nombre de un misionero para lugares seguros (singular)"
 
-#: src/TouchPoint-WP/Settings.php:687
+#: src/TouchPoint-WP/Settings.php:718
 msgid "What you call a Secure Global Partner at your church"
 msgstr "Lo que llamas los Misioneros seguros en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:697
+#: src/TouchPoint-WP/Settings.php:728
 msgid "Global Partner Slug"
 msgstr "Slug de Socio Global"
 
-#: src/TouchPoint-WP/Settings.php:698
+#: src/TouchPoint-WP/Settings.php:729
 msgid "The root path for Global Partner posts"
 msgstr "La ruta raíz para las publicaciones de Socios Globales"
 
-#: src/TouchPoint-WP/Settings.php:710
+#: src/TouchPoint-WP/Settings.php:741
 msgid "Saved Search"
 msgstr "Búsqueda Guardada"
 
-#: src/TouchPoint-WP/Settings.php:711
+#: src/TouchPoint-WP/Settings.php:742
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr "Cualquiera que esté incluido en esta búsqueda guardada se incluirá en la lista."
 
-#: src/TouchPoint-WP/Settings.php:721
+#: src/TouchPoint-WP/Settings.php:752
 msgid "Extra Value: Description"
 msgstr "Valor Adicional: Descripción"
 
-#: src/TouchPoint-WP/Settings.php:722
+#: src/TouchPoint-WP/Settings.php:753
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr "Importe una descripción de un campo de Valor Extra Familiar. Puede ser un valor adicional HTML o de texto. Esto se convierte en el cuerpo de la publicación del socio global."
 
-#: src/TouchPoint-WP/Settings.php:732
+#: src/TouchPoint-WP/Settings.php:763
 msgid "Extra Value: Summary"
 msgstr "Valor Adicional: Resumen"
 
-#: src/TouchPoint-WP/Settings.php:733
+#: src/TouchPoint-WP/Settings.php:764
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr "Opcional. Importe una breve descripción de un campo de Valor Extra Familiar. Puede ser un Valor Adicional HTML o de texto. Si no se proporciona, la biografía completa se truncará."
 
-#: src/TouchPoint-WP/Settings.php:743
+#: src/TouchPoint-WP/Settings.php:774
 msgid "Latitude Override"
 msgstr "Anulación de latitud"
 
-#: src/TouchPoint-WP/Settings.php:744
+#: src/TouchPoint-WP/Settings.php:775
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una latitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/Settings.php:754
+#: src/TouchPoint-WP/Settings.php:785
 msgid "Longitude Override"
 msgstr "Anulación de longitud"
 
-#: src/TouchPoint-WP/Settings.php:755
+#: src/TouchPoint-WP/Settings.php:786
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr "Designe un Valor Familiar Adicional de texto que contenga una longitud que anule cualquier ubicación en el perfil del socio para el mapa de socios. Tanto la latitud como la longitud deben proporcionarse para que se produzca una anulación."
 
-#: src/TouchPoint-WP/Settings.php:765
+#: src/TouchPoint-WP/Settings.php:796
 msgid "Public Location"
 msgstr "Ubicación Pública"
 
-#: src/TouchPoint-WP/Settings.php:766
+#: src/TouchPoint-WP/Settings.php:797
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
-#: src/TouchPoint-WP/Settings.php:777
+#: src/TouchPoint-WP/Settings.php:808
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
-#: src/TouchPoint-WP/Settings.php:788
+#: src/TouchPoint-WP/Settings.php:819
 msgid "Primary Taxonomy"
 msgstr "Taxonomía Primaria"
 
-#: src/TouchPoint-WP/Settings.php:789
+#: src/TouchPoint-WP/Settings.php:820
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr "Importe un Valor Adicional Familiar como el medio principal por el cual se organizan los socios."
 
-#: src/TouchPoint-WP/Settings.php:832
+#: src/TouchPoint-WP/Settings.php:863
 msgid "Events for Custom Mobile App"
 msgstr "Eventos para la aplicación móvil personalizada"
 
-#: src/TouchPoint-WP/Settings.php:837
+#: src/TouchPoint-WP/Settings.php:868
 msgid "Preview"
 msgstr "Preestrena"
 
-#: src/TouchPoint-WP/Settings.php:852
+#: src/TouchPoint-WP/Settings.php:883
 msgid "Use Standardizing Stylesheet"
 msgstr "Usar hoja de estilo de estandarización"
 
-#: src/TouchPoint-WP/Settings.php:853
+#: src/TouchPoint-WP/Settings.php:884
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
 
-#: src/TouchPoint-WP/Settings.php:968
+#: src/TouchPoint-WP/Settings.php:999
 msgid "Divisions"
 msgstr "Divisiones"
 
-#: src/TouchPoint-WP/Settings.php:969
+#: src/TouchPoint-WP/Settings.php:1000
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:973
+#: src/TouchPoint-WP/Settings.php:1004
 msgid "Division Name (Plural)"
 msgstr "Nombre de la División (plural)"
 
-#: src/TouchPoint-WP/Settings.php:974
+#: src/TouchPoint-WP/Settings.php:1005
 msgid "What you call Divisions at your church"
 msgstr "Lo que llamas Divisiones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:985
+#: src/TouchPoint-WP/Settings.php:1016
 msgid "Division Name (Singular)"
 msgstr "Nombre de la División (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:986
+#: src/TouchPoint-WP/Settings.php:1017
 msgid "What you call a Division at your church"
 msgstr "Lo que llamas una división en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:997
+#: src/TouchPoint-WP/Settings.php:1028
 msgid "Division Slug"
 msgstr "Slug de División"
 
-#: src/TouchPoint-WP/Settings.php:998
+#: src/TouchPoint-WP/Settings.php:1029
 msgid "The root path for the Division Taxonomy"
 msgstr "La ruta raíz para la Taxonomía de División"
 
-#: src/TouchPoint-WP/Settings.php:1011
+#: src/TouchPoint-WP/Settings.php:1042
 msgid "These Divisions will be imported for the taxonomy"
 msgstr "Estas Divisiones se importarán para la taxonomía"
 
-#: src/TouchPoint-WP/Settings.php:1062
+#: src/TouchPoint-WP/Settings.php:1093
 msgid "Campuses"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Settings.php:1063
+#: src/TouchPoint-WP/Settings.php:1094
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar a los usuarios y las participaciones."
 
-#: src/TouchPoint-WP/Settings.php:1070
+#: src/TouchPoint-WP/Settings.php:1101
 msgid "Campus Name (Plural)"
 msgstr "Nombre del Campus (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1071
+#: src/TouchPoint-WP/Settings.php:1102
 msgid "What you call Campuses at your church"
 msgstr "Lo que llamas Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1082
+#: src/TouchPoint-WP/Settings.php:1113
 msgid "Campus Name (Singular)"
 msgstr "Nombre del Campus (Singular)"
 
-#: src/TouchPoint-WP/Settings.php:1083
+#: src/TouchPoint-WP/Settings.php:1114
 msgid "What you call a Campus at your church"
 msgstr "Lo que llamas un Campus en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1094
+#: src/TouchPoint-WP/Settings.php:1125
 msgid "Campus Slug"
 msgstr "Slug de Campus"
 
-#: src/TouchPoint-WP/Settings.php:1095
+#: src/TouchPoint-WP/Settings.php:1126
 msgid "The root path for the Campus Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Campus"
 
-#: src/TouchPoint-WP/Settings.php:1111
+#: src/TouchPoint-WP/Settings.php:1142
 msgid "Resident Codes"
 msgstr "Códigos de Residentes"
 
-#: src/TouchPoint-WP/Settings.php:1112
+#: src/TouchPoint-WP/Settings.php:1143
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomía. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
 
-#: src/TouchPoint-WP/Settings.php:1116
+#: src/TouchPoint-WP/Settings.php:1147
 msgid "Resident Code Name (Plural)"
 msgstr "Nombre de Código de Tesidente (Plural)"
 
-#: src/TouchPoint-WP/Settings.php:1117
+#: src/TouchPoint-WP/Settings.php:1148
 msgid "What you call Resident Codes at your church"
 msgstr "Lo que llamas Códigos de Residente en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1128
+#: src/TouchPoint-WP/Settings.php:1159
 msgid "Resident Code Name (Singular)"
 msgstr "Nombre de Código de Residente (singular)"
 
-#: src/TouchPoint-WP/Settings.php:1129
+#: src/TouchPoint-WP/Settings.php:1160
 msgid "What you call a Resident Code at your church"
 msgstr "Lo que llamas un Código de Residencia en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:1140
+#: src/TouchPoint-WP/Settings.php:1171
 msgid "Resident Code Slug"
 msgstr "Slug de Código Residente"
 
-#: src/TouchPoint-WP/Settings.php:1141
+#: src/TouchPoint-WP/Settings.php:1172
 msgid "The root path for the Resident Code Taxonomy"
 msgstr "La ruta raíz para la Taxonomía del Código de Residente"
 
-#: src/TouchPoint-WP/Settings.php:1317
+#: src/TouchPoint-WP/Settings.php:1348
 msgid "password saved"
 msgstr "contraseña guardada"
 
-#: src/TouchPoint-WP/Settings.php:1371
-#: src/TouchPoint-WP/Settings.php:1372
+#: src/TouchPoint-WP/Settings.php:1402
+#: src/TouchPoint-WP/Settings.php:1403
 msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1420
+#: src/TouchPoint-WP/Settings.php:1451
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/Settings.php:1671
+#: src/TouchPoint-WP/Settings.php:1700
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/Settings.php:1793
+#: src/TouchPoint-WP/Settings.php:1822
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1844
+#: src/TouchPoint-WP/Settings.php:1873
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
@@ -1140,12 +1140,12 @@ msgstr "Añade una ubicación"
 msgid "The Campus"
 msgstr "El campus"
 
-#: src/TouchPoint-WP/Settings.php:1037
-#: src/TouchPoint-WP/Settings.php:1043
+#: src/TouchPoint-WP/Settings.php:1068
+#: src/TouchPoint-WP/Settings.php:1074
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1038
+#: src/TouchPoint-WP/Settings.php:1069
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr "Las ubicaciones son lugares físicos, probablemente campus. No se requiere ninguno, pero pueden ayudar a presentar la información geográfica con claridad."
 
@@ -1254,7 +1254,7 @@ msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi l
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
 
-#: src/TouchPoint-WP/Settings.php:386
+#: src/TouchPoint-WP/Settings.php:417
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
@@ -1298,7 +1298,7 @@ msgstr "Datos proporcionados no válidos."
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
-#: src/TouchPoint-WP/Settings.php:335
+#: src/TouchPoint-WP/Settings.php:366
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
@@ -1363,7 +1363,7 @@ msgstr "Estados Civiles"
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
-#: src/TouchPoint-WP/Settings.php:336
+#: src/TouchPoint-WP/Settings.php:367
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si tienes varios campus)."
 
@@ -1431,11 +1431,11 @@ msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:896
 msgid "Meeting Calendars"
 msgstr "Calendarios de Reuniones"
 
-#: src/TouchPoint-WP/Settings.php:866
+#: src/TouchPoint-WP/Settings.php:897
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
@@ -1443,11 +1443,11 @@ msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
-#: src/TouchPoint-WP/Settings.php:894
+#: src/TouchPoint-WP/Settings.php:925
 msgid "Meetings Slug"
 msgstr "Slug de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:895
+#: src/TouchPoint-WP/Settings.php:926
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
@@ -1456,15 +1456,15 @@ msgstr "La ruta raíz para las reuniones"
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
-#: src/TouchPoint-WP/Settings.php:561
+#: src/TouchPoint-WP/Settings.php:592
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr "Al marcar esta casilla, la página de inicio de sesión de TouchPoint se convertirá en la predeterminada. Para evitar la redirección y llegar a la página de inicio de sesión estándar de WordPress, agregue 'tp_no_redirect' como parámetro de URL."
 
-#: src/TouchPoint-WP/Settings.php:374
+#: src/TouchPoint-WP/Settings.php:405
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https ni barras diagonales. Si no está utilizando la aplicación móvil personalizada, déjelo en blanco."
 
-#: src/TouchPoint-WP/Settings.php:481
+#: src/TouchPoint-WP/Settings.php:512
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
@@ -1496,40 +1496,40 @@ msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Settings.php:302
+#: src/TouchPoint-WP/Settings.php:333
 msgid "Enable Meeting Calendar"
 msgstr "Habilitar calendario de reuniones"
 
-#: src/TouchPoint-WP/Settings.php:303
+#: src/TouchPoint-WP/Settings.php:334
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr "Cargue reuniones desde TouchPoint para un calendario nativo en su sitio web."
 
-#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:938
 msgid "Days of Future"
 msgstr "Días del futuro"
 
-#: src/TouchPoint-WP/Settings.php:908
+#: src/TouchPoint-WP/Settings.php:939
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr "No se importarán reuniones que superen estos días en el futuro."
 
-#: src/TouchPoint-WP/Settings.php:920
+#: src/TouchPoint-WP/Settings.php:951
 msgid "Archive After Days"
 msgstr "Archivo después de días"
 
-#: src/TouchPoint-WP/Settings.php:933
+#: src/TouchPoint-WP/Settings.php:964
 msgid "Days of History"
 msgstr "Días de la Historia"
 
-#: src/TouchPoint-WP/Settings.php:1022
-#: src/TouchPoint-WP/Settings.php:1153
+#: src/TouchPoint-WP/Settings.php:1053
+#: src/TouchPoint-WP/Settings.php:1184
 msgid "Post Types"
 msgstr "Tipos de publicaciones"
 
-#: src/TouchPoint-WP/Settings.php:1023
+#: src/TouchPoint-WP/Settings.php:1054
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Settings.php:1154
+#: src/TouchPoint-WP/Settings.php:1185
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
@@ -1612,39 +1612,39 @@ msgstr "Reunión en %s"
 msgid "Person in %s"
 msgstr "Persona en %s"
 
-#: src/TouchPoint-WP/Settings.php:870
+#: src/TouchPoint-WP/Settings.php:901
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
 
-#: src/TouchPoint-WP/Settings.php:871
+#: src/TouchPoint-WP/Settings.php:902
 msgid "What you call Meetings at your church"
 msgstr "Lo que llamas Reuniones en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:876
-#: src/TouchPoint-WP/Settings.php:878
+#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:909
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/TouchPoint-WP/Settings.php:876
-#: src/TouchPoint-WP/Settings.php:878
+#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:909
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Settings.php:882
+#: src/TouchPoint-WP/Settings.php:913
 msgid "Meeting Name (Singular)"
 msgstr "Nombre de la reunión (singular)"
 
-#: src/TouchPoint-WP/Settings.php:883
+#: src/TouchPoint-WP/Settings.php:914
 msgid "What you call a Meeting at your church"
 msgstr "Cómo se llama una Reunión en tu iglesia"
 
-#: src/TouchPoint-WP/Settings.php:888
-#: src/TouchPoint-WP/Settings.php:890
+#: src/TouchPoint-WP/Settings.php:919
+#: src/TouchPoint-WP/Settings.php:921
 msgid "Meeting"
 msgstr "Reunión"
 
-#: src/TouchPoint-WP/Settings.php:888
-#: src/TouchPoint-WP/Settings.php:890
+#: src/TouchPoint-WP/Settings.php:919
+#: src/TouchPoint-WP/Settings.php:921
 msgid "Event"
 msgstr "Evento"
 
@@ -1751,31 +1751,31 @@ msgstr "No hay %s publicados para este mes."
 msgid "Radius (miles)"
 msgstr "Radio (millas)"
 
-#: src/TouchPoint-WP/Settings.php:806
+#: src/TouchPoint-WP/Settings.php:837
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr "Complemento de calendario de eventos de Modern Tribe"
 
-#: src/TouchPoint-WP/Settings.php:810
+#: src/TouchPoint-WP/Settings.php:841
 msgid "TouchPoint Meetings"
 msgstr "reuniones de TouchPoint"
 
-#: src/TouchPoint-WP/Settings.php:816
+#: src/TouchPoint-WP/Settings.php:847
 msgid "App 2.0 Calendar"
 msgstr "Calendario de la app 2.0"
 
-#: src/TouchPoint-WP/Settings.php:821
+#: src/TouchPoint-WP/Settings.php:852
 msgid "Events Provider"
 msgstr "Proveedor de eventos"
 
-#: src/TouchPoint-WP/Settings.php:822
+#: src/TouchPoint-WP/Settings.php:853
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr "El origen de los eventos para la versión 2.0 de la aplicación móvil personalizada."
 
-#: src/TouchPoint-WP/Settings.php:835
+#: src/TouchPoint-WP/Settings.php:866
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en <code>Wordpress Plugin - Modern Tribe</code> (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
 
-#: src/TouchPoint-WP/Settings.php:817
+#: src/TouchPoint-WP/Settings.php:848
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
@@ -1805,11 +1805,11 @@ msgctxt "list of items, and *others*"
 msgid "others"
 msgstr "otros"
 
-#: src/TouchPoint-WP/Settings.php:449
+#: src/TouchPoint-WP/Settings.php:480
 msgid "ipapi.co API Key"
 msgstr "Clave API de ipapi.co"
 
-#: src/TouchPoint-WP/Settings.php:450
+#: src/TouchPoint-WP/Settings.php:481
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
@@ -1842,15 +1842,15 @@ msgstr "Actualizada"
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: src/TouchPoint-WP/Settings.php:921
+#: src/TouchPoint-WP/Settings.php:952
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr "Las reuniones con más de esta cantidad de días en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
 
-#: src/TouchPoint-WP/Settings.php:460
+#: src/TouchPoint-WP/Settings.php:491
 msgid "List Site in Directory"
 msgstr "Listar sitio en directorio"
 
-#: src/TouchPoint-WP/Settings.php:461
+#: src/TouchPoint-WP/Settings.php:492
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
@@ -1863,11 +1863,11 @@ msgstr "Iniciar sesión con %s"
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
-#: src/TouchPoint-WP/Settings.php:934
+#: src/TouchPoint-WP/Settings.php:965
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de días. Si un evento tiene más de esta cantidad, se eliminará. Se recomienda encarecidamente tener poco historial (menos de un mes) o mucho (al menos 15 meses)."
 
-#: src/TouchPoint-WP/Settings.php:580
+#: src/TouchPoint-WP/Settings.php:611
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
@@ -1876,26 +1876,26 @@ msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
 #: src/templates/admin/invKoForm.php:109
-#: src/TouchPoint-WP/Settings.php:948
+#: src/TouchPoint-WP/Settings.php:979
 msgid "Collect Meetings for Larger Events"
 msgstr "Recopilar reuniones para eventos más grandes"
 
 #: src/templates/admin/invKoForm.php:113
-#: src/TouchPoint-WP/Settings.php:952
+#: src/TouchPoint-WP/Settings.php:983
 msgid "No Collecting"
 msgstr "sin recoger"
 
 #: src/templates/admin/invKoForm.php:114
-#: src/TouchPoint-WP/Settings.php:953
+#: src/TouchPoint-WP/Settings.php:984
 msgid "Collect Meetings only from Involvements without Schedules"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:115
-#: src/TouchPoint-WP/Settings.php:957
+#: src/TouchPoint-WP/Settings.php:988
 msgid "Collect Meetings for all Involvements"
 msgstr "Recopilar reuniones solo de participaciones sin horarios"
 
 #: src/templates/admin/invKoForm.php:117
-#: src/TouchPoint-WP/Settings.php:949
+#: src/TouchPoint-WP/Settings.php:980
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 99d60c8f..ec00ec5f 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-05-01T18:06:39+00:00\n"
+"POT-Creation-Date: 2025-05-01T19:21:04+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -58,7 +58,7 @@ msgid "Slug"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:48
-#: src/TouchPoint-WP/Settings.php:1010
+#: src/TouchPoint-WP/Settings.php:1041
 msgid "Divisions to Import"
 msgstr ""
 
@@ -103,27 +103,27 @@ msgid "Import All Meetings to Calendar"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:109
-#: src/TouchPoint-WP/Settings.php:948
+#: src/TouchPoint-WP/Settings.php:979
 msgid "Collect Meetings for Larger Events"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:113
-#: src/TouchPoint-WP/Settings.php:952
+#: src/TouchPoint-WP/Settings.php:983
 msgid "No Collecting"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:114
-#: src/TouchPoint-WP/Settings.php:953
+#: src/TouchPoint-WP/Settings.php:984
 msgid "Collect Meetings only from Involvements without Schedules"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:115
-#: src/TouchPoint-WP/Settings.php:957
+#: src/TouchPoint-WP/Settings.php:988
 msgid "Collect Meetings for all Involvements"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:117
-#: src/TouchPoint-WP/Settings.php:949
+#: src/TouchPoint-WP/Settings.php:980
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr ""
 
@@ -688,636 +688,636 @@ msgstr ""
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:266
+#: src/TouchPoint-WP/Settings.php:297
 msgid "Basic Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:267
+#: src/TouchPoint-WP/Settings.php:298
 msgid "Connect to TouchPoint and choose which features you wish to use."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:271
+#: src/TouchPoint-WP/Settings.php:302
 msgid "Enable Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:272
+#: src/TouchPoint-WP/Settings.php:303
 msgid "Allow TouchPoint users to sign into this website with TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:283
+#: src/TouchPoint-WP/Settings.php:314
 msgid "Enable RSVP Tool"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:284
+#: src/TouchPoint-WP/Settings.php:315
 msgid "Add a crazy-simple RSVP button to WordPress event pages."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:291
+#: src/TouchPoint-WP/Settings.php:322
 msgid "Enable Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:292
+#: src/TouchPoint-WP/Settings.php:323
 msgid "Load Involvements from TouchPoint for involvement listings and entries native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:302
+#: src/TouchPoint-WP/Settings.php:333
 msgid "Enable Meeting Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:303
+#: src/TouchPoint-WP/Settings.php:334
 msgid "Load Meetings from TouchPoint for a calendar, native in your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:313
+#: src/TouchPoint-WP/Settings.php:344
 msgid "Enable Public People Lists"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:314
+#: src/TouchPoint-WP/Settings.php:345
 msgid "Import public people listings from TouchPoint (e.g. staff or elders)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:324
+#: src/TouchPoint-WP/Settings.php:355
 msgid "Enable Global Partner Listings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:325
+#: src/TouchPoint-WP/Settings.php:356
 msgid "Import ministry partners from TouchPoint to list publicly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:335
+#: src/TouchPoint-WP/Settings.php:366
 msgid "Enable Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:336
+#: src/TouchPoint-WP/Settings.php:367
 msgid "Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:346
+#: src/TouchPoint-WP/Settings.php:377
 msgid "Display Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:347
+#: src/TouchPoint-WP/Settings.php:378
 msgid "What your church calls your TouchPoint database."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:357
+#: src/TouchPoint-WP/Settings.php:388
 msgid "TouchPoint Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:358
+#: src/TouchPoint-WP/Settings.php:389
 msgid "The domain for your TouchPoint database, without the https or any slashes."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:373
+#: src/TouchPoint-WP/Settings.php:404
 msgid "Custom Mobile App Deeplink Host Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:374
+#: src/TouchPoint-WP/Settings.php:405
 msgid "The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:385
+#: src/TouchPoint-WP/Settings.php:416
 msgid "TouchPoint API Username"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:386
+#: src/TouchPoint-WP/Settings.php:417
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:398
+#: src/TouchPoint-WP/Settings.php:429
 msgid "TouchPoint API User Password"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:399
+#: src/TouchPoint-WP/Settings.php:430
 msgid "The password of a user account in TouchPoint with API permissions."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:414
+#: src/TouchPoint-WP/Settings.php:445
 msgid "TouchPoint API Script Name"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:415
+#: src/TouchPoint-WP/Settings.php:446
 msgid "The name of the Python script loaded into TouchPoint.  Don't change this unless you know what you're doing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:426
+#: src/TouchPoint-WP/Settings.php:457
 msgid "Google Maps Javascript API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:427
+#: src/TouchPoint-WP/Settings.php:458
 msgid "Required for embedding maps."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:438
+#: src/TouchPoint-WP/Settings.php:469
 msgid "Google Maps Geocoding API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:439
+#: src/TouchPoint-WP/Settings.php:470
 msgid "Optional.  Allows for reverse geocoding of user locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:449
+#: src/TouchPoint-WP/Settings.php:480
 msgid "ipapi.co API Key"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:450
+#: src/TouchPoint-WP/Settings.php:481
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:460
+#: src/TouchPoint-WP/Settings.php:491
 msgid "List Site in Directory"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:461
+#: src/TouchPoint-WP/Settings.php:492
 msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:478
-#: src/TouchPoint-WP/Settings.php:483
+#: src/TouchPoint-WP/Settings.php:509
+#: src/TouchPoint-WP/Settings.php:514
 msgid "Generate Scripts"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:481
+#: src/TouchPoint-WP/Settings.php:512
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:482
+#: src/TouchPoint-WP/Settings.php:513
 msgid "Upload the package to {tpName} here"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:499
+#: src/TouchPoint-WP/Settings.php:530
 msgid "People"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:500
+#: src/TouchPoint-WP/Settings.php:531
 msgid "Manage how people are synchronized between TouchPoint and WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:504
+#: src/TouchPoint-WP/Settings.php:535
 msgid "Contact Keywords"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:505
+#: src/TouchPoint-WP/Settings.php:536
 msgid "These keywords will be used when someone clicks the \"Contact\" button on a Person's listing or profile."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:516
+#: src/TouchPoint-WP/Settings.php:547
 msgid "Extra Value for WordPress User ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:517
+#: src/TouchPoint-WP/Settings.php:548
 msgid "The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:527
+#: src/TouchPoint-WP/Settings.php:558
 msgid "Extra Value: Biography"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:528
+#: src/TouchPoint-WP/Settings.php:559
 msgid "Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:538
-#: src/TouchPoint-WP/Settings.php:776
+#: src/TouchPoint-WP/Settings.php:569
+#: src/TouchPoint-WP/Settings.php:807
 msgid "Extra Values to Import"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:539
+#: src/TouchPoint-WP/Settings.php:570
 msgid "Import People Extra Value fields as User Meta data."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:555
+#: src/TouchPoint-WP/Settings.php:586
 msgid "Authentication"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:556
+#: src/TouchPoint-WP/Settings.php:587
 msgid "Allow users to log into WordPress using TouchPoint."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:560
+#: src/TouchPoint-WP/Settings.php:591
 msgid "Make TouchPoint the default authentication method."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:561
+#: src/TouchPoint-WP/Settings.php:592
 msgid "By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add 'tp_no_redirect' as a URL parameter."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:570
+#: src/TouchPoint-WP/Settings.php:601
 msgid "Enable Auto-Provisioning"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:571
+#: src/TouchPoint-WP/Settings.php:602
 msgid "Automatically create WordPress users, if needed, to match authenticated TouchPoint users."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:580
+#: src/TouchPoint-WP/Settings.php:611
 msgid "Change Profile Links"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:581
+#: src/TouchPoint-WP/Settings.php:612
 msgid "\"Edit Profile\" links will take the user to their TouchPoint profile, instead of their WordPress profile."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:590
+#: src/TouchPoint-WP/Settings.php:621
 msgid "Enable full logout"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:591
+#: src/TouchPoint-WP/Settings.php:622
 msgid "Logout of TouchPoint when logging out of WordPress."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:597
+#: src/TouchPoint-WP/Settings.php:628
 msgid "Prevent Subscriber Admin Bar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:598
+#: src/TouchPoint-WP/Settings.php:629
 msgid "By enabling this option, users who can't edit anything won't see the Admin bar."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:612
+#: src/TouchPoint-WP/Settings.php:643
 msgid "Involvements"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:613
+#: src/TouchPoint-WP/Settings.php:644
 msgid "Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:618
+#: src/TouchPoint-WP/Settings.php:649
 msgid "Involvement Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:648
+#: src/TouchPoint-WP/Settings.php:679
 msgid "Global Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:649
+#: src/TouchPoint-WP/Settings.php:680
 msgid "Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:653
+#: src/TouchPoint-WP/Settings.php:684
 msgid "Global Partner Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:654
+#: src/TouchPoint-WP/Settings.php:685
 msgid "What you call Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:664
+#: src/TouchPoint-WP/Settings.php:695
 msgid "Global Partner Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:665
+#: src/TouchPoint-WP/Settings.php:696
 msgid "What you call a Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:675
+#: src/TouchPoint-WP/Settings.php:706
 msgid "Global Partner Name for Secure Places (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:676
+#: src/TouchPoint-WP/Settings.php:707
 msgid "What you call Secure Global Partners at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:686
+#: src/TouchPoint-WP/Settings.php:717
 msgid "Global Partner Name for Secure Places (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:687
+#: src/TouchPoint-WP/Settings.php:718
 msgid "What you call a Secure Global Partner at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:697
+#: src/TouchPoint-WP/Settings.php:728
 msgid "Global Partner Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:698
+#: src/TouchPoint-WP/Settings.php:729
 msgid "The root path for Global Partner posts"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:710
+#: src/TouchPoint-WP/Settings.php:741
 msgid "Saved Search"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:711
+#: src/TouchPoint-WP/Settings.php:742
 msgid "Anyone who is included in this saved search will be included in the listing."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:721
+#: src/TouchPoint-WP/Settings.php:752
 msgid "Extra Value: Description"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:722
+#: src/TouchPoint-WP/Settings.php:753
 msgid "Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:732
+#: src/TouchPoint-WP/Settings.php:763
 msgid "Extra Value: Summary"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:733
+#: src/TouchPoint-WP/Settings.php:764
 msgid "Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:743
+#: src/TouchPoint-WP/Settings.php:774
 msgid "Latitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:744
+#: src/TouchPoint-WP/Settings.php:775
 msgid "Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:754
+#: src/TouchPoint-WP/Settings.php:785
 msgid "Longitude Override"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:755
+#: src/TouchPoint-WP/Settings.php:786
 msgid "Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner's profile for the partner map.  Both latitude and longitude must be provided for an override to take place."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:765
+#: src/TouchPoint-WP/Settings.php:796
 msgid "Public Location"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:766
+#: src/TouchPoint-WP/Settings.php:797
 msgid "Designate a text Family Extra Value that will contain the partner's location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:777
+#: src/TouchPoint-WP/Settings.php:808
 msgid "Import Family Extra Value fields as Meta data on the partner's post"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:788
+#: src/TouchPoint-WP/Settings.php:819
 msgid "Primary Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:789
+#: src/TouchPoint-WP/Settings.php:820
 msgid "Import a Family Extra Value as the primary means by which partners are organized."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:806
+#: src/TouchPoint-WP/Settings.php:837
 msgid "Events Calendar plugin by Modern Tribe"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:810
+#: src/TouchPoint-WP/Settings.php:841
 msgid "TouchPoint Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:816
+#: src/TouchPoint-WP/Settings.php:847
 msgid "App 2.0 Calendar"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:817
+#: src/TouchPoint-WP/Settings.php:848
 msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:821
+#: src/TouchPoint-WP/Settings.php:852
 msgid "Events Provider"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:822
+#: src/TouchPoint-WP/Settings.php:853
 msgid "The source of events for version 2.0 of the Custom Mobile App."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:832
+#: src/TouchPoint-WP/Settings.php:863
 msgid "Events for Custom Mobile App"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:835
+#: src/TouchPoint-WP/Settings.php:866
 msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:837
+#: src/TouchPoint-WP/Settings.php:868
 msgid "Preview"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:852
+#: src/TouchPoint-WP/Settings.php:883
 msgid "Use Standardizing Stylesheet"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:853
+#: src/TouchPoint-WP/Settings.php:884
 msgid "Inserts some basic CSS into the events feed to clean up display"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:865
+#: src/TouchPoint-WP/Settings.php:896
 msgid "Meeting Calendars"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:866
+#: src/TouchPoint-WP/Settings.php:897
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:870
+#: src/TouchPoint-WP/Settings.php:901
 msgid "Meeting Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:871
+#: src/TouchPoint-WP/Settings.php:902
 msgid "What you call Meetings at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:876
-#: src/TouchPoint-WP/Settings.php:878
+#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:909
 msgid "Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:876
-#: src/TouchPoint-WP/Settings.php:878
+#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:909
 msgid "Events"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:882
+#: src/TouchPoint-WP/Settings.php:913
 msgid "Meeting Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:883
+#: src/TouchPoint-WP/Settings.php:914
 msgid "What you call a Meeting at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:888
-#: src/TouchPoint-WP/Settings.php:890
+#: src/TouchPoint-WP/Settings.php:919
+#: src/TouchPoint-WP/Settings.php:921
 msgid "Meeting"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:888
-#: src/TouchPoint-WP/Settings.php:890
+#: src/TouchPoint-WP/Settings.php:919
+#: src/TouchPoint-WP/Settings.php:921
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:894
+#: src/TouchPoint-WP/Settings.php:925
 msgid "Meetings Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:895
+#: src/TouchPoint-WP/Settings.php:926
 msgid "The root path for Meetings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:938
 msgid "Days of Future"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:908
+#: src/TouchPoint-WP/Settings.php:939
 msgid "Meetings more than this many days in the future will not be imported."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:920
+#: src/TouchPoint-WP/Settings.php:951
 msgid "Archive After Days"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:921
+#: src/TouchPoint-WP/Settings.php:952
 msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:933
+#: src/TouchPoint-WP/Settings.php:964
 msgid "Days of History"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:934
+#: src/TouchPoint-WP/Settings.php:965
 msgid "Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:968
+#: src/TouchPoint-WP/Settings.php:999
 msgid "Divisions"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:969
+#: src/TouchPoint-WP/Settings.php:1000
 msgid "Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:973
+#: src/TouchPoint-WP/Settings.php:1004
 msgid "Division Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:974
+#: src/TouchPoint-WP/Settings.php:1005
 msgid "What you call Divisions at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:985
+#: src/TouchPoint-WP/Settings.php:1016
 msgid "Division Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:986
+#: src/TouchPoint-WP/Settings.php:1017
 msgid "What you call a Division at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:997
+#: src/TouchPoint-WP/Settings.php:1028
 msgid "Division Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:998
+#: src/TouchPoint-WP/Settings.php:1029
 msgid "The root path for the Division Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1011
+#: src/TouchPoint-WP/Settings.php:1042
 msgid "These Divisions will be imported for the taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1022
-#: src/TouchPoint-WP/Settings.php:1153
+#: src/TouchPoint-WP/Settings.php:1053
+#: src/TouchPoint-WP/Settings.php:1184
 msgid "Post Types"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1023
+#: src/TouchPoint-WP/Settings.php:1054
 msgid "Select post types which should have Divisions available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1037
-#: src/TouchPoint-WP/Settings.php:1043
+#: src/TouchPoint-WP/Settings.php:1068
+#: src/TouchPoint-WP/Settings.php:1074
 msgid "Locations"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1038
+#: src/TouchPoint-WP/Settings.php:1069
 msgid "Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1062
+#: src/TouchPoint-WP/Settings.php:1093
 msgid "Campuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1063
+#: src/TouchPoint-WP/Settings.php:1094
 msgid "Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1070
+#: src/TouchPoint-WP/Settings.php:1101
 msgid "Campus Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1071
+#: src/TouchPoint-WP/Settings.php:1102
 msgid "What you call Campuses at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1082
+#: src/TouchPoint-WP/Settings.php:1113
 msgid "Campus Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1083
+#: src/TouchPoint-WP/Settings.php:1114
 msgid "What you call a Campus at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1094
+#: src/TouchPoint-WP/Settings.php:1125
 msgid "Campus Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1095
+#: src/TouchPoint-WP/Settings.php:1126
 msgid "The root path for the Campus Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1111
+#: src/TouchPoint-WP/Settings.php:1142
 msgid "Resident Codes"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1112
+#: src/TouchPoint-WP/Settings.php:1143
 msgid "Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1116
+#: src/TouchPoint-WP/Settings.php:1147
 msgid "Resident Code Name (Plural)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1117
+#: src/TouchPoint-WP/Settings.php:1148
 msgid "What you call Resident Codes at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1128
+#: src/TouchPoint-WP/Settings.php:1159
 msgid "Resident Code Name (Singular)"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1129
+#: src/TouchPoint-WP/Settings.php:1160
 msgid "What you call a Resident Code at your church"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1140
+#: src/TouchPoint-WP/Settings.php:1171
 msgid "Resident Code Slug"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1141
+#: src/TouchPoint-WP/Settings.php:1172
 msgid "The root path for the Resident Code Taxonomy"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1154
+#: src/TouchPoint-WP/Settings.php:1185
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1317
+#: src/TouchPoint-WP/Settings.php:1348
 msgid "password saved"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1371
-#: src/TouchPoint-WP/Settings.php:1372
+#: src/TouchPoint-WP/Settings.php:1402
+#: src/TouchPoint-WP/Settings.php:1403
 msgid "TouchPoint-WP"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1420
+#: src/TouchPoint-WP/Settings.php:1451
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1671
+#: src/TouchPoint-WP/Settings.php:1700
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1793
+#: src/TouchPoint-WP/Settings.php:1822
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1844
+#: src/TouchPoint-WP/Settings.php:1873
 msgid "Save Settings"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 2fc65d47..bb7f8af3 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -116,6 +116,13 @@ class Settings
 	 */
 	protected array $settings = [];
 
+	/**
+	 * Indicates whether strings are included in the settings parameters.
+	 *
+	 * @var bool
+	 */
+	protected bool $hasStrings = false;
+
 	public const UNDEFINED_PLACEHOLDER = INF;
 
 	/**
@@ -127,6 +134,8 @@ public function __construct(TouchPointWP $parent)
 	{
 		$this->parent = $parent;
 
+		$this->initSettings();
+
 		// Register plugin settings.
 		add_action('admin_init', [$this, 'registerSettings']);
 
@@ -166,18 +175,16 @@ public static function instance(?TouchPointWP $parent = null): Settings
 	}
 
 	/**
-	 * Initialise settings
+	 * Initialize settings
+	 *
+	 * @param bool $withStrings Indicates that labels need to be included
 	 *
 	 * @return void
 	 */
-	public function initSettings(): void
+	public function initSettings(bool $withStrings = false): void
 	{
-		if (count($this->settings) > 0) {
-			// Settings are already loaded.
-			return;
-		}
 
-		$this->settings = $this->settingsFields();
+		$this->settings = $this->settingsFields($withStrings);
 	}
 
 	/**
@@ -210,7 +217,7 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 		) {
 			return true;
 		}
-		foreach (self::settingsFields() as $page) {
+		foreach (self::settingsFields(false) as $page) {
 			foreach ($page['fields'] as $f) {
 				if ($f['id'] === $settingName) {
 					if (isset($f['autoload'])) {
@@ -230,7 +237,7 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 	 */
 	private function getFieldMeta($fieldId): ?array
 	{
-		foreach ($this->settingsFields() as $category) {
+		foreach ($this->settingsFields(false) as $category) {
 			foreach ($category['fields'] as $field) {
 				if ($field['id'] === $fieldId) {
 					return $field;
@@ -240,6 +247,26 @@ private function getFieldMeta($fieldId): ?array
 		return null;
 	}
 
+	/**
+	 * A wrapper for the usual WordPress translation function, in order to make sure translations aren't called too early.
+	 *
+	 * @param string $text
+	 * @param string $domain
+	 *
+	 * @see __()
+	 *
+	 * @return string
+	 */
+	protected function __(string $text, string $domain): string
+	{
+		if (! $this->hasStrings) {
+			// If the init function hasn't been called yet, we can't use the translation function.
+			return "";
+		}
+
+		return __($text, $domain);
+	}
+
 	/**
 	 * Build settings fields
 	 *
@@ -248,28 +275,32 @@ private function getFieldMeta($fieldId): ?array
 	 *
 	 * @return array[] Fields to be displayed on settings page
 	 */
-	private function settingsFields(bool|string $includeDetail = false): array
+	private function settingsFields(bool $withStrings, bool|string $includeDetail = false): array
 	{
 		// Don't call API if we don't have API credentials
 		if ( ! $this->hasValidApiSettings()) {
 			$includeDetail = false;
 		}
 
-		if (count($this->settings) > 0 && $includeDetail === false) {
-			// Settings are already loaded, and they have adequate detail for the task at hand.
+		if (count($this->settings) > 0 && ($this->hasStrings >= $withStrings) && $includeDetail === false) {
+			// Settings are already loaded.
 			return $this->settings;
 		}
 
 		$settings = [];
 
+		if ($withStrings) {
+			$this->hasStrings = true;
+		}
+
 		$settings['basic'] = [
-			'title'       => __('Basic Settings', 'TouchPoint-WP'),
-			'description' => __('Connect to TouchPoint and choose which features you wish to use.', 'TouchPoint-WP'),
+			'title'       => $this->__('Basic Settings', 'TouchPoint-WP'),
+			'description' => $this->__('Connect to TouchPoint and choose which features you wish to use.', 'TouchPoint-WP'),
 			'fields'      => [
 				[
 					'id'          => 'enable_authentication',
-					'label'       => __('Enable Authentication', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Enable Authentication', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Allow TouchPoint users to sign into this website with TouchPoint.',
 						'TouchPoint-WP'
 					),
@@ -280,16 +311,16 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_rsvp',
-					'label'       => __('Enable RSVP Tool', 'TouchPoint-WP'),
-					'description' => __('Add a crazy-simple RSVP button to WordPress event pages.', 'TouchPoint-WP'),
+					'label'       => $this->__('Enable RSVP Tool', 'TouchPoint-WP'),
+					'description' => $this->__('Add a crazy-simple RSVP button to WordPress event pages.', 'TouchPoint-WP'),
 					'type'        => 'checkbox',
 					'default'     => '',
 					'autoload'    => true,
 				],
 				[
 					'id'          => 'enable_involvements',
-					'label'       => __('Enable Involvements', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Enable Involvements', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Load Involvements from TouchPoint for involvement listings and entries native in your website.',
 						'TouchPoint-WP'
 					),
@@ -299,8 +330,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_meeting_cal',
-					'label'       => __('Enable Meeting Calendar', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Enable Meeting Calendar', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Load Meetings from TouchPoint for a calendar, native in your website.',
 						'TouchPoint-WP'
 					),
@@ -310,8 +341,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_people_lists',
-					'label'       => __('Enable Public People Lists', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Enable Public People Lists', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Import public people listings from TouchPoint (e.g. staff or elders)',
 						'TouchPoint-WP'
 					),
@@ -321,8 +352,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_global',
-					'label'       => __('Enable Global Partner Listings', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Enable Global Partner Listings', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Import ministry partners from TouchPoint to list publicly.',
 						'TouchPoint-WP'
 					),
@@ -332,8 +363,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_campuses',
-					'label'       => __('Enable Campuses', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Enable Campuses', 'TouchPoint-WP'),
+					'description' => $this->__(
 						"Import campuses as a taxonomy. (You probably want to do this if you're multi-campus.)",
 						'TouchPoint-WP'
 					),
@@ -343,8 +374,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'system_name',
-					'label'       => __('Display Name', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Display Name', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'What your church calls your TouchPoint database.',
 						'TouchPoint-WP'
 					),
@@ -354,8 +385,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'host',
-					'label'       => __('TouchPoint Host Name', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('TouchPoint Host Name', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'The domain for your TouchPoint database, without the https or any slashes.',
 						'TouchPoint-WP'
 					),
@@ -370,8 +401,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'host_deeplink',
-					'label'       => __('Custom Mobile App Deeplink Host Name', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Custom Mobile App Deeplink Host Name', 'TouchPoint-WP'),
+					'description' => $this->__(
 						"The domain for your mobile app deeplinks, without the https or any slashes.  If you aren't using the custom mobile app, leave this blank.",
 						'TouchPoint-WP'
 					),
@@ -382,8 +413,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'api_user',
-					'label'       => __('TouchPoint API Username', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('TouchPoint API Username', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member\'s account.',
 						'TouchPoint-WP'
 					),
@@ -395,8 +426,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'api_pass',
-					'label'       => __('TouchPoint API User Password', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('TouchPoint API User Password', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'The password of a user account in TouchPoint with API permissions.',
 						'TouchPoint-WP'
 					),
@@ -411,8 +442,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'api_script_name',
-					'label'       => __('TouchPoint API Script Name', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('TouchPoint API Script Name', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'The name of the Python script loaded into TouchPoint.  Don\'t change this unless you know what you\'re doing.',
 						'TouchPoint-WP'
 					),
@@ -423,8 +454,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'google_maps_api_key',
-					'label'       => __('Google Maps Javascript API Key', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Google Maps Javascript API Key', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Required for embedding maps.',
 						'TouchPoint-WP'
 					),
@@ -435,8 +466,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'google_geo_api_key',
-					'label'       => __('Google Maps Geocoding API Key', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Google Maps Geocoding API Key', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Optional.  Allows for reverse geocoding of user locations.',
 						'TouchPoint-WP'
 					),
@@ -446,8 +477,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'ipapi_key',
-					'label'       => __('ipapi.co API Key', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('ipapi.co API Key', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited.',
 						'TouchPoint-WP'
 					),
@@ -457,8 +488,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'enable_public_listing',
-					'label'       => __('List Site in Directory', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('List Site in Directory', 'TouchPoint-WP'),
+					'description' => $this->__(
 						"Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet.  Only applies if this site is accessible on the public internet.",
 						'TouchPoint-WP'
 					),
@@ -475,12 +506,12 @@ private function settingsFields(bool|string $includeDetail = false): array
 			/** @noinspection HtmlUnknownTarget */
 			$settings['basic']['fields'][] = [
 				'id'          => 'generate-scripts',
-				'label'       => __('Generate Scripts', 'TouchPoint-WP'),
+				'label'       => $this->__('Generate Scripts', 'TouchPoint-WP'),
 				'type'        => 'instructions',
 				'description' => strtr(
-					'<p>' . __('Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package.', 'TouchPoint-WP') .
-					'  <a href="{uploadUrl}">' . __('Upload the package to {tpName} here', 'TouchPoint-WP') . '</a>.</p>
-<p><a href="{apiUrl}" class="button-secondary" target="tp_zipIfr">' . __('Generate Scripts', 'TouchPoint-WP') . '</a></p>
+					'<p>' . $this->__('Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package.', 'TouchPoint-WP') .
+					'  <a href="{uploadUrl}">' . $this->__('Upload the package to {tpName} here', 'TouchPoint-WP') . '</a>.</p>
+<p><a href="{apiUrl}" class="button-secondary" target="tp_zipIfr">' . $this->__('Generate Scripts', 'TouchPoint-WP') . '</a></p>
 <iframe name="tp_zipIfr" style="width:0; height:0; opacity:0;"></iframe>',
 					[
 						'{apiUrl}'    => "/" . TouchPointWP::API_ENDPOINT . "/" . TouchPointWP::API_ENDPOINT_ADMIN_SCRIPTZIP,
@@ -496,13 +527,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 			$urlParts = wp_parse_url(home_url());
 			$defaultUserPev = $urlParts['host'] . " User ID";
 			$settings['people'] = [
-				'title'       => __('People', 'TouchPoint-WP'),
-				'description' => __('Manage how people are synchronized between TouchPoint and WordPress.', 'TouchPoint-WP'),
+				'title'       => $this->__('People', 'TouchPoint-WP'),
+				'description' => $this->__('Manage how people are synchronized between TouchPoint and WordPress.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'people_contact_keywords',
-						'label'       => __('Contact Keywords', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Contact Keywords', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'These keywords will be used when someone clicks the "Contact" button on a Person\'s listing or profile.',
 							'TouchPoint-WP'
 						),
@@ -513,8 +544,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'people_ev_wpId',
-						'label'       => __('Extra Value for WordPress User ID', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Extra Value for WordPress User ID', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'The name of the extra value to use for the WordPress User ID.  If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances.  In most cases, the default is fine.',
 							'TouchPoint-WP'
 						),
@@ -524,8 +555,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'people_ev_bio',
-						'label'       => __('Extra Value: Biography', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Extra Value: Biography', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Import a Bio from a Person Extra Value field.  Can be an HTML or Text Extra Value.  This will overwrite any values set by WordPress.  Leave blank to not import.',
 							'TouchPoint-WP'
 						),
@@ -535,8 +566,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'people_ev_custom',
-						'label'       => __('Extra Values to Import', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Extra Values to Import', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Import People Extra Value fields as User Meta data.',
 							'TouchPoint-WP'
 						),
@@ -552,13 +583,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_authentication') === "on") { // TODO MULTI
 //			$includeThis = $includeDetail === true || $includeDetail === 'authentication';
 			$settings['authentication'] = [
-				'title'       => __('Authentication', 'TouchPoint-WP'),
-				'description' => __('Allow users to log into WordPress using TouchPoint.', 'TouchPoint-WP'),
+				'title'       => $this->__('Authentication', 'TouchPoint-WP'),
+				'description' => $this->__('Allow users to log into WordPress using TouchPoint.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'auth_default',
-						'label'       => __('Make TouchPoint the default authentication method.', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Make TouchPoint the default authentication method.', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'By checking this box, the TouchPoint login page will become the default.  To prevent the redirect and reach the standard WordPress login page, add \'tp_no_redirect\' as a URL parameter.',
 							'TouchPoint-WP'
 						),
@@ -567,8 +598,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'auth_auto_provision',
-						'label'       => __('Enable Auto-Provisioning', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Enable Auto-Provisioning', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Automatically create WordPress users, if needed, to match authenticated TouchPoint users.',
 							'TouchPoint-WP'
 						),
@@ -577,8 +608,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'auth_change_profile_urls',
-						'label'       => __('Change Profile Links', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Change Profile Links', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'"Edit Profile" links will take the user to their TouchPoint profile, instead of their WordPress profile.',
 							'TouchPoint-WP'
 						),
@@ -587,15 +618,15 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'auth_full_logout',
-						'label'       => __('Enable full logout', 'TouchPoint-WP'),
-						'description' => __('Logout of TouchPoint when logging out of WordPress.', 'TouchPoint-WP'),
+						'label'       => $this->__('Enable full logout', 'TouchPoint-WP'),
+						'description' => $this->__('Logout of TouchPoint when logging out of WordPress.', 'TouchPoint-WP'),
 						'type'        => 'checkbox',
 						'default'     => 'on',
 					],
 					[
 						'id'          => 'auth_prevent_admin_bar',
-						'label'       => __('Prevent Subscriber Admin Bar', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Prevent Subscriber Admin Bar', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'By enabling this option, users who can\'t edit anything won\'t see the Admin bar.',
 							'TouchPoint-WP'
 						),
@@ -609,13 +640,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_involvements') === "on") {  // TODO MULTI
 			$includeThis                    = $includeDetail === true || $includeDetail === 'involvements';
 			$settings['involvements'] = [
-				'title'       => __('Involvements', 'TouchPoint-WP'),
-				'description' => __('Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here.', 'TouchPoint-WP'),
+				'title'       => $this->__('Involvements', 'TouchPoint-WP'),
+				'description' => $this->__('Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more.  Select the division(s) that immediately correspond to the type of Involvement you want to list.  For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division.  If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'inv_json', // involvement settings json (stored as a json string)
 						'type'        => 'textarea',
-						'label'       => __('Involvement Post Types', 'TouchPoint-WP'),
+						'label'       => $this->__('Involvement Post Types', 'TouchPoint-WP'),
 						'default'     => '[]',
 						'autoload'    => true,
 						'hidden'      => true,
@@ -645,13 +676,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_global') === "on") { // TODO MULTI
 			$includeThis              = $includeDetail === true || $includeDetail === 'global';
 			$settings['global'] = [
-				'title'       => __('Global Partners', 'TouchPoint-WP'),
-				'description' => __('Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records.', 'TouchPoint-WP'),
+				'title'       => $this->__('Global Partners', 'TouchPoint-WP'),
+				'description' => $this->__('Manage how global partners are imported from TouchPoint for listing on WordPress.  Partners are grouped by family, and content is provided through Family Extra Values.  This works for both People and Business records.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'global_name_plural',
-						'label'       => __('Global Partner Name (Plural)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Global Partner Name (Plural)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call Global Partners at your church',
 							'TouchPoint-WP'
 						),
@@ -661,8 +692,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_name_singular',
-						'label'       => __('Global Partner Name (Singular)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Global Partner Name (Singular)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call a Global Partner at your church',
 							'TouchPoint-WP'
 						),
@@ -672,8 +703,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_name_plural_decoupled',
-						'label'       => __('Global Partner Name for Secure Places (Plural)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Global Partner Name for Secure Places (Plural)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call Secure Global Partners at your church',
 							'TouchPoint-WP'
 						),
@@ -683,8 +714,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_name_singular_decoupled',
-						'label'       => __('Global Partner Name for Secure Places (Singular)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Global Partner Name for Secure Places (Singular)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call a Secure Global Partner at your church',
 							'TouchPoint-WP'
 						),
@@ -694,8 +725,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_slug',
-						'label'       => __('Global Partner Slug', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Global Partner Slug', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'The root path for Global Partner posts',
 							'TouchPoint-WP'
 						),
@@ -707,8 +738,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_search',
-						'label'       => __('Saved Search', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Saved Search', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Anyone who is included in this saved search will be included in the listing.',
 							'TouchPoint-WP'
 						),
@@ -718,8 +749,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_description',
-						'label'       => __('Extra Value: Description', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Extra Value: Description', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Import a description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  This becomes the body of the Global Partner post.',
 							'TouchPoint-WP'
 						),
@@ -729,8 +760,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_summary',
-						'label'       => __('Extra Value: Summary', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Extra Value: Summary', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Optional. Import a short description from a Family Extra Value field.  Can be an HTML or Text Extra Value.  If not provided, the full bio will be truncated.',
 							'TouchPoint-WP'
 						),
@@ -740,8 +771,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_geo_lat',
-						'label'       => __('Latitude Override', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Latitude Override', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner\'s profile for the partner map.  Both latitude and longitude must be provided for an override to take place.',
 							'TouchPoint-WP'
 						),
@@ -751,8 +782,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_geo_lng',
-						'label'       => __('Longitude Override', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Longitude Override', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner\'s profile for the partner map.  Both latitude and longitude must be provided for an override to take place.',
 							'TouchPoint-WP'
 						),
@@ -762,8 +793,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_location',
-						'label'       => __('Public Location', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Public Location', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Designate a text Family Extra Value that will contain the partner\'s location, as you want listed publicly.  For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry.',
 							'TouchPoint-WP'
 						),
@@ -773,8 +804,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_fev_custom',
-						'label'       => __('Extra Values to Import', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Extra Values to Import', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Import Family Extra Value fields as Meta data on the partner\'s post',
 							'TouchPoint-WP'
 						),
@@ -785,8 +816,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'global_primary_tax',
-						'label'       => __('Primary Taxonomy', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Primary Taxonomy', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Import a Family Extra Value as the primary means by which partners are organized.',
 							'TouchPoint-WP'
 						),
@@ -803,23 +834,23 @@ private function settingsFields(bool|string $includeDetail = false): array
 			$options = [];
 			$default = '';
 			if (TouchPointWP::useTribeCalendar()) {
-				$options['tribe'] = __('Events Calendar plugin by Modern Tribe', 'TouchPoint-WP');
+				$options['tribe'] = $this->__('Events Calendar plugin by Modern Tribe', 'TouchPoint-WP');
 				$default = 'tribe';
 			}
 			if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_meeting_cal') === "on") {
-				$options['meetings'] = __('TouchPoint Meetings', 'TouchPoint-WP');
+				$options['meetings'] = $this->__('TouchPoint Meetings', 'TouchPoint-WP');
 				$default = 'meetings';
 			}
 
 			/** @noinspection HtmlUnknownTarget */
 			$settings['events_calendar'] = [
-				'title'       => __('App 2.0 Calendar', 'TouchPoint-WP'),
-				'description' => __('Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe.', 'TouchPoint-WP'),
+				'title'       => $this->__('App 2.0 Calendar', 'TouchPoint-WP'),
+				'description' => $this->__('Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'ec_app_cal_provider',
-						'label'       => __('Events Provider', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Events Provider', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'The source of events for version 2.0 of the Custom Mobile App.',
 							'TouchPoint-WP'
 						),
@@ -829,12 +860,12 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'ec_app_cal_url',
-						'label'       => __('Events for Custom Mobile App', 'TouchPoint-WP'),
+						'label'       => $this->__('Events for Custom Mobile App', 'TouchPoint-WP'),
 						'type'        => 'instructions',
 						'description' => strtr(
-							'<p>' . __("To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:", 'TouchPoint-WP') . '</p>' .
+							'<p>' . $this->__("To use your Events Calendar events in the Custom mobile app, set the Provider to <code>Wordpress Plugin - Modern Tribe</code> (regardless of which provider you're using above) and use this url:", 'TouchPoint-WP') . '</p>' .
 							'<input type="url" value="{apiUrl}" readonly style="width: 100%;" />' .
-							'<a href="{previewUrl}" class="btn">' . __('Preview', 'TouchPoint-WP') . '</a>',
+							'<a href="{previewUrl}" class="btn">' . $this->__('Preview', 'TouchPoint-WP') . '</a>',
 							[
 								'{apiUrl}'	   => get_site_url() . "/" .
 												  TouchPointWP::API_ENDPOINT . "/" .
@@ -849,8 +880,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'ec_use_standardizing_style',
-						'label'       => __('Use Standardizing Stylesheet', 'TouchPoint-WP'),
-						'description' => __( 'Inserts some basic CSS into the events feed to clean up display', 'TouchPoint-WP' ),
+						'label'       => $this->__('Use Standardizing Stylesheet', 'TouchPoint-WP'),
+						'description' => $this->__( 'Inserts some basic CSS into the events feed to clean up display', 'TouchPoint-WP' ),
 						'type'        => 'checkbox',
 						'default'     => 'on',
 					],
@@ -862,37 +893,37 @@ private function settingsFields(bool|string $includeDetail = false): array
 //			$includeThis = $includeDetail === true || $includeDetail === 'events';
 			$tribe = TouchPointWP::useTribeCalendar();
 			$settings['meetCal'] = [
-				'title'       => __('Meeting Calendars', 'TouchPoint-WP'),
-				'description' => __('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
+				'title'       => $this->__('Meeting Calendars', 'TouchPoint-WP'),
+				'description' => $this->__('Import Meetings from TouchPoint to a calendar on your website.', 'TouchPoint-WP'),
 				'fields'      => [
 					[
 						'id'          => 'mc_name_plural',
-						'label'       => __('Meeting Name (Plural)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Meeting Name (Plural)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call Meetings at your church',
 							'TouchPoint-WP'
 						),
 						'type'        => 'text',
-						'default'     => $tribe ? __('Meetings', 'TouchPoint-WP') : __('Events', 'TouchPoint-WP'),
+						'default'     => $tribe ? $this->__('Meetings', 'TouchPoint-WP') : $this->__('Events', 'TouchPoint-WP'),
 						'autoload'    => true,
-						'placeholder' => $tribe ? __('Meetings', 'TouchPoint-WP') : __('Events', 'TouchPoint-WP'),
+						'placeholder' => $tribe ? $this->__('Meetings', 'TouchPoint-WP') : $this->__('Events', 'TouchPoint-WP'),
 					],
 					[
 						'id'          => 'mc_name_singular',
-						'label'       => __('Meeting Name (Singular)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Meeting Name (Singular)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call a Meeting at your church',
 							'TouchPoint-WP'
 						),
 						'type'        => 'text',
-						'default'     => $tribe ? __('Meeting', 'TouchPoint-WP') : __('Event', 'TouchPoint-WP'),
+						'default'     => $tribe ? $this->__('Meeting', 'TouchPoint-WP') : $this->__('Event', 'TouchPoint-WP'),
 						'autoload'    => true,
-						'placeholder' => $tribe ? __('Meeting', 'TouchPoint-WP') : __('Event', 'TouchPoint-WP'),
+						'placeholder' => $tribe ? $this->__('Meeting', 'TouchPoint-WP') : $this->__('Event', 'TouchPoint-WP'),
 					],
 					[
 						'id'          => 'mc_slug',
-						'label'       => __('Meetings Slug', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Meetings Slug', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'The root path for Meetings',
 							'TouchPoint-WP'
 						),
@@ -904,8 +935,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'mc_future_days',
-						'label'       => __('Days of Future', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Days of Future', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Meetings more than this many days in the future will not be imported.',
 							'TouchPoint-WP'
 						),
@@ -917,8 +948,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'mc_archive_days',
-						'label'       => __('Archive After Days', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Archive After Days', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement.',
 							'TouchPoint-WP'
 						),
@@ -930,8 +961,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'mc_hist_days',
-						'label'       => __('Days of History', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Days of History', 'TouchPoint-WP'),
+						'description' => $this->__(
 							// for reference: https://github.com/TenthPres/TouchPoint-WP/issues/224
 							"Meetings will be kept on the calendar until the event is this many days in the past.  Once an event is older than this, it'll be deleted.  Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months).",
 							'TouchPoint-WP'
@@ -945,16 +976,16 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'mc_grouping_method',
-						'label'       => __("Collect Meetings for Larger Events", "TouchPoint-WP"),
-						'description' => __("Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours.", "TouchPoint-WP"),
+						'label'       => $this->__("Collect Meetings for Larger Events", "TouchPoint-WP"),
+						'description' => $this->__("Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours.", "TouchPoint-WP"),
 						'type'        => 'select',
 						'options'     => [
-							Meeting::GROUP_NONE => __("No Collecting", "TouchPoint-WP"),
-							Meeting::GROUP_UNSCHEDULED => __(
+							Meeting::GROUP_NONE => $this->__("No Collecting", "TouchPoint-WP"),
+							Meeting::GROUP_UNSCHEDULED => $this->__(
 								"Collect Meetings only from Involvements without Schedules",
 								"TouchPoint-WP"
 							),
-							Meeting::GROUP_ALL => __("Collect Meetings for all Involvements", "TouchPoint-WP"),
+							Meeting::GROUP_ALL => $this->__("Collect Meetings for all Involvements", "TouchPoint-WP"),
 						],
 						'default'     => Meeting::GROUP_UNSCHEDULED,
 						'autoload'    => false
@@ -965,13 +996,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 
 		$includeThis = $includeDetail === true || $includeDetail === 'divisions';
 		$settings['divisions'] = [
-			'title'       => __('Divisions', 'TouchPoint-WP'),
-			'description' => __('Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.', 'TouchPoint-WP'),
+			'title'       => $this->__('Divisions', 'TouchPoint-WP'),
+			'description' => $this->__('Import Divisions from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.', 'TouchPoint-WP'),
 			'fields'      => [
 				[
 					'id'          => 'dv_name_plural',
-					'label'       => __('Division Name (Plural)', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Division Name (Plural)', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'What you call Divisions at your church',
 						'TouchPoint-WP'
 					),
@@ -982,8 +1013,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'dv_name_singular',
-					'label'       => __('Division Name (Singular)', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Division Name (Singular)', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'What you call a Division at your church',
 						'TouchPoint-WP'
 					),
@@ -994,8 +1025,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'dv_slug',
-					'label'       => __('Division Slug', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Division Slug', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'The root path for the Division Taxonomy',
 						'TouchPoint-WP'
 					),
@@ -1007,8 +1038,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'dv_divisions',
-					'label'       => __('Divisions to Import', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Divisions to Import', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'These Divisions will be imported for the taxonomy',
 						'TouchPoint-WP'
 					),
@@ -1019,8 +1050,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'dv_additional_post_types',
-					'label'       => __('Post Types', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Post Types', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Select post types which should have Divisions available as a native taxonomy.',
 						'TouchPoint-WP'
 					),
@@ -1034,13 +1065,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 		];
 
 		$settings['locations'] = [
-			'title'       => __('Locations', 'TouchPoint-WP'),
-			'description' => __('Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly.', 'TouchPoint-WP'),
+			'title'       => $this->__('Locations', 'TouchPoint-WP'),
+			'description' => $this->__('Locations are physical places, probably campuses.  None are required, but they can help present geographic information clearly.', 'TouchPoint-WP'),
 			'fields'      => [
 				[
 					'id'          => 'locations_json', // involvement settings json (stored as a json string)
 					'type'        => 'textarea',
-					'label'       => __('Locations', 'TouchPoint-WP'),
+					'label'       => $this->__('Locations', 'TouchPoint-WP'),
 					'default'     => '[]',
 					'hidden'      => true,
 					'description' => function () {
@@ -1059,16 +1090,16 @@ private function settingsFields(bool|string $includeDetail = false): array
 
 		if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_campuses') === "on") { // TODO MULTI
 			$settings['campuses'] = [
-				'title'       => __('Campuses', 'TouchPoint-WP'),
-				'description' => __(
+				'title'       => $this->__('Campuses', 'TouchPoint-WP'),
+				'description' => $this->__(
 					'Import Campuses from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements.',
 					'TouchPoint-WP'
 				),
 				'fields'      => [
 					[
 						'id'          => 'camp_name_plural',
-						'label'       => __('Campus Name (Plural)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Campus Name (Plural)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call Campuses at your church',
 							'TouchPoint-WP'
 						),
@@ -1079,8 +1110,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'camp_name_singular',
-						'label'       => __('Campus Name (Singular)', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Campus Name (Singular)', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'What you call a Campus at your church',
 							'TouchPoint-WP'
 						),
@@ -1091,8 +1122,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 					],
 					[
 						'id'          => 'camp_slug',
-						'label'       => __('Campus Slug', 'TouchPoint-WP'),
-						'description' => __(
+						'label'       => $this->__('Campus Slug', 'TouchPoint-WP'),
+						'description' => $this->__(
 							'The root path for the Campus Taxonomy',
 							'TouchPoint-WP'
 						),
@@ -1108,13 +1139,13 @@ private function settingsFields(bool|string $includeDetail = false): array
 
 		$includeThis = $includeDetail === true || $includeDetail === 'resident_codes';
 		$settings['resident_codes'] = [
-			'title'       => __('Resident Codes', 'TouchPoint-WP'),
-			'description' => __('Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations.', 'TouchPoint-WP'),
+			'title'       => $this->__('Resident Codes', 'TouchPoint-WP'),
+			'description' => $this->__('Import Resident Codes from TouchPoint to your website as a taxonomy.  These are used to classify users and involvements that have locations.', 'TouchPoint-WP'),
 			'fields'      => [
 				[
 					'id'          => 'rc_name_plural',
-					'label'       => __('Resident Code Name (Plural)', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Resident Code Name (Plural)', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'What you call Resident Codes at your church',
 						'TouchPoint-WP'
 					),
@@ -1125,8 +1156,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'rc_name_singular',
-					'label'       => __('Resident Code Name (Singular)', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Resident Code Name (Singular)', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'What you call a Resident Code at your church',
 						'TouchPoint-WP'
 					),
@@ -1137,8 +1168,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'rc_slug',
-					'label'       => __('Resident Code Slug', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Resident Code Slug', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'The root path for the Resident Code Taxonomy',
 						'TouchPoint-WP'
 					),
@@ -1150,8 +1181,8 @@ private function settingsFields(bool|string $includeDetail = false): array
 				],
 				[
 					'id'          => 'rc_additional_post_types',
-					'label'       => __('Post Types', 'TouchPoint-WP'),
-					'description' => __(
+					'label'       => $this->__('Post Types', 'TouchPoint-WP'),
+					'description' => $this->__(
 						'Select post types which should have Resident Codes available as a native taxonomy.',
 						'TouchPoint-WP'
 					),
@@ -1314,7 +1345,7 @@ private function passwordPlaceholder(string $settingName): string
 			return '';
 		}
 
-		return __('password saved', 'TouchPoint-WP');
+		return $this->__('password saved', 'TouchPoint-WP');
 	}
 
 	/**
@@ -1445,8 +1476,6 @@ public function __get(string $what)
 	 */
 	public function get(string $what): mixed
 	{
-		$this->initSettings();
-
 		$v = $this->getWithoutDefault($what);
 
 		$meta = $this->getFieldMeta($what); // $meta can be null if option isn't in settings (e.g. cached meta fields)
@@ -1686,7 +1715,7 @@ public function registerSettings(): void
 			$currentSection = $_GET['tab'];
 		}
 
-		$this->settings = $this->settingsFields($currentSection);
+		$this->settings = $this->settingsFields(true,$currentSection);
 		foreach ($this->settings as $section => $data) {
 			// Check posted/selected tab.
 			if ($currentSection !== $section) {

From ad153de039b5a71c7702f957a9c217128a0efde0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 5 May 2025 16:49:29 -0400
Subject: [PATCH 280/423] Fix implicit nullables

---
 src/TouchPoint-WP/CalendarGrid.php              | 2 +-
 src/TouchPoint-WP/Location.php                  | 2 +-
 src/TouchPoint-WP/Utilities/StringableArray.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 01b8f4e5..1da88479 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -70,7 +70,7 @@ class CalendarGrid {
 	 *
 	 * @return void
 	 */
-	public function __construct(WP_Query $q, int $month = null, int $year = null)
+	public function __construct(WP_Query $q, ?int $month = null, ?int $year = null)
 	{
 		try {
 			// Validate month & year; create $d as a day within the month
diff --git a/src/TouchPoint-WP/Location.php b/src/TouchPoint-WP/Location.php
index 54f9aeb7..a9f6a9e6 100644
--- a/src/TouchPoint-WP/Location.php
+++ b/src/TouchPoint-WP/Location.php
@@ -52,7 +52,7 @@ public static function getLocations(): array
 		return self::$_locations;
 	}
 
-	public static function getLocationForIP(string $ipAddress = null): ?Location
+	public static function getLocationForIP(?string $ipAddress = null): ?Location
 	{
 		$ipAddress = $ipAddress ?? Utilities::getClientIp();
 
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index e8954a1e..e2f920f1 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -87,7 +87,7 @@ public function __toString()
 	 *
 	 * @since 0.0.90 Added
 	 */
-	public function join(string $separator = null): string
+	public function join(?string $separator = null): string
 	{
 		if (is_null($separator)) {
 			$separator = $this->separator;

From 7ebc0197280b6360672ae2198858c8786cfede2f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 May 2025 13:41:47 -0400
Subject: [PATCH 281/423] Efficiency improvements

---
 src/TouchPoint-WP/Settings.php     | 4 ++--
 src/TouchPoint-WP/TouchPointWP.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index bb7f8af3..1aa9ec83 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -217,7 +217,7 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 		) {
 			return true;
 		}
-		foreach (self::settingsFields(false) as $page) {
+		foreach ($this->settings as $page) {
 			foreach ($page['fields'] as $f) {
 				if ($f['id'] === $settingName) {
 					if (isset($f['autoload'])) {
@@ -237,7 +237,7 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 	 */
 	private function getFieldMeta($fieldId): ?array
 	{
-		foreach ($this->settingsFields(false) as $category) {
+		foreach ($this->settings as $category) {
 			foreach ($category['fields'] as $field) {
 				if ($field['id'] === $fieldId) {
 					return $field;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 43eb63aa..385478ae 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -912,7 +912,7 @@ public static function init(): void
 	 */
 	public static function renderBaseInlineScript(): void
 	{
-		include self::instance()->assets_dir . '/js/base-inline.php';
+		include_once self::instance()->assets_dir . '/js/base-inline.php';
 	}
 
 	public function registerScriptsAndStyles(): void

From 17a3cf46857d4e2282449711bf35fa90b534c24d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 15 May 2025 08:10:32 -0400
Subject: [PATCH 282/423] Resolve an issue where stats reporting was printing
 results (and blocking) when it shouldn't have.

---
 src/TouchPoint-WP/Stats.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 066c61a6..3144ac0d 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -289,9 +289,11 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 	/**
 	 * Submit stats to Tenth.
 	 *
+	 * @param bool $blocking If true, will wait for the response from the server before returning and the method will print a status.
+	 *
 	 * @return void
 	 */
-	protected function submitStats(): void
+	protected function submitStats(bool $blocking = false): void
 	{
 		$this->updateQueriedStats();
 
@@ -320,10 +322,24 @@ protected function submitStats(): void
 		$r = wp_remote_post($endpoint, [
 			'body' => ['data' => $data],
 			'timeout' => 10,
-//			'blocking' => false,
+			'blocking' => $blocking,
 		]);
-		var_dump($endpoint, $r, $data);
-		echo "ok";
+
+		if (!$blocking) {
+			if (is_wp_error($r)) {
+				echo "error";
+				error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . $r->get_error_message());
+			} else {
+				$code = wp_remote_retrieve_response_code($r);
+				if ($code !== 200) {
+					echo "error";
+					error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . wp_remote_retrieve_body($r));
+				} else {
+					echo "ok";
+				}
+			}
+
+		}
 	}
 
 	/**
@@ -421,7 +437,7 @@ public static function api(array $uri): bool
 				if ($_SERVER['REQUEST_METHOD'] === "POST") {
 					self::handleSubmission();
 				} else {
-					$s->submitStats();
+					$s->submitStats(true);
 				}
 				exit;
 

From 5a46ad2b7d1fef628aa0bebc01adc089277513da Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 29 May 2025 10:02:10 -0400
Subject: [PATCH 283/423] Patch: raise priority of Main Leader for contacting
 leaders.

---
 src/python/WebApi.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 3f09b218..939588b3 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -793,9 +793,9 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
     UNION
-    SELECT TOP 1 LeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)
     orgContact = q.QuerySqlTop1(orgContactSql)
     orgContactPid = orgContact.contactId if orgContact is not None else None  # None if not found.  Falls back to Owner
@@ -843,9 +843,9 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
     UNION
-    SELECT TOP 1 LeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)
     orgContact = q.QuerySqlTop1(orgContactSql)
     orgContactPid = orgContact.contactId if orgContact is not None else None  # None if not found. Fall back to Owner

From 68dd9446043689209b9124238609b43c5ec97f43 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 29 May 2025 10:02:10 -0400
Subject: [PATCH 284/423] Patch: raise priority of Main Leader for contacting
 leaders.

---
 src/python/WebApi.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 3f09b218..939588b3 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -793,9 +793,9 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
     UNION
-    SELECT TOP 1 LeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)
     orgContact = q.QuerySqlTop1(orgContactSql)
     orgContactPid = orgContact.contactId if orgContact is not None else None  # None if not found.  Falls back to Owner
@@ -843,9 +843,9 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
     UNION
-    SELECT TOP 1 LeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)
     orgContact = q.QuerySqlTop1(orgContactSql)
     orgContactPid = orgContact.contactId if orgContact is not None else None  # None if not found. Fall back to Owner

From ef09210f2cf64890e0fa59b03d9e7b5b71df5784 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 5 May 2025 16:49:29 -0400
Subject: [PATCH 285/423] Fix implicit nullables

---
 src/TouchPoint-WP/CalendarGrid.php              | 2 +-
 src/TouchPoint-WP/Location.php                  | 2 +-
 src/TouchPoint-WP/Utilities/StringableArray.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 01b8f4e5..1da88479 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -70,7 +70,7 @@ class CalendarGrid {
 	 *
 	 * @return void
 	 */
-	public function __construct(WP_Query $q, int $month = null, int $year = null)
+	public function __construct(WP_Query $q, ?int $month = null, ?int $year = null)
 	{
 		try {
 			// Validate month & year; create $d as a day within the month
diff --git a/src/TouchPoint-WP/Location.php b/src/TouchPoint-WP/Location.php
index 54f9aeb7..a9f6a9e6 100644
--- a/src/TouchPoint-WP/Location.php
+++ b/src/TouchPoint-WP/Location.php
@@ -52,7 +52,7 @@ public static function getLocations(): array
 		return self::$_locations;
 	}
 
-	public static function getLocationForIP(string $ipAddress = null): ?Location
+	public static function getLocationForIP(?string $ipAddress = null): ?Location
 	{
 		$ipAddress = $ipAddress ?? Utilities::getClientIp();
 
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index e8954a1e..e2f920f1 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -87,7 +87,7 @@ public function __toString()
 	 *
 	 * @since 0.0.90 Added
 	 */
-	public function join(string $separator = null): string
+	public function join(?string $separator = null): string
 	{
 		if (is_null($separator)) {
 			$separator = $this->separator;

From 0e4be1f883946e650b22354620008c56394c8a86 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 8 May 2025 13:41:47 -0400
Subject: [PATCH 286/423] Efficiency improvements

---
 src/TouchPoint-WP/Settings.php     | 4 ++--
 src/TouchPoint-WP/TouchPointWP.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index bb7f8af3..1aa9ec83 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -217,7 +217,7 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 		) {
 			return true;
 		}
-		foreach (self::settingsFields(false) as $page) {
+		foreach ($this->settings as $page) {
 			foreach ($page['fields'] as $f) {
 				if ($f['id'] === $settingName) {
 					if (isset($f['autoload'])) {
@@ -237,7 +237,7 @@ private function settingShouldBeAutoLoaded(string $settingName): bool
 	 */
 	private function getFieldMeta($fieldId): ?array
 	{
-		foreach ($this->settingsFields(false) as $category) {
+		foreach ($this->settings as $category) {
 			foreach ($category['fields'] as $field) {
 				if ($field['id'] === $fieldId) {
 					return $field;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 43eb63aa..385478ae 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -912,7 +912,7 @@ public static function init(): void
 	 */
 	public static function renderBaseInlineScript(): void
 	{
-		include self::instance()->assets_dir . '/js/base-inline.php';
+		include_once self::instance()->assets_dir . '/js/base-inline.php';
 	}
 
 	public function registerScriptsAndStyles(): void

From e43bd08ab93b0443b60e254a546b08a795f508c2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 15 May 2025 08:10:32 -0400
Subject: [PATCH 287/423] Resolve an issue where stats reporting was printing
 results (and blocking) when it shouldn't have.

---
 src/TouchPoint-WP/Stats.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 066c61a6..3144ac0d 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -289,9 +289,11 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 	/**
 	 * Submit stats to Tenth.
 	 *
+	 * @param bool $blocking If true, will wait for the response from the server before returning and the method will print a status.
+	 *
 	 * @return void
 	 */
-	protected function submitStats(): void
+	protected function submitStats(bool $blocking = false): void
 	{
 		$this->updateQueriedStats();
 
@@ -320,10 +322,24 @@ protected function submitStats(): void
 		$r = wp_remote_post($endpoint, [
 			'body' => ['data' => $data],
 			'timeout' => 10,
-//			'blocking' => false,
+			'blocking' => $blocking,
 		]);
-		var_dump($endpoint, $r, $data);
-		echo "ok";
+
+		if (!$blocking) {
+			if (is_wp_error($r)) {
+				echo "error";
+				error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . $r->get_error_message());
+			} else {
+				$code = wp_remote_retrieve_response_code($r);
+				if ($code !== 200) {
+					echo "error";
+					error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . wp_remote_retrieve_body($r));
+				} else {
+					echo "ok";
+				}
+			}
+
+		}
 	}
 
 	/**
@@ -421,7 +437,7 @@ public static function api(array $uri): bool
 				if ($_SERVER['REQUEST_METHOD'] === "POST") {
 					self::handleSubmission();
 				} else {
-					$s->submitStats();
+					$s->submitStats(true);
 				}
 				exit;
 

From f011ccebd8011426a2f4c76d98baa8b54321c952 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 5 Jun 2025 01:03:58 -0400
Subject: [PATCH 288/423] Making global declaration of i18n functions safer.

---
 assets/js/base-defer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 36b3d814..ea1d6000 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // noinspection JSUnresolvedVariable
-const { __, _x, _n, _nx, sprintf } = wp.i18n;
+const { __, _x, _n, _nx, sprintf } = typeof __ === "undefined" ? wp.i18n : { __, _x, _n, _nx, sprintf };
 
 function utilInit() {
     tpvm._utils.stringArrayToListString = function(strings) {

From 53763e100f8a9521815d804fb16622f85af310c8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 5 Jun 2025 12:45:49 -0400
Subject: [PATCH 289/423] Finally correcting JS scoping

---
 assets/js/base-defer.js                   | 2551 +++++++++++----------
 assets/js/meeting-defer.js                |    2 +-
 assets/js/partner-defer.js                |  271 +--
 src/TouchPoint-WP/Involvement.php         |    4 +-
 src/TouchPoint-WP/Meeting.php             |    2 +-
 src/TouchPoint-WP/Partner.php             |    4 +-
 src/TouchPoint-WP/Person.php              |    2 +-
 src/TouchPoint-WP/TouchPointWP.php        |    7 +-
 src/js-partials/involvement-map-inline.js |    2 +-
 src/js-partials/partner-map-inline.js     |    2 +-
 10 files changed, 1433 insertions(+), 1414 deletions(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index ea1d6000..cff806d6 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -1,1548 +1,1563 @@
 "use strict";
 
+(function() {
+
 // noinspection JSUnresolvedVariable
-const { __, _x, _n, _nx, sprintf } = typeof __ === "undefined" ? wp.i18n : { __, _x, _n, _nx, sprintf };
-
-function utilInit() {
-    tpvm._utils.stringArrayToListString = function(strings) {
-        let concat = strings.join(''),
-            comma = ', ',
-            and = ' & ',
-            useOxford = false,
-            last, str;
-        if (concat.indexOf(', ') !== -1) {
-            comma     = '; ';
-            useOxford = true;
-        }
-        if (concat.indexOf(' & ') !== -1) {
-            and = ' ' + __('and', 'TouchPoint-WP') + ' ';
-            useOxford = true;
-        }
-
-        last = strings.pop();
-        str = strings.join(comma);
-        if (strings.length > 0) {
-            if (useOxford)
-                str += comma.trim();
-            str += and;
-        }
-        str += last;
-        return str;
-    }
+    const {__, sprintf} = wp.i18n;
+
+    function utilInit() {
+        tpvm._utils.stringArrayToListString = function (strings) {
+            let concat = strings.join(''),
+                comma = ', ',
+                and = ' & ',
+                useOxford = false,
+                last, str;
+            if (concat.indexOf(', ') !== -1) {
+                comma = '; ';
+                useOxford = true;
+            }
+            if (concat.indexOf(' & ') !== -1) {
+                and = ' ' + __('and', 'TouchPoint-WP') + ' ';
+                useOxford = true;
+            }
 
-    /**
-     *
-     * @param {string} action The name of the action function, minus the word "action"
-     * @param {object} object The object to which the action belongs.
-     */
-    tpvm._utils.registerAction = function(action, object) {
-        if (typeof object[action + "Action"] === "function") {
-            let sc = object.shortClass;
-            if (typeof sc !== "string") {
-                console.warn(`Action '${action}' cannot be registered because the short class name is missing.`)
-                return;
+            last = strings.pop();
+            str = strings.join(comma);
+            if (strings.length > 0) {
+                if (useOxford)
+                    str += comma.trim();
+                str += and;
             }
-            let actionLC = action.toLowerCase();
-            if (!tpvm._actions.hasOwnProperty(actionLC)) {
-                tpvm._actions[actionLC] = [];
+            str += last;
+            return str;
+        }
+
+        /**
+         *
+         * @param {string} action The name of the action function, minus the word "action"
+         * @param {object} object The object to which the action belongs.
+         */
+        tpvm._utils.registerAction = function (action, object) {
+            if (typeof object[action + "Action"] === "function") {
+                let sc = object.shortClass;
+                if (typeof sc !== "string") {
+                    console.warn(`Action '${action}' cannot be registered because the short class name is missing.`)
+                    return;
+                }
+                let actionLC = action.toLowerCase();
+                if (!tpvm._actions.hasOwnProperty(actionLC)) {
+                    tpvm._actions[actionLC] = [];
+                }
+                tpvm._actions[actionLC].push({
+                    action: () => object[action + "Action"](),
+                    uid: sc + object.id
+                });
             }
-            tpvm._actions[actionLC].push({
-                action: () => object[action + "Action"](),
-                uid: sc + object.id
-            });
         }
-    }
 
-    tpvm._utils.applyHashForAction = function(action, object) {
-        // Make sure a function exists
-        if (typeof object[action + "Action"] !== "function") {
-            return;
-        }
+        tpvm._utils.applyHashForAction = function (action, object) {
+            // Make sure a function exists
+            if (typeof object[action + "Action"] !== "function") {
+                return;
+            }
 
-        // Figure out the needed hash
-        action = action.toLowerCase()
-        if (tpvm._actions[action].length === 1) {
-            window.location.hash = "tp-" + action;
-        } else if (tpvm._actions[action].length > 1) {
-            window.location.hash = "tp-" + action + "-" + object.shortClass + object.id;
+            // Figure out the needed hash
+            action = action.toLowerCase()
+            if (tpvm._actions[action].length === 1) {
+                window.location.hash = "tp-" + action;
+            } else if (tpvm._actions[action].length > 1) {
+                window.location.hash = "tp-" + action + "-" + object.shortClass + object.id;
+            }
         }
-    }
 
-    tpvm._utils.clearHash = function() {
-        if (!!window.history) {
-            window.history.pushState("", "", `${window.location.pathname}${window.location.search}`)
-        } else {
-            window.location.hash = "";
+        tpvm._utils.clearHash = function () {
+            if (!!window.history) {
+                window.history.pushState("", "", `${window.location.pathname}${window.location.search}`)
+            } else {
+                window.location.hash = "";
+            }
         }
-    }
 
-    /**
-     *
-     * @param {?string} limitToAction
-     */
-    tpvm._utils.handleHash = function(limitToAction = null) {
-        if (window.location.hash.substring(1, 4) !== "tp-") {
-            return;
-        }
+        /**
+         *
+         * @param {?string} limitToAction
+         */
+        tpvm._utils.handleHash = function (limitToAction = null) {
+            if (window.location.hash.substring(1, 4) !== "tp-") {
+                return;
+            }
 
-        let [action, identifier] = window.location.hash.toLowerCase().substring(4).split('-', 2);
+            let [action, identifier] = window.location.hash.toLowerCase().substring(4).split('-', 2);
 
-        if (tpvm._actions[action] === undefined || (limitToAction !== null && action !== limitToAction.toLowerCase())) {
-            return;
-        }
-        if (tpvm._actions[action].length === 1 && identifier === undefined) {
-            tpvm._actions[action][0].action();
-            return;
-        }
+            if (tpvm._actions[action] === undefined || (limitToAction !== null && action !== limitToAction.toLowerCase())) {
+                return;
+            }
+            if (tpvm._actions[action].length === 1 && identifier === undefined) {
+                tpvm._actions[action][0].action();
+                return;
+            }
 
-        let obj = tpvm._actions[action].find((t) => t.uid === identifier);
-        if (obj !== undefined && typeof obj.action === "function") {
-            obj.action();
+            let obj = tpvm._actions[action].find((t) => t.uid === identifier);
+            if (obj !== undefined && typeof obj.action === "function") {
+                obj.action();
+            }
         }
-    }
-    tpvm.addEventListener("load", tpvm._utils.handleHash);
+        tpvm.addEventListener("load", tpvm._utils.handleHash);
 
-    tpvm._utils.defaultSwalClasses = function() {
-        return {
-            container: 'tp-swal-container'
+        tpvm._utils.defaultSwalClasses = function () {
+            return {
+                container: 'tp-swal-container'
+            }
         }
-    }
 
-    tpvm._utils.arrayAdd = function (a, b) {
-        if (a.length !== b.length) {
-            console.error("Array lengths do not match.");
-            return;
-        }
-        for (const ai in a) {
-            a[ai] += b[ai];
+        tpvm._utils.arrayAdd = function (a, b) {
+            if (a.length !== b.length) {
+                console.error("Array lengths do not match.");
+                return;
+            }
+            for (const ai in a) {
+                a[ai] += b[ai];
+            }
+            return a;
+        }
+
+        tpvm._utils.averageColor = function (arr) {
+            let components = [0, 0, 0, 0],
+                useAlpha = false,
+                denominator = 0;
+            for (const ai in arr) {
+                arr[ai] = arr[ai].replace(';', '').trim();
+                if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 4) { // #abc
+                    components = tpvm._utils.arrayAdd(components, [
+                        parseInt(arr[ai][1] + arr[ai][1], 16),
+                        parseInt(arr[ai][2] + arr[ai][2], 16),
+                        parseInt(arr[ai][3] + arr[ai][3], 16),
+                        255]);
+                    denominator++;
+                } else if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 5) { // #abcd
+                    components = tpvm._utils.arrayAdd(components, [
+                        parseInt(arr[ai][1] + arr[ai][1], 16),
+                        parseInt(arr[ai][2] + arr[ai][2], 16),
+                        parseInt(arr[ai][3] + arr[ai][3], 16),
+                        parseInt(arr[ai][4] + arr[ai][4], 16)]);
+                    useAlpha = true;
+                    denominator++;
+                } else if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 7) { // #aabbcc
+                    components = tpvm._utils.arrayAdd(components, [
+                        parseInt(arr[ai][1] + arr[ai][2], 16),
+                        parseInt(arr[ai][3] + arr[ai][4], 16),
+                        parseInt(arr[ai][5] + arr[ai][6], 16),
+                        255]);
+                    denominator++;
+                } else if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 9) { // #aabbccdd
+                    components = tpvm._utils.arrayAdd(components, [
+                        parseInt(arr[ai][1] + arr[ai][2], 16),
+                        parseInt(arr[ai][3] + arr[ai][4], 16),
+                        parseInt(arr[ai][5] + arr[ai][6], 16),
+                        parseInt(arr[ai][7] + arr[ai][8], 16)]);
+                    useAlpha = true;
+                    denominator++;
+                } else {
+                    console.error("Can't calculate the color for " + arr[ai]);
+                }
+            }
+            if (!useAlpha) {
+                components.pop();
+            }
+            for (const ci in components) {
+                components[ci] = Math.round(components[ci] / denominator).toString(16); // convert to hex
+                components[ci] = ("00" + components[ci]).slice(-2); // pad, just in case there's only one digit.
+            }
+            return "#" + components.join('');
         }
-        return a;
-    }
 
-    tpvm._utils.averageColor = function (arr) {
-        let components = [0, 0, 0, 0],
-            useAlpha = false,
-            denominator = 0;
-        for (const ai in arr) {
-            arr[ai] = arr[ai].replace(';', '').trim();
-            if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 4) { // #abc
-                components = tpvm._utils.arrayAdd(components, [
-                    parseInt(arr[ai][1] + arr[ai][1], 16),
-                    parseInt(arr[ai][2] + arr[ai][2], 16),
-                    parseInt(arr[ai][3] + arr[ai][3], 16),
-                    255]);
-                denominator++;
-            } else if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 5) { // #abcd
-                components = tpvm._utils.arrayAdd(components, [
-                    parseInt(arr[ai][1] + arr[ai][1], 16),
-                    parseInt(arr[ai][2] + arr[ai][2], 16),
-                    parseInt(arr[ai][3] + arr[ai][3], 16),
-                    parseInt(arr[ai][4] + arr[ai][4], 16)]);
-                useAlpha = true;
-                denominator++;
-            } else if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 7) { // #aabbcc
-                components = tpvm._utils.arrayAdd(components, [
-                    parseInt(arr[ai][1] + arr[ai][2], 16),
-                    parseInt(arr[ai][3] + arr[ai][4], 16),
-                    parseInt(arr[ai][5] + arr[ai][6], 16),
-                    255]);
-                denominator++;
-            } else if (typeof arr[ai] === "string" && arr[ai][0] === '#' && arr[ai].length === 9) { // #aabbccdd
-                components = tpvm._utils.arrayAdd(components, [
-                    parseInt(arr[ai][1] + arr[ai][2], 16),
-                    parseInt(arr[ai][3] + arr[ai][4], 16),
-                    parseInt(arr[ai][5] + arr[ai][6], 16),
-                    parseInt(arr[ai][7] + arr[ai][8], 16)]);
-                useAlpha = true;
-                denominator++;
-            } else {
-                console.error("Can't calculate the color for " + arr[ai]);
+        tpvm._utils.ga = function (command, hitType, category, action, label = null, value = null) {
+            if (typeof ga === "function") {
+                ga(command, hitType, category, action, label, value);
+            }
+            if (typeof gtag === "function") {
+                gtag(hitType, action, {
+                    'event_category': category,
+                    'event_label': label,
+                    'value': value
+                });
             }
         }
-        if (!useAlpha) {
-            components.pop();
-        }
-        for (const ci in components) {
-            components[ci] = Math.round(components[ci] / denominator).toString(16); // convert to hex
-            components[ci] = ("00" + components[ci]).slice(-2); // pad, just in case there's only one digit.
-        }
-        return "#" + components.join('');
     }
 
-    tpvm._utils.ga = function(command, hitType, category, action, label = null, value = null) {
-        if (typeof ga === "function") {
-            ga(command, hitType, category, action, label, value);
+    utilInit();
+
+    class TP_DataGeo {
+        static loc = {
+            "lat": null,
+            "lng": null,
+            "type": null,
+            "human": __('Loading...', 'TouchPoint-WP')
+        };
+
+        get shortClass() {
+            return "geo";
         }
-        if (typeof gtag === "function") {
-            gtag(hitType, action, {
-                'event_category': category,
-                'event_label': label,
-                'value': value
-            });
+
+        static init() {
+            tpvm.trigger('dataGeo_class_loaded');
         }
-    }
-}
-utilInit();
-
-class TP_DataGeo {
-    static loc = {
-        "lat": null,
-        "lng": null,
-        "type": null,
-        "human": __('Loading...', 'TouchPoint-WP')
-    };
-
-    get shortClass() {
-        return "geo";
-    }
 
-    static init() {
-        tpvm.trigger('dataGeo_class_loaded');
-    }
+        static geoByNavigator(then = null, error = null) {
+            navigator.geolocation.getCurrentPosition(geo, err);
 
-    static geoByNavigator(then = null, error = null) {
-        navigator.geolocation.getCurrentPosition(geo, err);
+            function geo(pos) {
+                TP_DataGeo.loc = {
+                    "lat": pos.coords.latitude,
+                    "lng": pos.coords.longitude,
+                    "type": "nav",
+                    "permission": null,
+                    "human": __('Your Location', 'TouchPoint-WP')
+                }
 
-        function geo(pos) {
-            TP_DataGeo.loc = {
-                "lat": pos.coords.latitude,
-                "lng": pos.coords.longitude,
-                "type": "nav",
-                "permission": null,
-                "human": __('Your Location', 'TouchPoint-WP')
-            }
+                if (then !== null) {
+                    then(TP_DataGeo.loc)
+                }
 
-            if (then !== null) {
-                then(TP_DataGeo.loc)
+                tpvm.trigger("dataGeo_located", TP_DataGeo.loc)
             }
 
-            tpvm.trigger("dataGeo_located", TP_DataGeo.loc)
-        }
+            function err(e) {
+                let userFacingMessage;
 
-        function err(e) {
-            let userFacingMessage;
+                if (error !== null) {
+                    error(e)
+                }
 
-            if (error !== null) {
-                error(e)
-            }
+                console.error(e);
 
-            console.error(e);
+                switch (e.code) {
+                    case e.PERMISSION_DENIED:
+                        userFacingMessage = __("User denied the request for Geolocation.", 'TouchPoint-WP');
+                        break;
 
-            switch(e.code) {
-                case e.PERMISSION_DENIED:
-                    userFacingMessage = __("User denied the request for Geolocation.", 'TouchPoint-WP');
-                    break;
+                    case e.POSITION_UNAVAILABLE:
+                        userFacingMessage = __("Location information is unavailable.", 'TouchPoint-WP');
+                        break;
 
-                case e.POSITION_UNAVAILABLE:
-                    userFacingMessage = __("Location information is unavailable.", 'TouchPoint-WP');
-                    break;
+                    case e.TIMEOUT:
+                        userFacingMessage = __("The request to get user location timed out.", 'TouchPoint-WP');
+                        break;
 
-                case e.TIMEOUT:
-                    userFacingMessage = __("The request to get user location timed out.", 'TouchPoint-WP');
-                    break;
+                    default:
+                        userFacingMessage = __("An unknown error occurred.", 'TouchPoint-WP');
+                        break;
+                }
 
-                default:
-                    userFacingMessage = __("An unknown error occurred.", 'TouchPoint-WP');
-                    break;
+                tpvm.trigger("dataGeo_error", userFacingMessage)
             }
-
-            tpvm.trigger("dataGeo_error", userFacingMessage)
         }
-    }
 
-    /**
-     * Get the user's location.
-     *
-     * @param then function Callback for when the location is available.
-     * @param error function Callback for an error. (Error data structure may vary.)
-     * @param type string Type of fetching to use. "nav", "ip" or "both"
-     */
-    static getLocation(then, error, type = "both") {
-        if (type === "both") {
-            type = ["nav", "ip"];
-        } else {
-            type = [type];
-        }
-
-        tpvm.addEventListener("dataGeo_located", then);
-
-        // navigator is preferred if available and allowed.
-        if (navigator.geolocation && navigator.permissions && type.indexOf("nav") > -1) {
-            navigator.permissions.query({name: 'geolocation'}).then(
-                function(PermissionStatus) {
-                    TP_DataGeo.loc.permission = PermissionStatus.state;
-                    if (PermissionStatus.state === 'granted') {
-                        return TP_DataGeo.geoByNavigator(null, error);
-                    } else {
-                        // Fallback to Server
-                        if (type.indexOf("ip") > -1) {
-                            return TP_DataGeo.geoByServer(null, error);
+        /**
+         * Get the user's location.
+         *
+         * @param then function Callback for when the location is available.
+         * @param error function Callback for an error. (Error data structure may vary.)
+         * @param type string Type of fetching to use. "nav", "ip" or "both"
+         */
+        static getLocation(then, error, type = "both") {
+            if (type === "both") {
+                type = ["nav", "ip"];
+            } else {
+                type = [type];
+            }
+
+            tpvm.addEventListener("dataGeo_located", then);
+
+            // navigator is preferred if available and allowed.
+            if (navigator.geolocation && navigator.permissions && type.indexOf("nav") > -1) {
+                navigator.permissions.query({name: 'geolocation'}).then(
+                    function (PermissionStatus) {
+                        TP_DataGeo.loc.permission = PermissionStatus.state;
+                        if (PermissionStatus.state === 'granted') {
+                            return TP_DataGeo.geoByNavigator(null, error);
                         } else {
-                            error({error: true, message: __("No geolocation option available.", 'TouchPoint-WP')});
+                            // Fallback to Server
+                            if (type.indexOf("ip") > -1) {
+                                return TP_DataGeo.geoByServer(null, error);
+                            } else {
+                                error({error: true, message: __("No geolocation option available.", 'TouchPoint-WP')});
+                            }
                         }
                     }
-                }
-            )
-        } else {
-            // Fallback to Server
-            if (type.indexOf("ip") > -1) {
-                return TP_DataGeo.geoByServer(null, error);
+                )
             } else {
-                error({error: true, message: __("No geolocation option available.", 'TouchPoint-WP')});
+                // Fallback to Server
+                if (type.indexOf("ip") > -1) {
+                    return TP_DataGeo.geoByServer(null, error);
+                } else {
+                    error({error: true, message: __("No geolocation option available.", 'TouchPoint-WP')});
+                }
             }
         }
-    }
 
-    static geoByServer(then, error) {
-        tpvm.getData('geolocate').then(function (responseData) {
-            if (responseData.hasOwnProperty("error")) {
-                error(responseData.error)
-                tpvm.trigger("dataGeo_error", responseData.error)
-            } else {
-                for (const di in responseData) {
-                    if (responseData.hasOwnProperty(di))
-                        TP_DataGeo.loc[di] = responseData[di];
-                }
+        static geoByServer(then, error) {
+            tpvm.getData('geolocate').then(function (responseData) {
+                if (responseData.hasOwnProperty("error")) {
+                    error(responseData.error)
+                    tpvm.trigger("dataGeo_error", responseData.error)
+                } else {
+                    for (const di in responseData) {
+                        if (responseData.hasOwnProperty(di))
+                            TP_DataGeo.loc[di] = responseData[di];
+                    }
 
-                if (then !== null) {
-                    then(TP_DataGeo.loc)
-                }
+                    if (then !== null) {
+                        then(TP_DataGeo.loc)
+                    }
 
-                tpvm.trigger("dataGeo_located", TP_DataGeo.loc)
+                    tpvm.trigger("dataGeo_located", TP_DataGeo.loc)
+                }
+            }, error);
+        }
+    }
+    tpvm.TP_DataGeo = TP_DataGeo;
+    TP_DataGeo.init();
+
+    class TP_MapMarker {
+        /**
+         *
+         * @type {TP_Mappable[]}
+         */
+        items = [];
+
+        color = "#000";
+
+        geoStr = "";
+
+        /**
+         * @type {google.maps.Marker}
+         */
+        gMkr = null;
+
+        constructor(options) {
+            if (!options.hasOwnProperty('icon')) {
+                options.icon = {
+                    path: "M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0z", // from FontAwesome
+                    fillColor: options.color ?? "#000",
+                    fillOpacity: .85,
+                    anchor: new google.maps.Point(172.268, 501.67),
+                    strokeWeight: 1,
+                    scale: 0.04,
+                    labelOrigin: new google.maps.Point(190, 198)
+                }
             }
-        }, error);
-    }
-}
-TP_DataGeo.init();
-
-class TP_MapMarker
-{
-    /**
-     *
-     * @type {TP_Mappable[]}
-     */
-    items = [];
-
-    color = "#000";
-
-    geoStr = "";
-
-    /**
-     * @type {google.maps.Marker}
-     */
-    gMkr = null;
-
-    constructor(options) {
-        if (!options.hasOwnProperty('icon')) {
-            options.icon = {
-                path: "M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0z", // from FontAwesome
-                fillColor: options.color ?? "#000",
-                fillOpacity: .85,
-                anchor: new google.maps.Point(172.268, 501.67),
-                strokeWeight: 1,
-                scale: 0.04,
-                labelOrigin: new google.maps.Point(190, 198)
-            }
-        }
-        this.gMkr = new google.maps.Marker(options);
-        let that = this;
-        this.gMkr.addListener("click", () => that.handleClick());
-    }
-
-    get visibleItems() {
-        return this.items.filter((i) => i._visible);
-    }
+            this.gMkr = new google.maps.Marker(options);
+            let that = this;
+            this.gMkr.addListener("click", () => that.handleClick());
+        }
 
-    get visible() {
-        return this.visibleItems.length > 0
-    }
+        get visibleItems() {
+            return this.items.filter((i) => i._visible);
+        }
 
-    get inBounds() {
-        let map = this.gMkr.getMap();
-        if (!map) { // if map failed to render for some reason, this prevents entries from being hidden.
-            return true;
+        get visible() {
+            return this.visibleItems.length > 0
         }
-        return map.getBounds().contains(this.gMkr.getPosition());
-    }
 
-    get useIcon() {
-        let icon = this.visibleItems.find((i) => i.useIcon !== false)
-        if (icon === undefined) {
-            return false;
+        get inBounds() {
+            let map = this.gMkr.getMap();
+            if (!map) { // if map failed to render for some reason, this prevents entries from being hidden.
+                return true;
+            }
+            return map.getBounds().contains(this.gMkr.getPosition());
         }
-        return icon.useIcon;
-    }
 
-    updateLabel(highlighted = false) {
-        if (this.gMkr === null) {
-            return;
+        get useIcon() {
+            let icon = this.visibleItems.find((i) => i.useIcon !== false)
+            if (icon === undefined) {
+                return false;
+            }
+            return icon.useIcon;
         }
 
-        let icon = this.gMkr.getIcon();
+        updateLabel(highlighted = false) {
+            if (this.gMkr === null) {
+                return;
+            }
 
-        // Update icon color
-        this.color = tpvm._utils.averageColor(this.visibleItems.map((i) => i.color))
-        if (icon !== undefined && icon.hasOwnProperty("fillColor")) {
-            icon.fillColor = this.color;
-            this.gMkr.setIcon(icon);
-        }
+            let icon = this.gMkr.getIcon();
 
-        // Update visibility
-        this.gMkr.setVisible(this.visibleItems.length > 0);
+            // Update icon color
+            this.color = tpvm._utils.averageColor(this.visibleItems.map((i) => i.color))
+            if (icon !== undefined && icon.hasOwnProperty("fillColor")) {
+                icon.fillColor = this.color;
+                this.gMkr.setIcon(icon);
+            }
 
-        // Update title
-        this.gMkr.setTitle(tpvm._utils.stringArrayToListString(this.visibleItems.map((i) => i.name)))
+            // Update visibility
+            this.gMkr.setVisible(this.visibleItems.length > 0);
 
-        // Update label proper
-        if (highlighted) {
-            this.gMkr.setLabel(null); // Remove label if highlighted, because labels don't animate.
-        } else {
-            this.gMkr.setLabel(this.getLabelContent());
-        }
-    }
+            // Update title
+            this.gMkr.setTitle(tpvm._utils.stringArrayToListString(this.visibleItems.map((i) => i.name)))
 
-    getLabelContent() {
-        let label = null;
-        if (this.visibleItems.length > 1) {
-            label = {
-                text: this.visibleItems.length.toString(),
-                color: "#000000",
-                fontSize: "100%"
+            // Update label proper
+            if (highlighted) {
+                this.gMkr.setLabel(null); // Remove label if highlighted, because labels don't animate.
+            } else {
+                this.gMkr.setLabel(this.getLabelContent());
             }
-        } else if (this.useIcon !== false) { // icon for secure partners
-            label = this.useIcon;
         }
-        return label;
-    }
 
-    // noinspection JSUnusedGlobalSymbols  Used dynamically from markers.
-    handleClick() {
-        if (this.gMkr === null) {
-            return;
+        getLabelContent() {
+            let label = null;
+            if (this.visibleItems.length > 1) {
+                label = {
+                    text: this.visibleItems.length.toString(),
+                    color: "#000000",
+                    fontSize: "100%"
+                }
+            } else if (this.useIcon !== false) { // icon for secure partners
+                label = this.useIcon;
+            }
+            return label;
         }
 
-        tpvm._utils.clearHash();
+        // noinspection JSUnusedGlobalSymbols  Used dynamically from markers.
+        handleClick() {
+            if (this.gMkr === null) {
+                return;
+            }
 
-        const mp = this.gMkr.getMap();
-        TP_MapMarker.smoothZoom(mp, this.gMkr.getPosition()).then(() => 1)
+            tpvm._utils.clearHash();
 
-        tpvm._utils.ga('send', 'event', this.items[0].itemTypeName, 'mapMarker click', this.gMkr.getTitle());
-    }
+            const mp = this.gMkr.getMap();
+            TP_MapMarker.smoothZoom(mp, this.gMkr.getPosition()).then(() => 1)
 
-    /**
-     * Smoothly zoom in (or out) on the given map.  By default, zooms in to the max level allowed.
-     *
-     * @param {google.maps.Map} map The Google Maps map
-     * @param {google.maps.LatLng} position The position to move to center
-     * @param {number, undefined} zoomTo Google Maps zoom level, or undefined for maxZoom.
-     */
-    static async smoothZoom(map, position = null, zoomTo = undefined) {
-        if (zoomTo === undefined || zoomTo > map.maxZoom) {
-            zoomTo = map.maxZoom;
-        }
-
-        if (map.getZoom() !== zoomTo) {
-            let z = google.maps.event.addListener(map, 'zoom_changed', () => {
-                google.maps.event.removeListener(z);
-                setTimeout(() => this.smoothZoom(map, position, zoomTo), 150);
-            });
-            if (map.getZoom() < zoomTo) { // zoom in
-                map.setZoom(map.getZoom() + 1);
-            } else { // zoom out
-                map.setZoom(map.getZoom() - 1);
+            tpvm._utils.ga('send', 'event', this.items[0].itemTypeName, 'mapMarker click', this.gMkr.getTitle());
+        }
+
+        /**
+         * Smoothly zoom in (or out) on the given map.  By default, zooms in to the max level allowed.
+         *
+         * @param {google.maps.Map} map The Google Maps map
+         * @param {google.maps.LatLng} position The position to move to center
+         * @param {number, undefined} zoomTo Google Maps zoom level, or undefined for maxZoom.
+         */
+        static async smoothZoom(map, position = null, zoomTo = undefined) {
+            if (zoomTo === undefined || zoomTo > map.maxZoom) {
+                zoomTo = map.maxZoom;
             }
-            if (position !== null) {
-                let oldPos = map.getCenter(),
-                    newPos = new google.maps.LatLng((oldPos.lat() + position.lat() * 2) / 3, (oldPos.lng() + position.lng() * 2) / 3);
-                map.panTo(newPos);
+
+            if (map.getZoom() !== zoomTo) {
+                let z = google.maps.event.addListener(map, 'zoom_changed', () => {
+                    google.maps.event.removeListener(z);
+                    setTimeout(() => this.smoothZoom(map, position, zoomTo), 150);
+                });
+                if (map.getZoom() < zoomTo) { // zoom in
+                    map.setZoom(map.getZoom() + 1);
+                } else { // zoom out
+                    map.setZoom(map.getZoom() - 1);
+                }
+                if (position !== null) {
+                    let oldPos = map.getCenter(),
+                        newPos = new google.maps.LatLng((oldPos.lat() + position.lat() * 2) / 3, (oldPos.lng() + position.lng() * 2) / 3);
+                    map.panTo(newPos);
+                }
+            } else {
+                map.panTo(position);
             }
-        } else {
-            map.panTo(position);
         }
     }
-}
+    tpvm.TP_MapMarker = TP_MapMarker;
 
-class TP_Mappable {
-    name = "";
-    post_id = 0;
-    _id = null; // For situations where the ID needs to happen early in the instantiation chain.
+    class TP_Mappable {
+        name = "";
+        post_id = 0;
+        _id = null; // For situations where the ID needs to happen early in the instantiation chain.
 
-    geo = {};
+        geo = {};
 
-    color = "#000";
+        color = "#000";
 
-    /**
-     * @type {TP_Mappable[]}
-     */
-    static items = [];
-    static itemsWithoutMarkers = [];
+        /**
+         * @type {TP_Mappable[]}
+         */
+        static items = [];
+        static itemsWithoutMarkers = [];
 
-    _visible = true;
+        _visible = true;
 
-    /**
-     * All markers on all maps.
-     *
-     * @type {TP_MapMarker[]}
-     */
-    static markers = [];
+        /**
+         * All markers on all maps.
+         *
+         * @type {TP_MapMarker[]}
+         */
+        static markers = [];
 
-    /**
-     * Markers for this specific object.
-     *
-     * @type {TP_MapMarker[]}
-     */
-    markers = [];
+        /**
+         * Markers for this specific object.
+         *
+         * @type {TP_MapMarker[]}
+         */
+        markers = [];
 
-    constructor(obj, id = null) {
-        this._id = id;
+        constructor(obj, id = null) {
+            this._id = id;
 
-        if (obj.geo !== undefined && obj.geo !== null && obj.geo.lat !== null && obj.geo.lng !== null) {
-            obj.geo.lat = Math.round(obj.geo.lat * 1000) / 1000;
-            obj.geo.lng = Math.round(obj.geo.lng * 1000) / 1000;
-        }
+            if (obj.geo !== undefined && obj.geo !== null && obj.geo.lat !== null && obj.geo.lng !== null) {
+                obj.geo.lat = Math.round(obj.geo.lat * 1000) / 1000;
+                obj.geo.lng = Math.round(obj.geo.lng * 1000) / 1000;
+            }
 
-        this.geo = [obj.geo] ?? [];
+            this.geo = [obj.geo] ?? [];
 
-        this.name = obj.name.replace("&amp;", "&");
-        this.post_id = obj.post_id;
+            this.name = obj.name.replace("&amp;", "&");
+            this.post_id = obj.post_id;
 
-        if (obj.post_id === undefined) {
-            this.post_id = 0;
-        }
+            if (obj.post_id === undefined) {
+                this.post_id = 0;
+            }
 
-        if (obj.hasOwnProperty('color')) {
-            this.color = obj.color;
-        }
+            if (obj.hasOwnProperty('color')) {
+                this.color = obj.color;
+            }
 
-        for (const ei in this.connectedElements) {
-            if (!this.connectedElements.hasOwnProperty(ei)) continue;
+            for (const ei in this.connectedElements) {
+                if (!this.connectedElements.hasOwnProperty(ei)) continue;
 
-            let mappable = this;
-            this.connectedElements[ei].addEventListener('mouseenter', function(e){e.stopPropagation(); mappable.toggleHighlighted(true);});
-            this.connectedElements[ei].addEventListener('mouseleave', function(e){e.stopPropagation(); mappable.toggleHighlighted(false);});
+                let mappable = this;
+                this.connectedElements[ei].addEventListener('mouseenter', function (e) {
+                    e.stopPropagation();
+                    mappable.toggleHighlighted(true);
+                });
+                this.connectedElements[ei].addEventListener('mouseleave', function (e) {
+                    e.stopPropagation();
+                    mappable.toggleHighlighted(false);
+                });
 
-            let ce = this.connectedElements[ei],
-                actionBtns = Array.from(ce.querySelectorAll('[data-tp-action]'));
-            if (ce.hasAttribute('data-tp-action')) {
-                // if there's a sole button, it should be added to the list so it works, too.
-                actionBtns.push(ce);
-            }
+                let ce = this.connectedElements[ei],
+                    actionBtns = Array.from(ce.querySelectorAll('[data-tp-action]'));
+                if (ce.hasAttribute('data-tp-action')) {
+                    // if there's a sole button, it should be added to the list so it works, too.
+                    actionBtns.push(ce);
+                }
 
-            for (const ai in actionBtns) {
-                if (!actionBtns.hasOwnProperty(ai)) continue;
-                const action = actionBtns[ai].getAttribute('data-tp-action');
-                if (typeof mappable[action + "Action"] === "function") {
-                    tpvm._utils.registerAction(action, mappable)
-                    actionBtns[ai].addEventListener('click', function (e) {
-                        e.stopPropagation();
-                        mappable[action + "Action"]();
-                    });
+                for (const ai in actionBtns) {
+                    if (!actionBtns.hasOwnProperty(ai)) continue;
+                    const action = actionBtns[ai].getAttribute('data-tp-action');
+                    if (typeof mappable[action + "Action"] === "function") {
+                        tpvm._utils.registerAction(action, mappable)
+                        actionBtns[ai].addEventListener('click', function (e) {
+                            e.stopPropagation();
+                            mappable[action + "Action"]();
+                        });
+                    }
                 }
             }
+
+            TP_Mappable.items.push(this);
         }
 
-        TP_Mappable.items.push(this);
-    }
+        /**
+         * Returns the ID used for instances in tpvm.  Must be implemented by extenders if not the post_id.
+         *
+         * @return {int}
+         */
+        get id() {
+            return this.post_id;
+        }
 
-    /**
-     * Returns the ID used for instances in tpvm.  Must be implemented by extenders if not the post_id.
-     *
-     * @return {int}
-     */
-    get id() {
-        return this.post_id;
-    }
+        get shortClass() {
+            return "mpbl";
+        }
 
-    get shortClass() {
-        return "mpbl";
-    }
+        static initMap(containerElt, mapOptions, list) {
+            google.maps.visualRefresh = true;
+            const map = new google.maps.Map(containerElt, mapOptions),
+                bounds = new google.maps.LatLngBounds();
 
-    static initMap(containerElt, mapOptions, list) {
-        google.maps.visualRefresh = true;
-        const map = new google.maps.Map(containerElt, mapOptions),
-            bounds = new google.maps.LatLngBounds();
+            for (const ii in list) {
+                if (!list.hasOwnProperty(ii)) continue;
 
-        for (const ii in list) {
-            if (!list.hasOwnProperty(ii)) continue;
+                // skip items that aren't locatable.
+                let hasMarkers = false;
+                for (const gi in list[ii].geo) {
+                    if (list[ii].geo[gi] === null || list[ii].geo[gi].lat === null || list[ii].geo[gi].lng === null)
+                        continue;
 
-            // skip items that aren't locatable.
-            let hasMarkers = false;
-            for (const gi in list[ii].geo) {
-                if (list[ii].geo[gi] === null || list[ii].geo[gi].lat === null || list[ii].geo[gi].lng === null)
-                    continue;
+                    const item = list[ii],
+                        geoStr = "" + item.geo[gi].lat + "," + item.geo[gi].lng;
+                    let mkr = this.markers.find((m) => m.gMkr.getMap() === map && m.geoStr === geoStr);
 
-                const item = list[ii],
-                    geoStr = "" + item.geo[gi].lat + "," + item.geo[gi].lng;
-                let mkr = this.markers.find((m) => m.gMkr.getMap() === map && m.geoStr === geoStr);
-
-                // If there isn't already a marker for the item on the right map, create one.
-                if (mkr === undefined) {
-                    mkr = new TP_MapMarker({
-                        position: item.geo[gi],
-                        color: item.color,
-                        map: map,
-                        animation: google.maps.Animation.DROP,
-                    });
-                    mkr.geoStr = geoStr;
+                    // If there isn't already a marker for the item on the right map, create one.
+                    if (mkr === undefined) {
+                        mkr = new TP_MapMarker({
+                            position: item.geo[gi],
+                            color: item.color,
+                            map: map,
+                            animation: google.maps.Animation.DROP,
+                        });
+                        mkr.geoStr = geoStr;
 
-                    // Add to collection of all markers
-                    this.markers.push(mkr);
-                }
+                        // Add to collection of all markers
+                        this.markers.push(mkr);
+                    }
 
-                bounds.extend(mkr.gMkr.getPosition());
+                    bounds.extend(mkr.gMkr.getPosition());
 
-                // If the marker doesn't already have a reference to this item, add one.
-                if (!mkr.items.includes(item)) {
-                    mkr.items.push(item);
-                }
+                    // If the marker doesn't already have a reference to this item, add one.
+                    if (!mkr.items.includes(item)) {
+                        mkr.items.push(item);
+                    }
 
-                // If the item doesn't already have a reference to this marker, add one.
-                if (!item.markers.includes(mkr)) {
-                    item.markers.push(mkr);
-                }
+                    // If the item doesn't already have a reference to this marker, add one.
+                    if (!item.markers.includes(mkr)) {
+                        item.markers.push(mkr);
+                    }
 
-                hasMarkers = true;
+                    hasMarkers = true;
 
-                mkr.updateLabel();
-            }
-            if (!hasMarkers) {
-                this.itemsWithoutMarkers.push(this);
+                    mkr.updateLabel();
+                }
+                if (!hasMarkers) {
+                    this.itemsWithoutMarkers.push(this);
+                }
             }
-        }
 
-        map.fitBounds(bounds);
+            map.fitBounds(bounds);
 
-        map.addListener('bounds_changed', this.handleZoom);
+            map.addListener('bounds_changed', this.handleZoom);
 
-        // Add Map Reset links
-        let elts = document.getElementsByClassName("TouchPointWP-map-resetLink");
-        for (const ei in elts) {
-            if (! elts.hasOwnProperty(ei)) continue;
-            elts[ei].addEventListener("click", (e) => {
-                tpvm._utils.clearHash();
-                e.preventDefault();
-                map.fitBounds(bounds);
-            });
+            // Add Map Reset links
+            let elts = document.getElementsByClassName("TouchPointWP-map-resetLink");
+            for (const ei in elts) {
+                if (!elts.hasOwnProperty(ei)) continue;
+                elts[ei].addEventListener("click", (e) => {
+                    tpvm._utils.clearHash();
+                    e.preventDefault();
+                    map.fitBounds(bounds);
+                });
+            }
         }
-    }
 
-    // noinspection JSUnusedGlobalSymbols  Used dynamically from warning text.
-    /**
-     *
-     * @param {google.maps.Map} map
-     */
-    static resetMap(map) {
-        console.log("reset " + map.getMapTypeId())
-    }
+        // noinspection JSUnusedGlobalSymbols  Used dynamically from warning text.
+        /**
+         *
+         * @param {google.maps.Map} map
+         */
+        static resetMap(map) {
+            console.log("reset " + map.getMapTypeId())
+        }
 
-    /**
-     * Currently, this will apply visibility to ALL mappable items, even if they're on a different map.
-     */
-    static handleZoom() {
-        if (TP_Mappable.items.length > 1) { // Don't hide details on Single pages
-            for (const ii in TP_Mappable.items) {
-                TP_Mappable.items[ii].applyVisibilityToConnectedElements();
+        /**
+         * Currently, this will apply visibility to ALL mappable items, even if they're on a different map.
+         */
+        static handleZoom() {
+            if (TP_Mappable.items.length > 1) { // Don't hide details on Single pages
+                for (const ii in TP_Mappable.items) {
+                    TP_Mappable.items[ii].applyVisibilityToConnectedElements();
+                }
+                TP_Mappable.updateFilterWarnings();
             }
-            TP_Mappable.updateFilterWarnings();
         }
-    }
 
-    static updateFilterWarnings() {
-        let elts = document.getElementsByClassName("TouchPointWP-map-warning-visibleOnly"),
-            includesBoth = TP_Mappable.mapIncludesVisibleItemsWhichAreBothInAndOutOfBounds;
-        for (const ei in elts) {
-            if (!elts.hasOwnProperty(ei))
-                continue;
-            elts[ei].style.display = (TP_Mappable.mapExcludesSomeVisibleMarkers && !includesBoth) ? "" : "none";
-        }
+        static updateFilterWarnings() {
+            let elts = document.getElementsByClassName("TouchPointWP-map-warning-visibleOnly"),
+                includesBoth = TP_Mappable.mapIncludesVisibleItemsWhichAreBothInAndOutOfBounds;
+            for (const ei in elts) {
+                if (!elts.hasOwnProperty(ei))
+                    continue;
+                elts[ei].style.display = (TP_Mappable.mapExcludesSomeVisibleMarkers && !includesBoth) ? "" : "none";
+            }
 
-        elts = document.getElementsByClassName("TouchPointWP-map-warning-visibleAndInvisible");
-        for (const ei in elts) {
-            if (!elts.hasOwnProperty(ei))
-                continue;
-            elts[ei].style.display = includesBoth ? "" : "none";
-        }
+            elts = document.getElementsByClassName("TouchPointWP-map-warning-visibleAndInvisible");
+            for (const ei in elts) {
+                if (!elts.hasOwnProperty(ei))
+                    continue;
+                elts[ei].style.display = includesBoth ? "" : "none";
+            }
 
-        elts = document.getElementsByClassName("TouchPointWP-map-warning-zoomOrReset");
-        for (const ei in elts) {
-            if (!elts.hasOwnProperty(ei))
-                continue;
-            elts[ei].style.display = TP_Mappable.mapExcludesSomeVisibleMarkers ? "" : "none";
+            elts = document.getElementsByClassName("TouchPointWP-map-warning-zoomOrReset");
+            for (const ei in elts) {
+                if (!elts.hasOwnProperty(ei))
+                    continue;
+                elts[ei].style.display = TP_Mappable.mapExcludesSomeVisibleMarkers ? "" : "none";
+            }
         }
-    }
 
-    updateMarkerLabels() {
-        for (const mi in this.markers) {
-            this.markers[mi].updateLabel();
+        updateMarkerLabels() {
+            for (const mi in this.markers) {
+                this.markers[mi].updateLabel();
+            }
         }
-    }
 
-    // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
-    showOnMapAction() {
-        tpvm._utils.ga('send', 'event', this.itemTypeName, 'showOnMap btn click', this.name);
+        // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
+        showOnMapAction() {
+            tpvm._utils.ga('send', 'event', this.itemTypeName, 'showOnMap btn click', this.name);
+
+            tpvm._utils.applyHashForAction("showOnMap", this);
+
+            // One marker (probably typical)
+            if (this.markers.length === 1) {
+                let mp = this.markers[0].gMkr.getMap(),
+                    el = mp.getDiv(),
+                    rect = el.getBoundingClientRect(),
+                    viewHeight = Math.max(document.documentElement.clientHeight, window.innerHeight),
+                    mpWithinView = !(rect.bottom < 0 || rect.top - viewHeight >= 0);
+                TP_MapMarker.smoothZoom(mp, this.markers[0].gMkr.getPosition()).then(() => 1);
+                if (!mpWithinView) {
+                    window.scroll({
+                        top: rect.top,
+                        left: rect.left,
+                        behavior: 'smooth'
+                    })
+                }
+                return;
+            }
 
-        tpvm._utils.applyHashForAction("showOnMap", this);
+            // No Markers
+            if (this.markers.length === 0) {
+                console.warn("\"Show on Map\" was called on a Mappable item that doesn't have markers.")
+                return;
+            }
 
-        // One marker (probably typical)
-        if (this.markers.length === 1) {
-            let mp = this.markers[0].gMkr.getMap(),
-                el = mp.getDiv(),
-                rect = el.getBoundingClientRect(),
-                viewHeight = Math.max(document.documentElement.clientHeight, window.innerHeight),
-                mpWithinView = !(rect.bottom < 0 || rect.top - viewHeight >= 0);
-            TP_MapMarker.smoothZoom(mp, this.markers[0].gMkr.getPosition()).then(() => 1);
-            if (!mpWithinView) {
-                window.scroll({
-                    top: rect.top,
-                    left: rect.left,
-                    behavior: 'smooth'
-                })
+            // More than one marker
+            console.warn("\"Show on Map\" for Mappable items with multiple markers is not fully supported.")
+            // Hide all non-matching markers.  There isn't really a way to get them back, but that's why this isn't fully supported.
+            for (const mi in TP_Mappable.markers) {
+                for (const ii in TP_Mappable.markers[mi].items) {
+                    TP_Mappable.markers[mi].items[ii].toggleVisibility(TP_Mappable.markers[mi].items[ii] === this);
+                }
             }
-            return;
         }
 
-        // No Markers
-        if (this.markers.length === 0) {
-            console.warn("\"Show on Map\" was called on a Mappable item that doesn't have markers.")
-            return;
+        get itemTypeName() {
+            return this.constructor.name;
         }
 
-        // More than one marker
-        console.warn("\"Show on Map\" for Mappable items with multiple markers is not fully supported.")
-        // Hide all non-matching markers.  There isn't really a way to get them back, but that's why this isn't fully supported.
-        for (const mi in TP_Mappable.markers) {
-            for (const ii in TP_Mappable.markers[mi].items) {
-                TP_Mappable.markers[mi].items[ii].toggleVisibility(TP_Mappable.markers[mi].items[ii] === this);
-            }
+        get visible() {
+            return this._visible && (this.markers.some((m) => m.visible) || this.markers.length === 0);
         }
-    }
-
-    get itemTypeName() {
-        return this.constructor.name;
-    }
 
-    get visible() {
-        return this._visible && (this.markers.some((m) => m.visible) || this.markers.length === 0);
-    }
-
-    get inBounds() {
-        return this.markers.some((m) => m.inBounds);
-    }
-
-    static get mapExcludesSomeVisibleMarkers() {
-        return this.markers.some((m) => m.visible && !m.inBounds);
-    }
+        get inBounds() {
+            return this.markers.some((m) => m.inBounds);
+        }
 
-    static get mapIncludesVisibleItemsWhichAreBothInAndOutOfBounds() {
-        return this.items.some((i) => i.visible && i.markers.some((mk) => mk.inBounds) && i.markers.some((mk) => !mk.inBounds))
-    }
+        static get mapExcludesSomeVisibleMarkers() {
+            return this.markers.some((m) => m.visible && !m.inBounds);
+        }
 
-    get useIcon() {
-        return false;
-    }
+        static get mapIncludesVisibleItemsWhichAreBothInAndOutOfBounds() {
+            return this.items.some((i) => i.visible && i.markers.some((mk) => mk.inBounds) && i.markers.some((mk) => !mk.inBounds))
+        }
 
-    get highlightable() {
-        return true;
-    }
+        get useIcon() {
+            return false;
+        }
 
-    toggleVisibility(vis = null) {
-        if (vis === null) {
-            this._visible = !this._visible
-        } else {
-            this._visible = !!vis;
+        get highlightable() {
+            return true;
         }
 
-        this._visible = vis;
-        this.updateMarkerLabels();
+        toggleVisibility(vis = null) {
+            if (vis === null) {
+                this._visible = !this._visible
+            } else {
+                this._visible = !!vis;
+            }
 
-        this.applyVisibilityToConnectedElements();
+            this._visible = vis;
+            this.updateMarkerLabels();
 
-        return this._visible;
-    }
+            this.applyVisibilityToConnectedElements();
 
-    get connectedElements() {
-        const clsName = this.constructor.name.toLowerCase().replace("_", "-");
-        const sPath = '[data-' + clsName + '="' + this.post_id + '"]'
-        return document.querySelectorAll(sPath);
-    }
+            return this._visible;
+        }
 
-    applyVisibilityToConnectedElements() {
-        let elts = this.connectedElements;
-        for (const ei in elts) {
-            if (!elts.hasOwnProperty(ei))
-                continue;
-            elts[ei].style.display = (this.visible && (this.inBounds || !TP_Mappable.mapExcludesSomeVisibleMarkers)) ? "" : "none";
+        get connectedElements() {
+            const clsName = this.constructor.name.toLowerCase().replace("_", "-");
+            const sPath = '[data-' + clsName + '="' + this.post_id + '"]'
+            return document.querySelectorAll(sPath);
         }
-    }
 
-    toggleHighlighted(hl) {
-        this.highlighted = !!hl;
+        applyVisibilityToConnectedElements() {
+            let elts = this.connectedElements;
+            for (const ei in elts) {
+                if (!elts.hasOwnProperty(ei))
+                    continue;
+                elts[ei].style.display = (this.visible && (this.inBounds || !TP_Mappable.mapExcludesSomeVisibleMarkers)) ? "" : "none";
+            }
+        }
+
+        toggleHighlighted(hl) {
+            this.highlighted = !!hl;
 
-        if (!this.highlightable)
-            this.highlighted = false;
+            if (!this.highlightable)
+                this.highlighted = false;
 
-        if (this.highlighted) {
-            let item = this;
-            for (let mi in this.markers) {
-                const mk = item.markers[mi];
-                if (TP_Mappable.items.length > 1) {
-                    if (mk.gMkr.getAnimation() !== google.maps.Animation.BOUNCE) {
-                        mk.gMkr.setAnimation(google.maps.Animation.BOUNCE);
+            if (this.highlighted) {
+                let item = this;
+                for (let mi in this.markers) {
+                    const mk = item.markers[mi];
+                    if (TP_Mappable.items.length > 1) {
+                        if (mk.gMkr.getAnimation() !== google.maps.Animation.BOUNCE) {
+                            mk.gMkr.setAnimation(google.maps.Animation.BOUNCE);
+                        }
                     }
+                    mk.updateLabel(this.highlighted)
                 }
-                mk.updateLabel(this.highlighted)
-            }
-        } else {
-            for (const mi in this.markers) {
-                let mk = this.markers[mi];
-                if (mk.gMkr.getAnimation() !== null) {
-                    mk.gMkr.setAnimation(null)
+            } else {
+                for (const mi in this.markers) {
+                    let mk = this.markers[mi];
+                    if (mk.gMkr.getAnimation() !== null) {
+                        mk.gMkr.setAnimation(null)
+                    }
+                    mk.updateLabel(this.highlighted)
                 }
-                mk.updateLabel(this.highlighted)
             }
         }
     }
-}
+    tpvm.TP_Mappable = TP_Mappable;
 
-class TP_Involvement extends TP_Mappable {
-    invId = "";
-    invType = "involvement"; // overwritten by constructor
+    class TP_Involvement extends tpvm.TP_Mappable {
+        invId = "";
+        invType = "involvement"; // overwritten by constructor
 
-    attributes = {};
+        attributes = {};
 
-    static currentFilters = {};
+        static currentFilters = {};
 
-    static actions = ['join', 'contact'];
+        static actions = ['join', 'contact'];
 
-    constructor(obj) {
-        super(obj, obj.invId);
+        constructor(obj) {
+            super(obj, obj.invId);
 
-        this.invId = obj.invId;
-        this.invType = obj.invType;
+            this.invId = obj.invId;
+            this.invType = obj.invType;
 
-        this.attributes = obj.attributes ?? null;
+            this.attributes = obj.attributes ?? null;
 
-        tpvm.involvements[this.invId] = this;
-    }
+            tpvm.involvements[this.invId] = this;
+        }
 
-    get id() {
-        return parseInt(this._id);
-    }
+        get id() {
+            return parseInt(this._id);
+        }
 
-    get shortClass() {
-        return "i";
-    }
+        get shortClass() {
+            return "i";
+        }
 
-    // noinspection JSUnusedGlobalSymbols  Used via dynamic instantiation.
-    static fromObjArray(invArr) {
-        let ret = [];
-        for (const i in invArr) {
-            if (!invArr.hasOwnProperty(i)) continue;
+        // noinspection JSUnusedGlobalSymbols  Used via dynamic instantiation.
+        static fromObjArray(invArr) {
+            let ret = [];
+            for (const i in invArr) {
+                if (!invArr.hasOwnProperty(i)) continue;
 
-            if (typeof invArr[i].invId === "undefined") {
-                continue;
+                if (typeof invArr[i].invId === "undefined") {
+                    continue;
+                }
+
+                if (typeof tpvm.involvements[invArr[i].invId] === "undefined") {
+                    ret.push(new this(invArr[i]));
+                } else {
+                    ret.push(tpvm.involvements[invArr[i].invId]);
+                }
             }
+            tpvm.trigger("Involvement_fromObjArray");
+            return ret;
+        };
 
-            if (typeof tpvm.involvements[invArr[i].invId] === "undefined") {
-                ret.push(new this(invArr[i]));
-            } else {
-                ret.push(tpvm.involvements[invArr[i].invId]);
+        // noinspection JSUnusedGlobalSymbols  Called by inline.
+        static initFilters() {
+            const filtOptions = document.querySelectorAll("[data-involvement-filter]");
+            for (const ei in filtOptions) {
+                if (!filtOptions.hasOwnProperty(ei)) continue;
+                filtOptions[ei].addEventListener('change', this.applyFilters.bind(this, "Involvement"))
             }
         }
-        tpvm.trigger("Involvement_fromObjArray");
-        return ret;
-    };
 
-    // noinspection JSUnusedGlobalSymbols  Called by inline.
-    static initFilters() {
-        const filtOptions = document.querySelectorAll("[data-involvement-filter]");
-        for (const ei in filtOptions) {
-            if (!filtOptions.hasOwnProperty(ei)) continue;
-            filtOptions[ei].addEventListener('change', this.applyFilters.bind(this, "Involvement"))
+        static applyFilters(invType, ev = null) {
+            if (ev !== null) {
+                let attr = ev.target.getAttribute("data-involvement-filter"),
+                    val = ev.target.value;
+                if (attr !== null) {
+                    if (val === "") {
+                        delete this.currentFilters[attr];
+                    } else {
+                        this.currentFilters[attr] = val;
+                    }
+                }
+            }
+
+            groupLoop:
+                for (const ii in tpvm.involvements) {
+                    if (!tpvm.involvements.hasOwnProperty(ii)) continue;
+                    const group = tpvm.involvements[ii];
+                    for (const ai in this.currentFilters) {
+                        if (!this.currentFilters.hasOwnProperty(ai)) continue;
+
+                        if (!group.attributes.hasOwnProperty(ai) ||
+                            group.attributes[ai] === null ||
+                            (!Array.isArray(group.attributes[ai]) &&
+                                group.attributes[ai].slug !== this.currentFilters[ai] &&
+                                group.attributes[ai] !== this.currentFilters[ai]
+                            ) || (
+                                Array.isArray(group.attributes[ai]) &&
+                                group.attributes[ai].find(a => a.slug === this.currentFilters[ai]) === undefined
+                            )
+                        ) {
+                            group.toggleVisibility(false)
+                            continue groupLoop;
+                        }
+                    }
+                    group.toggleVisibility(true)
+                }
+            TP_Mappable.updateFilterWarnings();
         }
-    }
 
-    static applyFilters(invType, ev = null) {
-        if (ev !== null) {
-            let attr = ev.target.getAttribute("data-involvement-filter"),
-                val = ev.target.value;
-            if (attr !== null) {
-                if (val === "") {
-                    delete this.currentFilters[attr];
-                } else {
-                    this.currentFilters[attr] = val;
+        static init() {
+            tpvm.trigger('Involvement_class_loaded');
+        }
+
+        async doJoin(people, showConfirm = true) {
+            let inv = this;
+            showConfirm = !!showConfirm;
+
+            tpvm._utils.ga('send', 'event', inv.invType, 'join complete', inv.name);
+
+            let res = await tpvm.postData('inv/join', {invId: inv.invId, people: people, invType: inv.invType});
+            if (res.success.length > 0) {
+                if (showConfirm) {
+                    Swal.fire({
+                        icon: 'success',
+                        // translators: %s is the name of an involvement, like a particular small group
+                        title: sprintf(__('Added to %s', 'TouchPoint-WP'), inv.name),
+                        timer: 3000,
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        confirmButtonText: __('OK', 'TouchPoint-WP')
+                    });
+                }
+            } else {
+                console.error(res);
+                if (showConfirm) {
+                    Swal.fire({
+                        icon: 'error',
+                        title: __('Something strange happened.', 'TouchPoint-WP'),
+                        timer: 3000,
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        confirmButtonText: __('OK', 'TouchPoint-WP')
+                    });
                 }
             }
         }
 
-        groupLoop:
-            for (const ii in tpvm.involvements) {
-                if (!tpvm.involvements.hasOwnProperty(ii)) continue;
-                const group = tpvm.involvements[ii];
-                for (const ai in this.currentFilters) {
-                    if (!this.currentFilters.hasOwnProperty(ai)) continue;
-
-                    if (!group.attributes.hasOwnProperty(ai) ||
-                        group.attributes[ai] === null ||
-                        (   !Array.isArray(group.attributes[ai]) &&
-                            group.attributes[ai].slug !== this.currentFilters[ai] &&
-                            group.attributes[ai] !== this.currentFilters[ai]
-                        ) || (
-                            Array.isArray(group.attributes[ai]) &&
-                            group.attributes[ai].find(a => a.slug === this.currentFilters[ai]) === undefined
-                        )
-                    ) {
-                        group.toggleVisibility(false)
-                        continue groupLoop;
-                    }
+        async doInvContact(fromPerson, message, showConfirm = true) {
+            let inv = this;
+            showConfirm = !!showConfirm;
+
+            tpvm._utils.ga('send', 'event', inv.invType, 'contact complete', inv.name);
+
+            let res = await tpvm.postData('inv/contact', {
+                invId: inv.invId,
+                fromPerson: fromPerson,
+                message: message,
+                invType: inv.invType,
+                fromEmail: tpvm.userEmail
+            });
+            if (res.success.length > 0) {
+                if (showConfirm) {
+                    Swal.fire({
+                        icon: 'success',
+                        title: __('Your message has been sent.', 'TouchPoint-WP'),
+                        timer: 3000,
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        confirmButtonText: __('OK', 'TouchPoint-WP')
+                    });
+                }
+            } else {
+                console.error(res);
+                if (showConfirm) {
+                    Swal.fire({
+                        icon: 'error',
+                        title: __('Something strange happened.', 'TouchPoint-WP'),
+                        timer: 3000,
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        confirmButtonText: __('OK', 'TouchPoint-WP')
+                    });
                 }
-                group.toggleVisibility(true)
             }
-        TP_Mappable.updateFilterWarnings();
-    }
+        }
 
-    static init() {
-        tpvm.trigger('Involvement_class_loaded');
-    }
+        // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
+        joinAction() {
+            let inv = this,
+                // translators: %s is the name of an Involvement
+                title = sprintf(__('Join %s', 'TouchPoint-WP'), inv.name);
 
-    async doJoin(people, showConfirm = true) {
-        let inv = this;
-        showConfirm = !!showConfirm;
+            tpvm._utils.ga('send', 'event', inv.invType, 'join btn click', inv.name);
 
-        tpvm._utils.ga('send', 'event', inv.invType, 'join complete', inv.name);
+            tpvm._utils.applyHashForAction("join", this);
 
-        let res = await tpvm.postData('inv/join', {invId: inv.invId, people: people, invType: inv.invType});
-        if (res.success.length > 0) {
-            if (showConfirm) {
-                Swal.fire({
-                    icon: 'success',
-                    // translators: %s is the name of an involvement, like a particular small group
-                    title: sprintf(__('Added to %s', 'TouchPoint-WP'), inv.name),
-                    timer: 3000,
-                    customClass: tpvm._utils.defaultSwalClasses(),
-                    confirmButtonText: __('OK', 'TouchPoint-WP')
-                });
-            }
-        } else {
-            console.error(res);
-            if (showConfirm) {
-                Swal.fire({
-                    icon: 'error',
-                    title: __('Something strange happened.', 'TouchPoint-WP'),
-                    timer: 3000,
+            TP_Person.DoInformalAuth(title).then(
+                (res) => joinUi(inv, res).then(tpvm._utils.clearHash),
+                () => tpvm._utils.clearHash()
+            )
+
+            function joinUi(inv, people) {
+                tpvm._utils.ga('send', 'event', inv.invType, 'join userIdentified', inv.name);
+
+                return Swal.fire({
+                    title: title,
+                    html: `<p id=\"swal-tp-text\">${__('Who is joining the group?', 'TouchPoint-WP')}</p>` + TP_Person.peopleArrayToCheckboxes(people),
                     customClass: tpvm._utils.defaultSwalClasses(),
-                    confirmButtonText: __('OK', 'TouchPoint-WP')
+                    showConfirmButton: true,
+                    showCancelButton: true,
+                    confirmButtonText: __('Join', 'TouchPoint-WP'),
+                    cancelButtonText: __('Cancel', 'TouchPoint-WP'),
+                    focusConfirm: false,
+                    preConfirm: () => {
+                        let form = document.getElementById('tp_people_list_checkboxes'),
+                            inputs = form.querySelectorAll("input"),
+                            data = [];
+                        for (const ii in inputs) {
+                            if (!inputs.hasOwnProperty(ii) || !inputs[ii].checked) continue;
+                            data.push(tpvm.people[inputs[ii].value]);
+                        }
+
+                        if (data.length < 1) {
+                            let prompt = document.getElementById('swal-tp-text');
+                            prompt.innerText = __("Select who should be added to the group.", 'TouchPoint-WP');
+                            prompt.classList.add('error')
+                            return false;
+                        }
+
+                        Swal.showLoading();
+
+                        return inv.doJoin(data, true);
+                    }
                 });
             }
         }
-    }
 
-    async doInvContact(fromPerson, message, showConfirm = true) {
-        let inv = this;
-        showConfirm = !!showConfirm;
-
-        tpvm._utils.ga('send', 'event', inv.invType, 'contact complete', inv.name);
-
-        let res = await tpvm.postData('inv/contact', {
-            invId: inv.invId,
-            fromPerson: fromPerson,
-            message: message,
-            invType: inv.invType,
-            fromEmail: tpvm.userEmail
-        });
-        if (res.success.length > 0) {
-            if (showConfirm) {
-                Swal.fire({
-                    icon: 'success',
-                    title: __('Your message has been sent.', 'TouchPoint-WP'),
-                    timer: 3000,
-                    customClass: tpvm._utils.defaultSwalClasses(),
-                    confirmButtonText: __('OK', 'TouchPoint-WP')
-                });
-            }
-        } else {
-            console.error(res);
-            if (showConfirm) {
-                Swal.fire({
-                    icon: 'error',
-                    title: __('Something strange happened.', 'TouchPoint-WP'),
-                    timer: 3000,
-                    customClass: tpvm._utils.defaultSwalClasses(),
-                    confirmButtonText: __('OK', 'TouchPoint-WP')
-                });
-            }
+        get itemTypeName() {
+            return this.invType;
         }
-    }
 
-    // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
-    joinAction() {
-        let inv = this,
-            // translators: %s is the name of an Involvement
-            title = sprintf(__('Join %s', 'TouchPoint-WP'), inv.name);
-
-        tpvm._utils.ga('send', 'event', inv.invType, 'join btn click', inv.name);
-
-        tpvm._utils.applyHashForAction("join", this);
-
-        TP_Person.DoInformalAuth(title).then(
-            (res) => joinUi(inv, res).then(tpvm._utils.clearHash),
-            () => tpvm._utils.clearHash()
-        )
-
-        function joinUi(inv, people) {
-            tpvm._utils.ga('send', 'event', inv.invType, 'join userIdentified', inv.name);
-
-            return Swal.fire({
-                title: title,
-                html: `<p id=\"swal-tp-text\">${__('Who is joining the group?', 'TouchPoint-WP')}</p>` + TP_Person.peopleArrayToCheckboxes(people),
-                customClass: tpvm._utils.defaultSwalClasses(),
-                showConfirmButton: true,
-                showCancelButton: true,
-                confirmButtonText: __('Join', 'TouchPoint-WP'),
-                cancelButtonText: __('Cancel', 'TouchPoint-WP'),
-                focusConfirm: false,
-                preConfirm: () => {
-                    let form = document.getElementById('tp_people_list_checkboxes'),
-                        inputs = form.querySelectorAll("input"),
-                        data = [];
-                    for (const ii in inputs) {
-                        if (!inputs.hasOwnProperty(ii) || !inputs[ii].checked) continue;
-                        data.push(tpvm.people[inputs[ii].value]);
-                    }
+        // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
+        contactAction() {
+            let inv = this,
+                // translators: %s is the name of an involvement.  This is a heading for a modal.
+                title = sprintf(__("Contact the Leaders of %s", 'TouchPoint-WP'), inv.name);
 
-                    if (data.length < 1) {
-                        let prompt = document.getElementById('swal-tp-text');
-                        prompt.innerText = __("Select who should be added to the group.", 'TouchPoint-WP');
-                        prompt.classList.add('error')
-                        return false;
-                    }
+            tpvm._utils.ga('send', 'event', inv.invType, 'contact btn click', inv.name);
 
-                    Swal.showLoading();
+            tpvm._utils.applyHashForAction("contact", this);
 
-                    return inv.doJoin(data, true);
-                }
-            });
-        }
-    }
+            TP_Person.DoInformalAuth(title).then(
+                (res) => contactUi(inv, res).then(tpvm._utils.clearHash),
+                () => tpvm._utils.clearHash()
+            )
 
-    get itemTypeName() {
-        return this.invType;
-    }
+            function contactUi(inv, people) {
+                tpvm._utils.ga('send', 'event', inv.invType, 'contact userIdentified', inv.name);
+
+                return Swal.fire({
+                    title: title,
+                    html: '<form id="tp_inv_contact_form">' +
+                        `<div class="form-group"><label for="tp_inv_contact_fromPid">${__('From', 'TouchPoint-WP')}</label>` + TP_Person.peopleArrayToSelect(people, "tp_inv_contact_fromPid", "fromPid") + '</div>' +
+                        `<div class="form-group"><label for="tp_inv_contact_body">${__('Message', 'TouchPoint-WP')}</label><textarea name="body" id="tp_inv_contact_body"></textarea></div>` +
+                        '</form>',
+                    customClass: tpvm._utils.defaultSwalClasses(),
+                    showConfirmButton: true,
+                    showCancelButton: true,
+                    confirmButtonText: __('Send', 'TouchPoint-WP'),
+                    cancelButtonText: __('Cancel', 'TouchPoint-WP'),
+                    focusConfirm: false,
+                    preConfirm: () => {
+                        let form = document.getElementById('tp_inv_contact_form'),
+                            fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)],
+                            message = form.getElementsByTagName('textarea')[0].value;
+
+                        if (message.length < 5) {
+                            let prompt = document.getElementById('swal-tp-text');
+                            prompt.innerText = __("Please provide a message.", 'TouchPoint-WP');
+                            prompt.classList.add('error')
+                            return false;
+                        }
 
-    // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
-    contactAction() {
-        let inv = this,
-            // translators: %s is the name of an involvement.  This is a heading for a modal.
-            title = sprintf(__("Contact the Leaders of %s", 'TouchPoint-WP'), inv.name);
-
-        tpvm._utils.ga('send', 'event', inv.invType, 'contact btn click', inv.name);
-
-        tpvm._utils.applyHashForAction("contact", this);
-
-        TP_Person.DoInformalAuth(title).then(
-            (res) => contactUi(inv, res).then(tpvm._utils.clearHash),
-            () => tpvm._utils.clearHash()
-        )
-
-        function contactUi(inv, people) {
-            tpvm._utils.ga('send', 'event', inv.invType, 'contact userIdentified', inv.name);
-
-            return Swal.fire({
-                title: title,
-                html: '<form id="tp_inv_contact_form">' +
-                    `<div class="form-group"><label for="tp_inv_contact_fromPid">${__('From', 'TouchPoint-WP')}</label>` + TP_Person.peopleArrayToSelect(people, "tp_inv_contact_fromPid", "fromPid") + '</div>' +
-                    `<div class="form-group"><label for="tp_inv_contact_body">${__('Message', 'TouchPoint-WP')}</label><textarea name="body" id="tp_inv_contact_body"></textarea></div>` +
-                    '</form>',
-                customClass: tpvm._utils.defaultSwalClasses(),
-                showConfirmButton: true,
-                showCancelButton: true,
-                confirmButtonText: __('Send', 'TouchPoint-WP'),
-                cancelButtonText: __('Cancel', 'TouchPoint-WP'),
-                focusConfirm: false,
-                preConfirm: () => {
-                    let form = document.getElementById('tp_inv_contact_form'),
-                        fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)],
-                        message = form.getElementsByTagName('textarea')[0].value;
-
-                    if (message.length < 5) {
-                        let prompt = document.getElementById('swal-tp-text');
-                        prompt.innerText = __("Please provide a message.", 'TouchPoint-WP');
-                        prompt.classList.add('error')
-                        return false;
+                        Swal.showLoading();
+
+                        return inv.doInvContact(fromPerson, message, true);
                     }
+                });
+            }
+        }
 
-                    Swal.showLoading();
+        static initMap(mapDivId) {
+            let mapOptions = {
+                mapTypeId: google.maps.MapTypeId.ROADMAP,
+                linksControl: false,
+                maxZoom: 15,
+                minZoom: 2,
+                panControl: false,
+                addressControl: false,
+                enableCloseButton: false,
+                mapTypeControl: false,
+                zoomControl: false,
+                gestureHandling: 'greedy',
+                styles: [
+                    {
+                        featureType: "poi", //points of interest
+                        stylers: [
+                            {visibility: 'off'}
+                        ]
+                    },
+                    {
+                        featureType: "road",
+                        stylers: [
+                            {visibility: 'on'}
+                        ]
+                    },
+                    {
+                        featureType: "transit",
+                        stylers: [
+                            {visibility: 'on'}
+                        ]
+                    }
+                ],
+                zoom: 15,
+                center: {lat: 0, lng: 0}, // gets overwritten by bounds later.
+                streetViewControl: false,
+                fullscreenControl: false,
+                disableDefaultUI: true
+            };
 
-                    return inv.doInvContact(fromPerson, message, true);
-                }
-            });
+            super.initMap(document.getElementById(mapDivId), mapOptions, tpvm.involvements)
         }
-    }
 
-    static initMap(mapDivId) {
-        let mapOptions = {
-            mapTypeId: google.maps.MapTypeId.ROADMAP,
-            linksControl: false,
-            maxZoom: 15,
-            minZoom: 2,
-            panControl: false,
-            addressControl: false,
-            enableCloseButton: false,
-            mapTypeControl: false,
-            zoomControl: false,
-            gestureHandling: 'greedy',
-            styles: [
-                {
-                    featureType: "poi", //points of interest
-                    stylers: [
-                        {visibility: 'off'}
-                    ]
-                },
-                {
-                    featureType: "road",
-                    stylers: [
-                        {visibility: 'on'}
-                    ]
-                },
-                {
-                    featureType: "transit",
-                    stylers: [
-                        {visibility: 'on'}
-                    ]
-                }
-            ],
-            zoom: 15,
-            center: {lat: 0, lng: 0}, // gets overwritten by bounds later.
-            streetViewControl: false,
-            fullscreenControl: false,
-            disableDefaultUI: true
-        };
+        static initNearby(targetId, type, count) {
+            if (window.location.pathname.substring(0, 10) === "/wp-admin/")
+                return;
 
-        super.initMap(document.getElementById(mapDivId), mapOptions, tpvm.involvements)
-    }
+            let target = document.getElementById(targetId);
+            if (!target) // make sure element actually exists (it may not if shortcode was within a tease)
+                return;
 
-    static initNearby(targetId, type, count) {
-        if (window.location.pathname.substring(0, 10) === "/wp-admin/")
-            return;
-
-        let target = document.getElementById(targetId);
-        if (!target) // make sure element actually exists (it may not if shortcode was within a tease)
-            return;
-
-        tpvm._invNear.nearby = ko.observableArray([]);
-        tpvm._invNear.labelStr = ko.observable(__("Loading...", 'TouchPoint-WP'));
-        ko.applyBindings(tpvm._invNear, target);
-
-        // continue to next action for either success or failure.
-        TP_DataGeo.getLocation(getNearbyInvolvements, getNearbyInvolvements, 'nav');
-
-        function getNearbyInvolvements() {
-            tpvm.getData('inv/nearby', {
-                lat: TP_DataGeo.loc.lat,
-                lng: TP_DataGeo.loc.lng,
-                type: type,
-                limit: count,
-                locale: tpvm.locale
-            }).then(handleNearbyLoaded);
-        }
-
-        function handleNearbyLoaded(response) {
-            tpvm._invNear.nearby(response.invList);
-            if (response.error !== undefined) {
-                if (response.geo === false) {
-                    if (navigator.geolocation && location.protocol === 'https:') {
-                        tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP') + "<br /><a href=\"javascript:TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>");
+            tpvm._invNear.nearby = ko.observableArray([]);
+            tpvm._invNear.labelStr = ko.observable(__("Loading...", 'TouchPoint-WP'));
+            ko.applyBindings(tpvm._invNear, target);
+
+            // continue to next action for either success or failure.
+            TP_DataGeo.getLocation(getNearbyInvolvements, getNearbyInvolvements, 'nav');
+
+            function getNearbyInvolvements() {
+                tpvm.getData('inv/nearby', {
+                    lat: TP_DataGeo.loc.lat,
+                    lng: TP_DataGeo.loc.lng,
+                    type: type,
+                    limit: count,
+                    locale: tpvm.locale
+                }).then(handleNearbyLoaded);
+            }
+
+            function handleNearbyLoaded(response) {
+                tpvm._invNear.nearby(response.invList);
+                if (response.error !== undefined) {
+                    if (response.geo === false) {
+                        if (navigator.geolocation && location.protocol === 'https:') {
+                            tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP') + "<br /><a href=\"javascript:TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>");
+                        } else {
+                            tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP'));
+                        }
                     } else {
-                        tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP'));
+                        tpvm._invNear.labelStr(response.error);
                     }
+                } else if (response.geo?.human !== undefined) {
+                    let label = response.geo.human;
+                    if (response.geo.type === "ip" && navigator.geolocation && location.protocol === 'https:') {
+                        label += "<br /><a href=\"javascript:TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>";
+                    }
+                    tpvm._invNear.labelStr(label);
                 } else {
-                    tpvm._invNear.labelStr(response.error);
-                }
-            } else if (response.geo?.human !== undefined) {
-                let label = response.geo.human;
-                if (response.geo.type === "ip" && navigator.geolocation && location.protocol === 'https:') {
-                    label += "<br /><a href=\"javascript:TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>";
+                    tpvm._invNear.labelStr(__("Your Location", 'TouchPoint-WP'));
                 }
-                tpvm._invNear.labelStr(label);
-            } else {
-                tpvm._invNear.labelStr(__("Your Location", 'TouchPoint-WP'));
+                setTimeout(getNearbyInvolvements, 600000); // 10 minutes
             }
-            setTimeout(getNearbyInvolvements, 600000); // 10 minutes
         }
     }
-}
-TP_Involvement.init();
+    tpvm.TP_Involvement = TP_Involvement;
+    TP_Involvement.init();
 
-class TP_Person {
-    peopleId;
-    familyId;
-    displayName;
+    class TP_Person {
+        peopleId;
+        familyId;
+        displayName;
 
-    static actions = ['join', 'contact'];
+        static actions = ['join', 'contact'];
 
-    constructor(peopleId) {
-        peopleId = Number(peopleId);
-        this.peopleId = peopleId;
+        constructor(peopleId) {
+            peopleId = Number(peopleId);
+            this.peopleId = peopleId;
 
-        for (const ei in this.connectedElements) {
-            if (!this.connectedElements.hasOwnProperty(ei)) continue;
+            for (const ei in this.connectedElements) {
+                if (!this.connectedElements.hasOwnProperty(ei)) continue;
 
-            let psn = this;
+                let psn = this;
 
-            let actionBtns = this.connectedElements[ei].querySelectorAll('[data-tp-action]')
-            for (const ai in actionBtns) {
-                if (!actionBtns.hasOwnProperty(ai)) continue;
-                const action = actionBtns[ai].getAttribute('data-tp-action');
-                if (TP_Person.actions.includes(action)) {
-                    tpvm._utils.registerAction(action, psn)
-                    actionBtns[ai].addEventListener('click', function (e) {
-                        e.stopPropagation();
-                        psn[action + "Action"]();
-                    });
+                let actionBtns = this.connectedElements[ei].querySelectorAll('[data-tp-action]')
+                for (const ai in actionBtns) {
+                    if (!actionBtns.hasOwnProperty(ai)) continue;
+                    const action = actionBtns[ai].getAttribute('data-tp-action');
+                    if (TP_Person.actions.includes(action)) {
+                        tpvm._utils.registerAction(action, psn)
+                        actionBtns[ai].addEventListener('click', function (e) {
+                            e.stopPropagation();
+                            psn[action + "Action"]();
+                        });
+                    }
                 }
             }
+
+            tpvm.people[peopleId] = this;
         }
 
-        tpvm.people[peopleId] = this;
-    }
+        /**
+         * Returns the ID used for instances in tpvm.  Must be implemented by extenders if not the post_id.
+         *
+         * @return {int}
+         */
+        get id() {
+            return this.peopleId;
+        }
 
-    /**
-     * Returns the ID used for instances in tpvm.  Must be implemented by extenders if not the post_id.
-     *
-     * @return {int}
-     */
-    get id() {
-        return this.peopleId;
-    }
+        get shortClass() {
+            return "p";
+        }
 
-    get shortClass() {
-        return "p";
-    }
+        static fromObj(obj) {
+            let person;
+            if (tpvm.people[obj.peopleId] !== undefined) {
+                person = tpvm.people[obj.peopleId]
+            } else {
+                person = new TP_Person(obj.peopleId);
+            }
+            for (const a in obj) {
+                if (!obj.hasOwnProperty(a) || a === 'peopleId') continue;
 
-    static fromObj(obj) {
-        let person;
-        if (tpvm.people[obj.peopleId] !== undefined) {
-            person = tpvm.people[obj.peopleId]
-        } else {
-            person = new TP_Person(obj.peopleId);
+                person[a] = obj[a];
+            }
+            return person;
         }
-        for (const a in obj) {
-            if (!obj.hasOwnProperty(a) || a === 'peopleId') continue;
 
-            person[a] = obj[a];
-        }
-        return person;
-    }
+        static fromObjArray(peopleArray) {
+            let ret = [];
 
-    static fromObjArray(peopleArray) {
-        let ret = [];
+            for (const pi in peopleArray) {
+                if (!peopleArray.hasOwnProperty(pi)) continue;
+                ret.push(tpvm.TP_Person.fromObj(peopleArray[pi]));
+            }
+            tpvm.trigger("Person_fromObjArray");
 
-        for (const pi in peopleArray) {
-            if (!peopleArray.hasOwnProperty(pi)) continue;
-            ret.push(TP_Person.fromObj(peopleArray[pi]));
+            return ret;
         }
-        tpvm.trigger("Person_fromObjArray");
 
-        return ret;
-    }
+        // noinspection JSUnusedGlobalSymbols  Called in Person.php
+        static identByFamily(primaryFamIds = [], secondaryFamIds = []) {
+            tpvm._plausibleUsers = Object.entries(tpvm.people).filter(([, p]) => primaryFamIds.indexOf(p.familyId) > -1).map(([, p]) => p);
+            tpvm._secondaryUsers = Object.entries(tpvm.people).filter(([, p]) => secondaryFamIds.indexOf(p.familyId) > -1).map(([, p]) => p);
+        }
 
-    // noinspection JSUnusedGlobalSymbols  Called in Person.php
-    static identByFamily(primaryFamIds = [], secondaryFamIds = []) {
-        tpvm._plausibleUsers = Object.entries(tpvm.people).filter(([,p]) => primaryFamIds.indexOf(p.familyId) > -1).map(([,p]) => p);
-        tpvm._secondaryUsers = Object.entries(tpvm.people).filter(([,p]) => secondaryFamIds.indexOf(p.familyId) > -1).map(([,p]) => p);
-    }
+        static init() {
+            tpvm.trigger('Person_class_loaded');
+        }
 
-    static init() {
-        tpvm.trigger('Person_class_loaded');
-    }
+        get connectedElements() {
+            const sPath = '[data-tp-person="' + this.peopleId + '"]'
+            return document.querySelectorAll(sPath);
+        }
 
-    get connectedElements() {
-        const sPath = '[data-tp-person="' + this.peopleId + '"]'
-        return document.querySelectorAll(sPath);
-    }
+        static mergePeopleArrays(a, b) {
+            return [...new Set([...a, ...b])]
+        }
 
-    static mergePeopleArrays(a, b) {
-        return [...new Set([...a, ...b])]
-    }
+        /**
+         * Take an array of TP_Person objects and make a list of checkboxes out of them.
+         *
+         * @param array TP_Person[]
+         */
+        static peopleArrayToCheckboxes(array) {
+            let out = "<form id=\"tp_people_list_checkboxes\"><table class=\"tp-checkbox-list\"><tbody>"
 
-    /**
-     * Take an array of TP_Person objects and make a list of checkboxes out of them.
-     *
-     * @param array TP_Person[]
-     */
-    static peopleArrayToCheckboxes(array) {
-        let out = "<form id=\"tp_people_list_checkboxes\"><table class=\"tp-checkbox-list\"><tbody>"
+            for (const pi in array) {
+                if (!array.hasOwnProperty(pi)) continue;
+                let p = array[pi];
 
-        for (const pi in array) {
-            if (!array.hasOwnProperty(pi)) continue;
-            let p = array[pi];
+                out += '<tr><td><input type="checkbox" name="people[]" id="tp_people_list_checks_' + p.peopleId + '" value="' + p.peopleId + '" required /></td>'
+                out += '<td><label for="tp_people_list_checks_' + p.peopleId + '">' + p.goesBy + ' ' + p.lastName + '</label></td></tr>'
+            }
 
-            out += '<tr><td><input type="checkbox" name="people[]" id="tp_people_list_checks_' + p.peopleId + '" value="' + p.peopleId + '" required /></td>'
-            out += '<td><label for="tp_people_list_checks_' + p.peopleId + '">' + p.goesBy + ' ' + p.lastName + '</label></td></tr>'
+            return out + "</tbody></table></form>"
         }
 
-        return out + "</tbody></table></form>"
-    }
+        /**
+         * Take an array of TP_Person objects and make a list of radio buttons out of them.
+         *
+         * @param options object - an object that is a key-value map of data-value: translated-label
+         * @param array TP_Person[]
+         * @param secondaryArray TP_Person[]
+         */
+        static peopleArrayToRadio(options, array, secondaryArray = null) {
+            let out = "<form id=\"tp_people_list_radio\"><table class=\"tp-radio-list\"><thead>"
 
-    /**
-     * Take an array of TP_Person objects and make a list of radio buttons out of them.
-     *
-     * @param options object - an object that is a key-value map of data-value: translated-label
-     * @param array TP_Person[]
-     * @param secondaryArray TP_Person[]
-     */
-    static peopleArrayToRadio(options, array, secondaryArray = null) {
-        let out = "<form id=\"tp_people_list_radio\"><table class=\"tp-radio-list\"><thead>"
-
-        // headers
-        out += "<tr>";
-        for (const oi in options) {
-            if (!options.hasOwnProperty(oi)) continue;
-            out += `<th>${options[oi]}</th>`
-        }
-        out += `<th colspan="2"></th></tr></thead><tbody>`;
-
-        // people -- primary array
-        for (const pi in array) {
-            if (!array.hasOwnProperty(pi)) continue;
-            let p = array[pi];
-
-            out += '<tr>'
+            // headers
+            out += "<tr>";
             for (const oi in options) {
                 if (!options.hasOwnProperty(oi)) continue;
-                out += `<td><input type="radio" name="${p.peopleId}" id="tp_people_list_checks_${p.peopleId}_${oi}" value="${oi}" /></td>`
+                out += `<th>${options[oi]}</th>`
             }
-            out += `<td><a href="#" class="swal-tp-clear-item" onclick="TP_Person.clearRadio('${p.peopleId}'); return false;">${__('clear', 'TouchPoint-WP')}</a></td>`
-            out += `<td style="text-align:left; width:50%;">${p.goesBy} ${p.lastName}</td></tr>`
-        }
+            out += `<th colspan="2"></th></tr></thead><tbody>`;
 
-        // people -- secondary array
-        if (secondaryArray !== null && secondaryArray.length > 0) {
-            out += `</tbody><tbody id="tp_people_list_othersOption" onclick="document.getElementById('tp_people_list_others').style.display = ''; document.getElementById('tp_people_list_othersOption').style.display = 'none';"><tr><th colspan="${Object.keys(options).length + 2}"><a>${__('Other Relatives...', 'TouchPoint-WP')}</a></th></tr>`;
-            out += `</tbody><tbody id="tp_people_list_others" style="display:none;">`;
-            for (const pi in secondaryArray) {
-                if (!secondaryArray.hasOwnProperty(pi)) continue;
-                let p = secondaryArray[pi];
+            // people -- primary array
+            for (const pi in array) {
+                if (!array.hasOwnProperty(pi)) continue;
+                let p = array[pi];
 
                 out += '<tr>'
                 for (const oi in options) {
                     if (!options.hasOwnProperty(oi)) continue;
                     out += `<td><input type="radio" name="${p.peopleId}" id="tp_people_list_checks_${p.peopleId}_${oi}" value="${oi}" /></td>`
                 }
-                out += `<td><a href="#" class="swal-tp-clear-item" onclick="TP_Person.clearRadio('${p.peopleId}'); return false;">${__('clear', 'TouchPoint-WP')}</a></td>`;
-                out += `<td style="text-align:left; width:50%;">${p.goesBy} ${p.lastName}</td></tr>`;
+                out += `<td><a href="#" class="swal-tp-clear-item" onclick="TP_Person.clearRadio('${p.peopleId}'); return false;">${__('clear', 'TouchPoint-WP')}</a></td>`
+                out += `<td style="text-align:left; width:50%;">${p.goesBy} ${p.lastName}</td></tr>`
             }
-        }
-
-        return out + "</tbody></table></form>"
-    }
 
-    static clearRadio(name) {
-        let elts = document.getElementsByName(name);
-        for (const ei in elts) {
-            if (!elts.hasOwnProperty(ei)) continue;
-            elts[ei].checked = false;
-        }
-    }
-
-    // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
-    contactAction() {
-        let psn = this,
-            // translators: %s is a person's name.  This is a heading for a contact modal.
-            title = sprintf(__('Contact %s', 'TouchPoint-WP'), psn.displayName);
-
-        tpvm._utils.ga('send', 'event', 'Person', 'contact btn click', psn.peopleId);
-
-        tpvm._utils.applyHashForAction("contact", this);
-
-        TP_Person.DoInformalAuth(title).then(
-            (res) => contactUi(psn, res).then(tpvm._utils.clearHash),
-            () => tpvm._utils.clearHash()
-        )
-
-        function contactUi(psn, people) {
-            tpvm._utils.ga('send', 'event', 'Person', 'contact userIdentified', psn.peopleId);
-
-            return Swal.fire({
-                title: title,
-                html: '<form id="tp_person_contact_form">' +
-                    `<div class="form-group"><label for="tp_person_contact_fromPid">${__('From', 'TouchPoint-WP')}</label>` + TP_Person.peopleArrayToSelect(people, "tp_person_contact_fromPid", "fromPid") + '</div>' +
-                    `<div class="form-group"><label for="tp_person_contact_body">${__('Message', 'TouchPoint-WP')}</label><textarea name="body" id="tp_person_contact_body"></textarea></div>` +
-                    '</form>',
-                customClass: tpvm._utils.defaultSwalClasses(),
-                showConfirmButton: true,
-                showCancelButton: true,
-                confirmButtonText: __('Send', 'TouchPoint-WP'),
-                cancelButtonText: __('Cancel', 'TouchPoint-WP'),
-                focusConfirm: false,
-                preConfirm: () => {
-                    let form = document.getElementById('tp_person_contact_form'),
-                        fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)],
-                        message = form.getElementsByTagName('textarea')[0].value;
-
-                    if (message.length < 5) {
-                        let prompt = document.getElementById('swal2-title');
-                        prompt.innerText = __("Please provide a message.", 'TouchPoint-WP');
-                        prompt.classList.add('error')
-                        return false;
+            // people -- secondary array
+            if (secondaryArray !== null && secondaryArray.length > 0) {
+                out += `</tbody><tbody id="tp_people_list_othersOption" onclick="document.getElementById('tp_people_list_others').style.display = ''; document.getElementById('tp_people_list_othersOption').style.display = 'none';"><tr><th colspan="${Object.keys(options).length + 2}"><a>${__('Other Relatives...', 'TouchPoint-WP')}</a></th></tr>`;
+                out += `</tbody><tbody id="tp_people_list_others" style="display:none;">`;
+                for (const pi in secondaryArray) {
+                    if (!secondaryArray.hasOwnProperty(pi)) continue;
+                    let p = secondaryArray[pi];
+
+                    out += '<tr>'
+                    for (const oi in options) {
+                        if (!options.hasOwnProperty(oi)) continue;
+                        out += `<td><input type="radio" name="${p.peopleId}" id="tp_people_list_checks_${p.peopleId}_${oi}" value="${oi}" /></td>`
                     }
-
-                    Swal.showLoading();
-
-                    return psn.doPersonContact(fromPerson, message, true);
+                    out += `<td><a href="#" class="swal-tp-clear-item" onclick="TP_Person.clearRadio('${p.peopleId}'); return false;">${__('clear', 'TouchPoint-WP')}</a></td>`;
+                    out += `<td style="text-align:left; width:50%;">${p.goesBy} ${p.lastName}</td></tr>`;
                 }
-            });
+            }
+
+            return out + "</tbody></table></form>"
         }
-    }
 
-    async doPersonContact(fromPerson, message, showConfirm = true) {
-        let psn = this;
-        showConfirm = !!showConfirm;
-
-        tpvm._utils.ga('send', 'event', 'Person', 'contact complete', psn.peopleId);
-
-        let res = await tpvm.postData('person/contact', {
-            toId: psn.peopleId,
-            fromPerson: fromPerson,
-            message: message,
-            fromEmail: tpvm.userEmail
-        });
-        if (res.success.length > 0) {
-            if (showConfirm) {
-                Swal.fire({
-                    icon: 'success',
-                    title: __('Your message has been sent.', 'TouchPoint-WP'),
-                    timer: 3000,
-                    customClass: tpvm._utils.defaultSwalClasses(),
-                    confirmButtonText: __('OK', 'TouchPoint-WP')
-                });
-            }
-        } else {
-            console.error(res);
-            if (showConfirm) {
-                Swal.fire({
-                    icon: 'error',
-                    title: __('Something strange happened.', 'TouchPoint-WP'),
-                    timer: 3000,
-                    customClass: tpvm._utils.defaultSwalClasses(),
-                    confirmButtonText: __('OK', 'TouchPoint-WP')
-                });
+        static clearRadio(name) {
+            let elts = document.getElementsByName(name);
+            for (const ei in elts) {
+                if (!elts.hasOwnProperty(ei)) continue;
+                elts[ei].checked = false;
             }
         }
-    }
 
-    /**
-     *
-     * @param array TP_Person[]
-     * @param id string
-     * @param name string
-     */
-    static peopleArrayToSelect(array, id, name) {
-        let out = `<select id="${id}" name="${name}">`
+        // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
+        contactAction() {
+            let psn = this,
+                // translators: %s is a person's name.  This is a heading for a contact modal.
+                title = sprintf(__('Contact %s', 'TouchPoint-WP'), psn.displayName);
 
-        for (const pi in array) {
-            if (!array.hasOwnProperty(pi)) continue;
-            let p = array[pi];
+            tpvm._utils.ga('send', 'event', 'Person', 'contact btn click', psn.peopleId);
 
-            out += `<option value="${p.peopleId}">${p.goesBy} ${p.lastName}</option>`;
-        }
+            tpvm._utils.applyHashForAction("contact", this);
 
-        return out + "</select>"
-    }
+            TP_Person.DoInformalAuth(title).then(
+                (res) => contactUi(psn, res).then(tpvm._utils.clearHash),
+                () => tpvm._utils.clearHash()
+            )
 
-    static async DoInformalAuth(title, forceAsk = false) {
-        return new Promise(function (resolve, reject) {
-            if (tpvm._plausibleUsers.length > 0 && !forceAsk) {
-                resolve(tpvm._plausibleUsers);
-            } else {
-                Swal.fire({
-                    html: `<p id=\"swal-tp-text\">${__('Tell us about yourself.', 'TouchPoint-WP')}</p>` +
-                        '<form id="tp_ident_form">' +
-                        `<div class="form-group"><label for="tp_ident_email">${__('Email Address', 'TouchPoint-WP')}</label><input type="email" name="email" id="tp_ident_email" required /></div>` +
-                        `<div class="form-group"><label for="tp_ident_zip">${__('Zip Code', 'TouchPoint-WP')}</label><input type="text" name="zip" id="tp_ident_zip" pattern="[0-9]{5}" maxlength="5" required /></div>` +
-                        '<input type="submit" hidden style="display:none;" /></form>',
+            function contactUi(psn, people) {
+                tpvm._utils.ga('send', 'event', 'Person', 'contact userIdentified', psn.peopleId);
+
+                return Swal.fire({
+                    title: title,
+                    html: '<form id="tp_person_contact_form">' +
+                        `<div class="form-group"><label for="tp_person_contact_fromPid">${__('From', 'TouchPoint-WP')}</label>` + TP_Person.peopleArrayToSelect(people, "tp_person_contact_fromPid", "fromPid") + '</div>' +
+                        `<div class="form-group"><label for="tp_person_contact_body">${__('Message', 'TouchPoint-WP')}</label><textarea name="body" id="tp_person_contact_body"></textarea></div>` +
+                        '</form>',
                     customClass: tpvm._utils.defaultSwalClasses(),
                     showConfirmButton: true,
                     showCancelButton: true,
-                    title: title,
-                    confirmButtonText: __('Next', 'TouchPoint-WP'),
+                    confirmButtonText: __('Send', 'TouchPoint-WP'),
                     cancelButtonText: __('Cancel', 'TouchPoint-WP'),
                     focusConfirm: false,
-                    didOpen: () => {
-                        document.getElementById('tp_ident_form').addEventListener('submit', (e) => {
-                            Swal.clickConfirm();
-                            e.preventDefault();
-                        })
-                    },
-                    preConfirm: async () => {
-                        let form = document.getElementById('tp_ident_form'),
-                            inputs = form.querySelectorAll("input"),
-                            data = {};
-                        form.checkValidity()
-                        for (const ii in inputs) {
-                            if (!inputs.hasOwnProperty(ii)) continue;
-                            if (!inputs[ii].reportValidity()) {
-                                return false;
-                            }
-                            let name = inputs[ii].name.replace("tp_ident_", "");
-                            if (name.length > 0) // removes entry generated by submit input
-                                data[name] = inputs[ii].value;
+                    preConfirm: () => {
+                        let form = document.getElementById('tp_person_contact_form'),
+                            fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)],
+                            message = form.getElementsByTagName('textarea')[0].value;
+
+                        if (message.length < 5) {
+                            let prompt = document.getElementById('swal2-title');
+                            prompt.innerText = __("Please provide a message.", 'TouchPoint-WP');
+                            prompt.classList.add('error')
+                            return false;
                         }
-                        tpvm.userEmail = data['email'] ?? null;
 
                         Swal.showLoading();
 
-                        let result = await tpvm.postData('person/ident', data);
-
-                        // Handle an error if it happened.
-                        if (result.hasOwnProperty('error')) {
-                            Swal.hideLoading();
-                            Swal.update({
-                                icon: 'error',
-                                title: __("Something went wrong.", 'TouchPoint-WP'),
-                                text: result.error,
-                                timer: 3000
-                            });
-                            return false;
-                        }
+                        return psn.doPersonContact(fromPerson, message, true);
+                    }
+                });
+            }
+        }
 
-                        if (result.people.length > 0) {
-                            return result;
-                        } else {
-                            Swal.hideLoading();
-                            Swal.update({
-                                html: `<p>${__("Our system doesn't recognize you,<br />so we need a little more info.", 'TouchPoint-WP')}</p>` +
-                                    '<form id="tp_ident_form">' +
-                                    '<div class="form-group"><label for="tp_ident_email">' + __('Email Address', 'TouchPoint-WP') + '</label><input type="email" name="email" id="tp_ident_email" value="' + data.email + '" required /></div>' +
-                                    '<div class="form-group"><label for="tp_ident_zip">' + __('Zip Code', 'TouchPoint-WP') + '</label><input type="text" name="zip" id="tp_ident_zip" pattern="[0-9]{5}" maxlength="5" value="' + data.zip + '" required /></div>' +
-                                    '<div class="form-group"><label for="tp_ident_first">' + __('First Name', 'TouchPoint-WP') + '</label><input type="text" name="firstName" id="tp_ident_first" required /></div>' +
-                                    '<div class="form-group"><label for="tp_ident_last">' + __('Last Name', 'TouchPoint-WP') + '</label><input type="text" name="lastName" id="tp_ident_last" required /></div>' +
-                                    // '<div class="form-group"><label for="tp_ident_dob">' + __('Birthdate', 'TouchPoint-WP') + '</label><input type="date" name="dob" id="tp_ident_dob" /></div>' +
-                                    '<div class="form-group"><label for="tp_ident_phone">' + __('Phone', 'TouchPoint-WP') + '</label><input type="tel" name="phone" id="tp_ident_phone" /></div>' +
-                                    '<input type="submit" hidden style="display:none;" /></form>'
-                            });
+        async doPersonContact(fromPerson, message, showConfirm = true) {
+            let psn = this;
+            showConfirm = !!showConfirm;
+
+            tpvm._utils.ga('send', 'event', 'Person', 'contact complete', psn.peopleId);
+
+            let res = await tpvm.postData('person/contact', {
+                toId: psn.peopleId,
+                fromPerson: fromPerson,
+                message: message,
+                fromEmail: tpvm.userEmail
+            });
+            if (res.success.length > 0) {
+                if (showConfirm) {
+                    Swal.fire({
+                        icon: 'success',
+                        title: __('Your message has been sent.', 'TouchPoint-WP'),
+                        timer: 3000,
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        confirmButtonText: __('OK', 'TouchPoint-WP')
+                    });
+                }
+            } else {
+                console.error(res);
+                if (showConfirm) {
+                    Swal.fire({
+                        icon: 'error',
+                        title: __('Something strange happened.', 'TouchPoint-WP'),
+                        timer: 3000,
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        confirmButtonText: __('OK', 'TouchPoint-WP')
+                    });
+                }
+            }
+        }
+
+        /**
+         *
+         * @param array TP_Person[]
+         * @param id string
+         * @param name string
+         */
+        static peopleArrayToSelect(array, id, name) {
+            let out = `<select id="${id}" name="${name}">`
+
+            for (const pi in array) {
+                if (!array.hasOwnProperty(pi)) continue;
+                let p = array[pi];
+
+                out += `<option value="${p.peopleId}">${p.goesBy} ${p.lastName}</option>`;
+            }
+
+            return out + "</select>"
+        }
+
+        static async DoInformalAuth(title, forceAsk = false) {
+            return new Promise(function (resolve, reject) {
+                if (tpvm._plausibleUsers.length > 0 && !forceAsk) {
+                    resolve(tpvm._plausibleUsers);
+                } else {
+                    Swal.fire({
+                        html: `<p id=\"swal-tp-text\">${__('Tell us about yourself.', 'TouchPoint-WP')}</p>` +
+                            '<form id="tp_ident_form">' +
+                            `<div class="form-group"><label for="tp_ident_email">${__('Email Address', 'TouchPoint-WP')}</label><input type="email" name="email" id="tp_ident_email" required /></div>` +
+                            `<div class="form-group"><label for="tp_ident_zip">${__('Zip Code', 'TouchPoint-WP')}</label><input type="text" name="zip" id="tp_ident_zip" pattern="[0-9]{5}" maxlength="5" required /></div>` +
+                            '<input type="submit" hidden style="display:none;" /></form>',
+                        customClass: tpvm._utils.defaultSwalClasses(),
+                        showConfirmButton: true,
+                        showCancelButton: true,
+                        title: title,
+                        confirmButtonText: __('Next', 'TouchPoint-WP'),
+                        cancelButtonText: __('Cancel', 'TouchPoint-WP'),
+                        focusConfirm: false,
+                        didOpen: () => {
                             document.getElementById('tp_ident_form').addEventListener('submit', (e) => {
                                 Swal.clickConfirm();
                                 e.preventDefault();
-                            });
-                            return false;
+                            })
+                        },
+                        preConfirm: async () => {
+                            let form = document.getElementById('tp_ident_form'),
+                                inputs = form.querySelectorAll("input"),
+                                data = {};
+                            form.checkValidity()
+                            for (const ii in inputs) {
+                                if (!inputs.hasOwnProperty(ii)) continue;
+                                if (!inputs[ii].reportValidity()) {
+                                    return false;
+                                }
+                                let name = inputs[ii].name.replace("tp_ident_", "");
+                                if (name.length > 0) // removes entry generated by submit input
+                                    data[name] = inputs[ii].value;
+                            }
+                            tpvm.userEmail = data['email'] ?? null;
+
+                            Swal.showLoading();
+
+                            let result = await tpvm.postData('person/ident', data);
+
+                            // Handle an error if it happened.
+                            if (result.hasOwnProperty('error')) {
+                                Swal.hideLoading();
+                                Swal.update({
+                                    icon: 'error',
+                                    title: __("Something went wrong.", 'TouchPoint-WP'),
+                                    text: result.error,
+                                    timer: 3000
+                                });
+                                return false;
+                            }
+
+                            if (result.people.length > 0) {
+                                return result;
+                            } else {
+                                Swal.hideLoading();
+                                Swal.update({
+                                    html: `<p>${__("Our system doesn't recognize you,<br />so we need a little more info.", 'TouchPoint-WP')}</p>` +
+                                        '<form id="tp_ident_form">' +
+                                        '<div class="form-group"><label for="tp_ident_email">' + __('Email Address', 'TouchPoint-WP') + '</label><input type="email" name="email" id="tp_ident_email" value="' + data.email + '" required /></div>' +
+                                        '<div class="form-group"><label for="tp_ident_zip">' + __('Zip Code', 'TouchPoint-WP') + '</label><input type="text" name="zip" id="tp_ident_zip" pattern="[0-9]{5}" maxlength="5" value="' + data.zip + '" required /></div>' +
+                                        '<div class="form-group"><label for="tp_ident_first">' + __('First Name', 'TouchPoint-WP') + '</label><input type="text" name="firstName" id="tp_ident_first" required /></div>' +
+                                        '<div class="form-group"><label for="tp_ident_last">' + __('Last Name', 'TouchPoint-WP') + '</label><input type="text" name="lastName" id="tp_ident_last" required /></div>' +
+                                        // '<div class="form-group"><label for="tp_ident_dob">' + __('Birthdate', 'TouchPoint-WP') + '</label><input type="date" name="dob" id="tp_ident_dob" /></div>' +
+                                        '<div class="form-group"><label for="tp_ident_phone">' + __('Phone', 'TouchPoint-WP') + '</label><input type="tel" name="phone" id="tp_ident_phone" /></div>' +
+                                        '<input type="submit" hidden style="display:none;" /></form>'
+                                });
+                                document.getElementById('tp_ident_form').addEventListener('submit', (e) => {
+                                    Swal.clickConfirm();
+                                    e.preventDefault();
+                                });
+                                return false;
+                            }
+                        }
+                    }).then((result) => {
+                        if (result.value) {
+                            let ps = TP_Person.fromObjArray(result.value.people);
+                            tpvm._plausibleUsers = TP_Person.mergePeopleArrays(tpvm._plausibleUsers, ps.filter((p) => result.value.primaryFam.indexOf(p.familyId) > -1));
+                            tpvm._secondaryUsers = TP_Person.mergePeopleArrays(tpvm._secondaryUsers, ps.filter((p) => result.value.primaryFam.indexOf(p.familyId) === -1));
                         }
-                    }
-                }).then((result) => {
-                    if (result.value) {
-                        let ps = TP_Person.fromObjArray(result.value.people);
-                        tpvm._plausibleUsers = TP_Person.mergePeopleArrays(tpvm._plausibleUsers, ps.filter((p) => result.value.primaryFam.indexOf(p.familyId) > -1));
-                        tpvm._secondaryUsers = TP_Person.mergePeopleArrays(tpvm._secondaryUsers, ps.filter((p) => result.value.primaryFam.indexOf(p.familyId) === -1));
-                    }
 
-                    if (result.isDismissed) {
-                        reject(false);
-                    } else {
-                        resolve(tpvm._plausibleUsers);
-                    }
-                });
-            }
-        });
+                        if (result.isDismissed) {
+                            reject(false);
+                        } else {
+                            resolve(tpvm._plausibleUsers);
+                        }
+                    });
+                }
+            });
+        }
     }
-}
-TP_Person.init();
\ No newline at end of file
+    tpvm.TP_Person = TP_Person;
+    TP_Person.init();
+
+})();
\ No newline at end of file
diff --git a/assets/js/meeting-defer.js b/assets/js/meeting-defer.js
index 5e0d383a..c21c6489 100644
--- a/assets/js/meeting-defer.js
+++ b/assets/js/meeting-defer.js
@@ -22,7 +22,7 @@ class TP_Meeting {
         this.location = obj.location;
         this.capacity = obj.capacity;
 
-        this.inv = TP_Involvement.fromObjArray([{name: obj.invName, invId: obj.invId}])[0];
+        this.inv = tpvm.TP_Involvement.fromObjArray([{name: obj.invName, invId: obj.invId}])[0];
 
         for (const ei in this.connectedElements) {
             if (!this.connectedElements.hasOwnProperty(ei)) continue;
diff --git a/assets/js/partner-defer.js b/assets/js/partner-defer.js
index c9793122..f27604cf 100644
--- a/assets/js/partner-defer.js
+++ b/assets/js/partner-defer.js
@@ -1,162 +1,165 @@
 
-class TP_Partner extends TP_Mappable {
-    attributes = {};
+(function() {
+    class TP_Partner extends tpvm.TP_Mappable {
+        attributes = {};
 
-    static currentFilters = {};
+        static currentFilters = {};
 
-    static actions = [];
+        static actions = [];
 
-    constructor(obj) {
-        super(obj);
+        constructor(obj) {
+            super(obj);
 
-        this.attributes = obj.attributes ?? null;
+            this.attributes = obj.attributes ?? null;
 
-        tpvm.partners[this.post_id] = this;
-    }
+            tpvm.partners[this.post_id] = this;
+        }
 
-    get shortClass() {
-        return "gp";
-    }
+        get shortClass() {
+            return "gp";
+        }
 
-    // noinspection JSUnusedGlobalSymbols  Used via dynamic instantiation.
-    static fromObjArray(pArr) {
-        let ret = [];
-        for (const p in pArr) {
-            if (!pArr.hasOwnProperty(p)) continue;
+        // noinspection JSUnusedGlobalSymbols  Used via dynamic instantiation.
+        static fromObjArray(pArr) {
+            let ret = [];
+            for (const p in pArr) {
+                if (!pArr.hasOwnProperty(p)) continue;
 
-            let pid = 0;
-            if (typeof pArr[p].post_id !== "undefined") {
-                pid = pArr[p].post_id;
-            }
+                let pid = 0;
+                if (typeof pArr[p].post_id !== "undefined") {
+                    pid = pArr[p].post_id;
+                }
 
-            if (typeof tpvm.partners[pid] === "undefined") {
-                ret.push(new this(pArr[p]));
-            } else {
-                // Partner exists, and probably needs something added to it. (This should only happen for secure partners.)
-                if (pArr[p].geo !== undefined) {
-                    tpvm.partners[pid].geo.push(pArr[p].geo)
+                if (typeof tpvm.partners[pid] === "undefined") {
+                    ret.push(new this(pArr[p]));
+                } else {
+                    // Partner exists, and probably needs something added to it. (This should only happen for secure partners.)
+                    if (pArr[p].geo !== undefined) {
+                        tpvm.partners[pid].geo.push(pArr[p].geo)
+                    }
+                    ret.push(tpvm.partners[pid]);
                 }
-                ret.push(tpvm.partners[pid]);
             }
-        }
-        tpvm.trigger("Partner_fromObjArray");
-        return ret;
-    };
-
-    get useIcon() {
-        if (this.post_id === 0) {
-            return {
-                text: " ",
-                fontFamily: "\"Font Awesome 6 Free\", FontAwesome",
-                color: "#00000088",
-                fontSize: "90%",
-                className: "fa fa-solid fa-lock"
+            tpvm.trigger("Partner_fromObjArray");
+            return ret;
+        };
+
+        get useIcon() {
+            if (this.post_id === 0) {
+                return {
+                    text: " ",
+                    fontFamily: "\"Font Awesome 6 Free\", FontAwesome",
+                    color: "#00000088",
+                    fontSize: "90%",
+                    className: "fa fa-solid fa-lock"
+                }
             }
+            return false;
         }
-        return false;
-    }
-
-    get highlightable() {
-        return this.post_id !== 0;
-    }
 
-    // noinspection JSUnusedGlobalSymbols  Called by inline.
-    static initFilters() {
-        const filtOptions = document.querySelectorAll("[data-partner-filter]");
-        for (const ei in filtOptions) {
-            if (!filtOptions.hasOwnProperty(ei)) continue;
-            filtOptions[ei].addEventListener('change', this.applyFilters.bind(this))
+        get highlightable() {
+            return this.post_id !== 0;
         }
-    }
 
-    static applyFilters(ev = null) {
-        if (ev !== null) {
-            let attr = ev.target.getAttribute("data-partner-filter"),
-                val = ev.target.value;
-            if (attr !== null) {
-                if (val === "") {
-                    delete this.currentFilters[attr];
-                } else {
-                    this.currentFilters[attr] = val;
-                }
+        // noinspection JSUnusedGlobalSymbols  Called by inline.
+        static initFilters() {
+            const filtOptions = document.querySelectorAll("[data-partner-filter]");
+            for (const ei in filtOptions) {
+                if (!filtOptions.hasOwnProperty(ei)) continue;
+                filtOptions[ei].addEventListener('change', this.applyFilters.bind(this))
             }
         }
 
-        itemLoop:
-            for (const ii in tpvm.partners) {
-                if (!tpvm.partners.hasOwnProperty(ii)) continue;
-                const item = tpvm.partners[ii];
-                for (const ai in this.currentFilters) {
-                    if (!this.currentFilters.hasOwnProperty(ai)) continue;
-
-                    if (!item.attributes.hasOwnProperty(ai) ||
-                        item.attributes[ai] === null ||
-                        (   !Array.isArray(item.attributes[ai]) &&
-                            item.attributes[ai].slug !== this.currentFilters[ai] &&
-                            item.attributes[ai] !== this.currentFilters[ai]
-                        ) || (
-                            Array.isArray(item.attributes[ai]) &&
-                            item.attributes[ai].find(a => a.slug === this.currentFilters[ai]) === undefined
-                        )
-                    ) {
-                        item.toggleVisibility(false)
-                        continue itemLoop;
+        static applyFilters(ev = null) {
+            if (ev !== null) {
+                let attr = ev.target.getAttribute("data-partner-filter"),
+                    val = ev.target.value;
+                if (attr !== null) {
+                    if (val === "") {
+                        delete this.currentFilters[attr];
+                    } else {
+                        this.currentFilters[attr] = val;
                     }
                 }
-                item.toggleVisibility(true)
             }
-        TP_Mappable.updateFilterWarnings();
-    }
 
-    get visibility() {
-        return this._visible;
-    }
+            itemLoop:
+                for (const ii in tpvm.partners) {
+                    if (!tpvm.partners.hasOwnProperty(ii)) continue;
+                    const item = tpvm.partners[ii];
+                    for (const ai in this.currentFilters) {
+                        if (!this.currentFilters.hasOwnProperty(ai)) continue;
+
+                        if (!item.attributes.hasOwnProperty(ai) ||
+                            item.attributes[ai] === null ||
+                            (!Array.isArray(item.attributes[ai]) &&
+                                item.attributes[ai].slug !== this.currentFilters[ai] &&
+                                item.attributes[ai] !== this.currentFilters[ai]
+                            ) || (
+                                Array.isArray(item.attributes[ai]) &&
+                                item.attributes[ai].find(a => a.slug === this.currentFilters[ai]) === undefined
+                            )
+                        ) {
+                            item.toggleVisibility(false)
+                            continue itemLoop;
+                        }
+                    }
+                    item.toggleVisibility(true)
+                }
+            TP_Mappable.updateFilterWarnings();
+        }
 
-    static init() {
-        tpvm.trigger('Partner_class_loaded');
-    }
+        get visibility() {
+            return this._visible;
+        }
 
-    static initMap(mapDivId) {
-        let mapOptions = {
-            mapTypeId: google.maps.MapTypeId.HYBRID,
-            linksControl: false,
-            maxZoom: 10,
-            minZoom: 2,
-            panControl: false,
-            addressControl: false,
-            enableCloseButton: false,
-            mapTypeControl: false,
-            zoomControl: false,
-            gestureHandling: 'greedy',
-            styles: [
-                {
-                    featureType: "poi", //points of interest
-                    stylers: [
-                        {visibility: 'off'}
-                    ]
-                },
-                {
-                    featureType: "road",
-                    stylers: [
-                        {visibility: 'off'}
-                    ]
-                },
-                {
-                    featureType: "transit",
-                    stylers: [
-                        {visibility: 'off'}
-                    ]
-                }
-            ],
-            zoom: 6,
-            center: {lat: 0, lng: 0}, // gets overwritten by bounds later.
-            streetViewControl: false,
-            fullscreenControl: false,
-            disableDefaultUI: true
-        };
+        static init() {
+            tpvm.trigger('Partner_class_loaded');
+        }
 
-        super.initMap(document.getElementById(mapDivId), mapOptions, tpvm.partners)
-    }
+        static initMap(mapDivId) {
+            let mapOptions = {
+                mapTypeId: google.maps.MapTypeId.HYBRID,
+                linksControl: false,
+                maxZoom: 10,
+                minZoom: 2,
+                panControl: false,
+                addressControl: false,
+                enableCloseButton: false,
+                mapTypeControl: false,
+                zoomControl: false,
+                gestureHandling: 'greedy',
+                styles: [
+                    {
+                        featureType: "poi", //points of interest
+                        stylers: [
+                            {visibility: 'off'}
+                        ]
+                    },
+                    {
+                        featureType: "road",
+                        stylers: [
+                            {visibility: 'off'}
+                        ]
+                    },
+                    {
+                        featureType: "transit",
+                        stylers: [
+                            {visibility: 'off'}
+                        ]
+                    }
+                ],
+                zoom: 6,
+                center: {lat: 0, lng: 0}, // gets overwritten by bounds later.
+                streetViewControl: false,
+                fullscreenControl: false,
+                disableDefaultUI: true
+            };
+
+            super.initMap(document.getElementById(mapDivId), mapOptions, tpvm.partners)
+        }
 
-}
-TP_Partner.init();
\ No newline at end of file
+    }
+    tpvm.TP_Partner = TP_Partner;
+    TP_Partner.init();
+})();
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 41e4d5f8..2219f7c8 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1396,7 +1396,7 @@ public static function filterShortcode($params = []): string
 				// language=javascript
 				"
                 tpvm.addEventListener('Involvement_fromObjArray', function() {
-                    TP_Involvement.initFilters();
+                    tpvm.TP_Involvement.initFilters();
                 });"
 			);
 			self::$filterJsAdded = true;
@@ -4010,7 +4010,7 @@ public static function getJsInstantiationString(): string
 		$listStr = json_encode($queue);
 
 		return "\ttpvm.addEventListener('Involvement_class_loaded', function() {
-		TP_Involvement.fromObjArray($listStr);\n\t});\n";
+		tpvm.TP_Involvement.fromObjArray($listStr);\n\t});\n";
 	}
 
 	public function getTouchPointId(): int
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 5cdd5d55..48cb21b2 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -677,7 +677,7 @@ public static function getJsInstantiationString(): string
 		return "";  // TODO someday, probably.
 
 //		return "\ttpvm.addEventListener('Involvement_class_loaded', function() {
-//		TP_Involvement.fromObjArray($listStr);\n\t});\n";
+//		tpvm.TP_Involvement.fromObjArray($listStr);\n\t});\n";
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 6fd42d1a..cd4e350b 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -795,7 +795,7 @@ public static function filterShortcode($params = []): string
 				// language=javascript
 				"
                 tpvm.addEventListener('Partner_fromObjArray', function() {
-                    TP_Partner.initFilters();
+                    tpvm.TP_Partner.initFilters();
                 });"
 			);
 			self::$filterJsAdded = true;
@@ -1380,7 +1380,7 @@ public static function getJsInstantiationString(): string
 		$listStr = json_encode($queue);
 
 		return "\ttpvm.addEventListener('Partner_class_loaded', function() {
-        TP_Partner.fromObjArray($listStr);\n\t});\n";
+        tpvm.TP_Partner.fromObjArray($listStr);\n\t});\n";
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index c6855aa9..a980e0bb 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1318,7 +1318,7 @@ public static function getJsInstantiationString(): string
 		$listStr = json_encode($queue);
 
 		$out = "\ttpvm.addOrTriggerEventListener('Person_class_loaded', function() {\n";
-		$out .= "\t\tTP_Person.fromObjArray($listStr);\n";
+		$out .= "\t\ttpvm.TP_Person.fromObjArray($listStr);\n";
 
 // TODO restore, better.
 //		if (self::$_enqueueUsersForJsInstantiation) {
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 385478ae..81931f9f 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -935,7 +935,8 @@ public function registerScriptsAndStyles(): void
 		);
 		wp_set_script_translations(
 			self::SHORTCODE_PREFIX . 'base-defer',
-			'TouchPoint-WP', $this->getJsLocalizationDir()
+			'TouchPoint-WP',
+			$this->getJsLocalizationDir()
 		);
 
 		wp_register_script(
@@ -973,7 +974,7 @@ public function registerScriptsAndStyles(): void
 		wp_register_script(
 			TouchPointWP::SHORTCODE_PREFIX . "googleMaps",
 			sprintf(
-				"https://maps.googleapis.com/maps/api/js?key=%s&v=3&libraries=geometry&language=$lang",
+				"https://maps.googleapis.com/maps/api/js?key=%s&v=3&loading=async&libraries=geometry&language=$lang",
 				TouchPointWP::instance()->settings->google_maps_api_key
 			),
 			[TouchPointWP::SHORTCODE_PREFIX . "base-defer"],
@@ -1085,7 +1086,7 @@ public static function requireStyle(?string $name = null): void
 	public function filterByTag(?string $tag, ?string $handle): string
 	{
 		if (!str_contains($tag, ' async') &&
-		    strpos($handle, '-async') > 0
+		    strpos($handle, '-async')
 		) {
 			$tag = str_replace(' src=', ' async="async" src=', $tag);
 		}
diff --git a/src/js-partials/involvement-map-inline.js b/src/js-partials/involvement-map-inline.js
index c7c6a05c..6c3d1427 100644
--- a/src/js-partials/involvement-map-inline.js
+++ b/src/js-partials/involvement-map-inline.js
@@ -1,3 +1,3 @@
 tpvm.addEventListener('Involvement_fromObjArray', function() {
-    TP_Involvement.initMap('{$mapDivId}');
+    tpvm.TP_Involvement.initMap('{$mapDivId}');
 });
\ No newline at end of file
diff --git a/src/js-partials/partner-map-inline.js b/src/js-partials/partner-map-inline.js
index a3d4e524..4dcf8985 100644
--- a/src/js-partials/partner-map-inline.js
+++ b/src/js-partials/partner-map-inline.js
@@ -1,3 +1,3 @@
 tpvm.addEventListener('Partner_fromObjArray', function() {
-    TP_Partner.initMap('{$mapDivId}');
+    tpvm.TP_Partner.initMap('{$mapDivId}');
 });
\ No newline at end of file

From 6118059af43a3dd0d3069f78bf4b0bfd34a2b295 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 5 Jun 2025 18:11:44 -0400
Subject: [PATCH 290/423] Reworking usage of Google Maps library to account for
 API changes.  Closes #220.

---
 assets/js/base-defer.js                     | 134 ++++++++------------
 assets/js/partner-defer.js                  |  35 ++---
 assets/template/partials-template-style.css |   8 ++
 src/TouchPoint-WP/TouchPointWP.php          |   2 +-
 4 files changed, 69 insertions(+), 110 deletions(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index cff806d6..13030a6a 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -331,25 +331,36 @@
         geoStr = "";
 
         /**
-         * @type {google.maps.Marker}
+         * @type {google.maps.marker.AdvancedMarkerElement}
          */
         gMkr = null;
+        map = null;
 
         constructor(options) {
-            if (!options.hasOwnProperty('icon')) {
-                options.icon = {
-                    path: "M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0z", // from FontAwesome
-                    fillColor: options.color ?? "#000",
-                    fillOpacity: .85,
-                    anchor: new google.maps.Point(172.268, 501.67),
-                    strokeWeight: 1,
-                    scale: 0.04,
-                    labelOrigin: new google.maps.Point(190, 198)
-                }
+            this.color = options.color ?? "#000";
+            this.map = options.map;
+
+            if (options.hasOwnProperty('color')) {
+                delete options.color; // can't be passed to AdvancedMarkerElement
+            }
+
+            if (!options.hasOwnProperty('content')) {
+                const label = document.createElement('div');
+                label.classList.add("map-marker-label");
+                const pin = new google.maps.marker.PinElement({
+                    glyph: label,
+                    glyphColor: "#000",
+                    background: this.color,
+                    borderColor: "#000",
+                    scale: .65,
+                });
+                options.content = pin.element;
             }
-            this.gMkr = new google.maps.Marker(options);
+
+            this.gMkr = new google.maps.marker.AdvancedMarkerElement(options);
             let that = this;
-            this.gMkr.addListener("click", () => that.handleClick());
+            this.gMkr.addListener("gmp-click", () => that.handleClick());
+            this.gMkr.content.classList.add("tp-map-marker");
         }
 
         get visibleItems() {
@@ -361,11 +372,11 @@
         }
 
         get inBounds() {
-            let map = this.gMkr.getMap();
+            let map = this.gMkr.map;
             if (!map) { // if map failed to render for some reason, this prevents entries from being hidden.
                 return true;
             }
-            return map.getBounds().contains(this.gMkr.getPosition());
+            return map.getBounds().contains(this.gMkr.position);
         }
 
         get useIcon() {
@@ -381,41 +392,31 @@
                 return;
             }
 
-            let icon = this.gMkr.getIcon();
+            let icon = this.gMkr.content;
 
             // Update icon color
-            this.color = tpvm._utils.averageColor(this.visibleItems.map((i) => i.color))
+            this.color = tpvm._utils.averageColor(this.visibleItems.map((i) => i.color));
             if (icon !== undefined && icon.hasOwnProperty("fillColor")) {
                 icon.fillColor = this.color;
-                this.gMkr.setIcon(icon);
+                this.gMkr.content.style.backgroundColor = this.color; // Update AdvancedMarkerElement content style
             }
 
             // Update visibility
-            this.gMkr.setVisible(this.visibleItems.length > 0);
+            this.gMkr.map = (this.visibleItems.length > 0 ? this.map : null);
 
             // Update title
-            this.gMkr.setTitle(tpvm._utils.stringArrayToListString(this.visibleItems.map((i) => i.name)))
+            this.gMkr.title = tpvm._utils.stringArrayToListString(this.visibleItems.map((i) => i.name));
 
-            // Update label proper
-            if (highlighted) {
-                this.gMkr.setLabel(null); // Remove label if highlighted, because labels don't animate.
-            } else {
-                this.gMkr.setLabel(this.getLabelContent());
-            }
+            this.gMkr.content.getElementsByTagName('div')[0].innerHTML = this.getLabelContent() || ""; // Set label content
         }
 
         getLabelContent() {
-            let label = null;
             if (this.visibleItems.length > 1) {
-                label = {
-                    text: this.visibleItems.length.toString(),
-                    color: "#000000",
-                    fontSize: "100%"
-                }
+                return this.visibleItems.length.toString();
             } else if (this.useIcon !== false) { // icon for secure partners
-                label = this.useIcon;
+                return this.useIcon;
             }
-            return label;
+            return null;
         }
 
         // noinspection JSUnusedGlobalSymbols  Used dynamically from markers.
@@ -426,8 +427,8 @@
 
             tpvm._utils.clearHash();
 
-            const mp = this.gMkr.getMap();
-            TP_MapMarker.smoothZoom(mp, this.gMkr.getPosition()).then(() => 1)
+            const mp = this.gMkr.map;
+            TP_MapMarker.smoothZoom(mp, this.gMkr.position).then(() => 1)
 
             tpvm._utils.ga('send', 'event', this.items[0].itemTypeName, 'mapMarker click', this.gMkr.getTitle());
         }
@@ -451,12 +452,12 @@
                 });
                 if (map.getZoom() < zoomTo) { // zoom in
                     map.setZoom(map.getZoom() + 1);
-                } else { // zoom out
+                } else if (map.getZoom() > zoomTo) { // zoom out
                     map.setZoom(map.getZoom() - 1);
                 }
                 if (position !== null) {
                     let oldPos = map.getCenter(),
-                        newPos = new google.maps.LatLng((oldPos.lat() + position.lat() * 2) / 3, (oldPos.lng() + position.lng() * 2) / 3);
+                        newPos = new google.maps.LatLng((oldPos.lat() + position.lat * 2) / 3, (oldPos.lng() + position.lng * 2) / 3);
                     map.panTo(newPos);
                 }
             } else {
@@ -583,7 +584,7 @@
 
                     const item = list[ii],
                         geoStr = "" + item.geo[gi].lat + "," + item.geo[gi].lng;
-                    let mkr = this.markers.find((m) => m.gMkr.getMap() === map && m.geoStr === geoStr);
+                    let mkr = this.markers.find((m) => m.gMkr.map === map && m.geoStr === geoStr);
 
                     // If there isn't already a marker for the item on the right map, create one.
                     if (mkr === undefined) {
@@ -591,7 +592,6 @@
                             position: item.geo[gi],
                             color: item.color,
                             map: map,
-                            animation: google.maps.Animation.DROP,
                         });
                         mkr.geoStr = geoStr;
 
@@ -599,7 +599,7 @@
                         this.markers.push(mkr);
                     }
 
-                    bounds.extend(mkr.gMkr.getPosition());
+                    bounds.extend(mkr.gMkr.position);
 
                     // If the marker doesn't already have a reference to this item, add one.
                     if (!mkr.items.includes(item)) {
@@ -621,6 +621,7 @@
             }
 
             map.fitBounds(bounds);
+            let originalZoom = map.getZoom();
 
             map.addListener('bounds_changed', this.handleZoom);
 
@@ -636,15 +637,6 @@
             }
         }
 
-        // noinspection JSUnusedGlobalSymbols  Used dynamically from warning text.
-        /**
-         *
-         * @param {google.maps.Map} map
-         */
-        static resetMap(map) {
-            console.log("reset " + map.getMapTypeId())
-        }
-
         /**
          * Currently, this will apply visibility to ALL mappable items, even if they're on a different map.
          */
@@ -695,12 +687,12 @@
 
             // One marker (probably typical)
             if (this.markers.length === 1) {
-                let mp = this.markers[0].gMkr.getMap(),
+                let mp = this.markers[0].gMkr.map,
                     el = mp.getDiv(),
                     rect = el.getBoundingClientRect(),
                     viewHeight = Math.max(document.documentElement.clientHeight, window.innerHeight),
                     mpWithinView = !(rect.bottom < 0 || rect.top - viewHeight >= 0);
-                TP_MapMarker.smoothZoom(mp, this.markers[0].gMkr.getPosition()).then(() => 1);
+                TP_MapMarker.smoothZoom(mp, this.markers[0].gMkr.position).then(() => 1);
                 if (!mpWithinView) {
                     window.scroll({
                         top: rect.top,
@@ -796,8 +788,8 @@
                 for (let mi in this.markers) {
                     const mk = item.markers[mi];
                     if (TP_Mappable.items.length > 1) {
-                        if (mk.gMkr.getAnimation() !== google.maps.Animation.BOUNCE) {
-                            mk.gMkr.setAnimation(google.maps.Animation.BOUNCE);
+                        if (!mk.gMkr.content.classList.contains("highlighted-marker")) {
+                            mk.gMkr.content.classList.add("highlighted-marker");
                         }
                     }
                     mk.updateLabel(this.highlighted)
@@ -805,8 +797,8 @@
             } else {
                 for (const mi in this.markers) {
                     let mk = this.markers[mi];
-                    if (mk.gMkr.getAnimation() !== null) {
-                        mk.gMkr.setAnimation(null)
+                    if (mk.gMkr.content.classList.contains("highlighted-marker")) {
+                        mk.gMkr.content.classList.remove("highlighted-marker");
                     }
                     mk.updateLabel(this.highlighted)
                 }
@@ -1036,10 +1028,6 @@
             }
         }
 
-        get itemTypeName() {
-            return this.invType;
-        }
-
         // noinspection JSUnusedGlobalSymbols  Used dynamically from btns.
         contactAction() {
             let inv = this,
@@ -1093,8 +1081,9 @@
         static initMap(mapDivId) {
             let mapOptions = {
                 mapTypeId: google.maps.MapTypeId.ROADMAP,
+                mapId: "f0fb8ca5f6beff5288b80a8d",
                 linksControl: false,
-                maxZoom: 15,
+                maxZoom: 16,
                 minZoom: 2,
                 panControl: false,
                 addressControl: false,
@@ -1102,26 +1091,6 @@
                 mapTypeControl: false,
                 zoomControl: false,
                 gestureHandling: 'greedy',
-                styles: [
-                    {
-                        featureType: "poi", //points of interest
-                        stylers: [
-                            {visibility: 'off'}
-                        ]
-                    },
-                    {
-                        featureType: "road",
-                        stylers: [
-                            {visibility: 'on'}
-                        ]
-                    },
-                    {
-                        featureType: "transit",
-                        stylers: [
-                            {visibility: 'on'}
-                        ]
-                    }
-                ],
                 zoom: 15,
                 center: {lat: 0, lng: 0}, // gets overwritten by bounds later.
                 streetViewControl: false,
@@ -1560,4 +1529,5 @@
     tpvm.TP_Person = TP_Person;
     TP_Person.init();
 
-})();
\ No newline at end of file
+})();
+
diff --git a/assets/js/partner-defer.js b/assets/js/partner-defer.js
index f27604cf..90d55264 100644
--- a/assets/js/partner-defer.js
+++ b/assets/js/partner-defer.js
@@ -44,19 +44,19 @@
             return ret;
         };
 
+        // noinspection JSUnusedGlobalSymbols
         get useIcon() {
             if (this.post_id === 0) {
-                return {
-                    text: " ",
-                    fontFamily: "\"Font Awesome 6 Free\", FontAwesome",
-                    color: "#00000088",
-                    fontSize: "90%",
-                    className: "fa fa-solid fa-lock"
-                }
+                return "<i class=\"fa fa-solid fa-lock\" style=\"font-size:90%\"></i>";
             }
             return false;
         }
 
+        // noinspection JSUnusedGlobalSymbols
+        /**
+         * @overrides tpvm.TP_Mappable
+         * @returns {boolean}
+         */
         get highlightable() {
             return this.post_id !== 0;
         }
@@ -120,6 +120,7 @@
         static initMap(mapDivId) {
             let mapOptions = {
                 mapTypeId: google.maps.MapTypeId.HYBRID,
+                mapId: 'f0fb8ca5f6beff5237d51d79',
                 linksControl: false,
                 maxZoom: 10,
                 minZoom: 2,
@@ -129,26 +130,6 @@
                 mapTypeControl: false,
                 zoomControl: false,
                 gestureHandling: 'greedy',
-                styles: [
-                    {
-                        featureType: "poi", //points of interest
-                        stylers: [
-                            {visibility: 'off'}
-                        ]
-                    },
-                    {
-                        featureType: "road",
-                        stylers: [
-                            {visibility: 'off'}
-                        ]
-                    },
-                    {
-                        featureType: "transit",
-                        stylers: [
-                            {visibility: 'off'}
-                        ]
-                    }
-                ],
                 zoom: 6,
                 center: {lat: 0, lng: 0}, // gets overwritten by bounds later.
                 streetViewControl: false,
diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index b24cd20d..cdd0732d 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -181,6 +181,14 @@ h1.archive-title.page-title {
     text-align: inherit;
 }
 
+@keyframes bouncing-marker {
+    from { transform: translate3d(0, 0, 0);}
+    to { transform: translate3d(0, -15px, 0);}
+}
+.tp-map-marker.highlighted-marker {
+    animation: bouncing-marker .5s ease-in-out infinite alternate;
+}
+
 article .section-inner.TouchPointWP-detail {
     display: flex;
 }
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 81931f9f..f8614a83 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -974,7 +974,7 @@ public function registerScriptsAndStyles(): void
 		wp_register_script(
 			TouchPointWP::SHORTCODE_PREFIX . "googleMaps",
 			sprintf(
-				"https://maps.googleapis.com/maps/api/js?key=%s&v=3&loading=async&libraries=geometry&language=$lang",
+				"https://maps.googleapis.com/maps/api/js?key=%s&v=3&loading=async&libraries=geometry,marker&language=$lang",
 				TouchPointWP::instance()->settings->google_maps_api_key
 			),
 			[TouchPointWP::SHORTCODE_PREFIX . "base-defer"],

From c42f44383b12f5ac919bd81a897dd0d9c6d924b2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 5 Jun 2025 18:26:24 -0400
Subject: [PATCH 291/423] Changing people lists to not have hover behavior if
 there are no actions. Closes #229

---
 .idea/libraries/Generated_files.xml         |  6 ++++++
 assets/template/partials-template-style.css |  4 ++--
 src/TouchPoint-WP/Person.php                |  4 ++--
 src/templates/parts/person-list-item.php    | 12 ++++++++++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.idea/libraries/Generated_files.xml b/.idea/libraries/Generated_files.xml
index 2250062c..11b1f82e 100644
--- a/.idea/libraries/Generated_files.xml
+++ b/.idea/libraries/Generated_files.xml
@@ -5,12 +5,18 @@
         <item url="file://$PROJECT_DIR$/build/assets/js/base-defer.js" />
         <item url="file://$PROJECT_DIR$/build/assets/js/meeting-defer.js" />
         <item url="file://$PROJECT_DIR$/build/assets/js/partner-defer.js" />
+        <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
+        <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
+        <item url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
       </sourceFilesUrls>
     </properties>
     <CLASSES>
       <root url="file://$PROJECT_DIR$/build/assets/js/base-defer.js" />
       <root url="file://$PROJECT_DIR$/build/assets/js/meeting-defer.js" />
       <root url="file://$PROJECT_DIR$/build/assets/js/partner-defer.js" />
+      <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
+      <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
+      <root url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index cdd0732d..429b627e 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -74,7 +74,7 @@ article.inv-list-item h2 a {
     opacity: 0;
 }
 
-.person-list-item:hover .person-actions {
+.person-list-item.has-actions:hover .person-actions {
     opacity: 1;
 }
 
@@ -136,7 +136,7 @@ div.inv-list article.inv-list-item h2.entry-title {
     text-shadow: 0 0 3px #000, 0 0 5px #000;
 }
 
-.person-list-item:hover header.entry-header > * {
+.person-list-item.has-actions:hover header.entry-header > * {
     opacity: 0;
 }
 
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index a980e0bb..5a520cf1 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1170,9 +1170,9 @@ protected function resCode(): ?WP_Term
 	 *     elements.
 	 * @param bool    $withTouchPointLink
 	 *
-	 * @return string
+	 * @return StringableArray
 	 */
-	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true): string
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true): StringableArray
 	{
 		TouchPointWP::requireScript('swal2-defer');
 		TouchPointWP::requireScript('base-defer');
diff --git a/src/templates/parts/person-list-item.php b/src/templates/parts/person-list-item.php
index e15eb78a..f8277b8d 100644
--- a/src/templates/parts/person-list-item.php
+++ b/src/templates/parts/person-list-item.php
@@ -12,9 +12,17 @@
     $image = " style=\"background-image: url('$image');\"";
 }
 
+$actions = $person->getActionButtons("person-list", $btnClass);
+$classList = "person-list-item";
+if ($actions->count() === 0) {
+    $classList .= " no-actions";
+} else {
+    $classList .= " has-actions";
+}
+
 ?>
 
-<article id="person-<?php echo $person->peopleId; ?>" class="person-list-item" data-tp-person="<?php echo $person->peopleId ?>"<?php echo $image ?>>
+<article id="person-<?php echo $person->peopleId; ?>" class="<?php echo $classList; ?>" data-tp-person="<?php echo $person->peopleId ?>"<?php echo $image ?>>
     <header class="entry-header">
         <div class="entry-header-inner">
             <?php
@@ -52,6 +60,6 @@
         <?php //echo wp_trim_words($person->description, 20, "..."); ?>
     </div>
     <div class="actions person-actions">
-        <?php echo $person->getActionButtons("person-list", $btnClass); ?>
+        <?php echo $actions ?>
     </div>
 </article>
\ No newline at end of file

From 77255fa2b2c6bd15f01bdec9ba8f084cc2de2dde Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 5 Jun 2025 18:26:38 -0400
Subject: [PATCH 292/423] Missed a scoping issue.

---
 src/js-partials/involvement-nearby-inline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js-partials/involvement-nearby-inline.js b/src/js-partials/involvement-nearby-inline.js
index 7e0cc30d..c4b5614c 100644
--- a/src/js-partials/involvement-nearby-inline.js
+++ b/src/js-partials/involvement-nearby-inline.js
@@ -1,3 +1,3 @@
 tpvm.addEventListener('load', function() {
-    TP_Involvement.initNearby('{$nearbyListId}', '{$type}','{$count}');
+    tpvm.TP_Involvement.initNearby('{$nearbyListId}', '{$type}','{$count}');
 });
\ No newline at end of file

From 6fd59c92e6ad11508eb2a2f1fd00d8e4cf400413 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 6 Jun 2025 00:10:16 -0400
Subject: [PATCH 293/423] Making tp_person_actions filter more flexible.

---
 src/TouchPoint-WP/Person.php       | 11 ++++++++++-
 src/TouchPoint-WP/TouchPointWP.php |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 5a520cf1..cdd2c859 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1202,6 +1202,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		 * on the Person to allow the user to interact with them.
 		 *
 		 * @since 0.0.90 Added
+		 * @since 0.0.96 Adjusted parameters and return value for StringableArray rather than string.
 		 *
 		 * @see Person::getActionButtons()
 		 *
@@ -1211,7 +1212,15 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		 * @param string $btnClass A string for classes to add to the buttons.  Note that buttons can be 'a' or 'button'
 		 *     elements.
 		 */
-		return apply_filters("tp_person_actions", $ret, $this, $context, $btnClass);
+		$ret = apply_filters("tp_person_actions", $ret, $this, $context, $btnClass);
+
+		if ($ret instanceof StringableArray) {
+			return $ret;
+		}
+
+		$r = new StringableArray();
+		$r->append($ret);
+		return $r;
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index f8614a83..6fbe7eec 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -69,7 +69,7 @@ class TouchPointWP
 	 */
 	public const HOOK_PREFIX = "tp_";
 
-	public const INIT_ACTION_HOOK = "tp_init"; // Note that this is also hard-coded where the action is declared.
+	public const INIT_ACTION_HOOK = "tp_init";  // Note that this is also hard-coded where the action is called.
 
 	/**
 	 * Prefix to use for all settings.
@@ -901,7 +901,7 @@ public static function init(): void
 		/**
 		 * Fires after the plugin has been initialized.
 		 */
-		do_action(self::INIT_ACTION_HOOK);
+		do_action("tp_init"); // needs to be hard-coded for documenter
 	}
 
 	/**

From 38d7143c140b402090197041bd8035dfcce488ba Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 6 Jun 2025 22:07:23 -0400
Subject: [PATCH 294/423] Adding actionButtons.php interface and making
 getActionButtons implementations more consistent.

---
 .../Interfaces/actionButtons.php              | 24 +++++++++++
 src/TouchPoint-WP/Involvement.php             |  2 +-
 src/TouchPoint-WP/Meeting.php                 |  2 +-
 src/TouchPoint-WP/Partner.php                 |  4 +-
 src/TouchPoint-WP/Person.php                  | 41 +++++++++++++------
 src/TouchPoint-WP/PostTypeCapable.php         | 15 ++-----
 6 files changed, 59 insertions(+), 29 deletions(-)
 create mode 100644 src/TouchPoint-WP/Interfaces/actionButtons.php

diff --git a/src/TouchPoint-WP/Interfaces/actionButtons.php b/src/TouchPoint-WP/Interfaces/actionButtons.php
new file mode 100644
index 00000000..40fb2c85
--- /dev/null
+++ b/src/TouchPoint-WP/Interfaces/actionButtons.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Interfaces;
+
+use tp\TouchPointWP\Utilities\StringableArray;
+
+/**
+ * This is a base interface for classes that make action buttons available for a given object.
+ */
+interface actionButtons
+{
+	/**
+	 * @param string|null $context A string that gives filters some context for where the request is coming from
+	 * @param string      $btnClass HTML class names to put into the buttons/links
+	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param bool        $absoluteLinks  Set true to make the links absolute, so they work from apps or emails.
+	 *
+	 * @return StringableArray
+	 */
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray;
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 2219f7c8..b1665876 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3854,7 +3854,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
 			$tpHost = TouchPointWP::instance()->host();
-			// Translators: %s is the system name.  "TouchPoint" by default.
+			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$logo = TouchPointWP::TouchPointIcon();
 			$ret['inv_tp']  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 48cb21b2..569210bb 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -523,7 +523,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin() && !$this->isMeetingGroup()) {
 			$tpHost = TouchPointWP::instance()->host();
-			// Translators: %s is the system name.  "TouchPoint" by default.
+			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Meeting in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$logo = TouchPointWP::TouchPointIcon();
 			$ret['mtg_tp']  = "<a href=\"$tpHost/Meeting/$this->mtgId\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index cd4e350b..3b57fd6d 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -222,7 +222,7 @@ public static function init(): void
 				'hierarchical'      => false,
 				'show_ui'           => false,
 				'show_in_nav_menus' => true,
-				'show_in_rest'      => false, // For the benefit of secure partners
+				'show_in_rest'      => true, // For the benefit of secure partners
 				'supports'          => [
 					'title',
 					'custom-fields',
@@ -1326,7 +1326,7 @@ protected function enqueueForJsInstantiation(): bool
 	 *
 	 * @param string|null $context A string that gives filters some context for where the request is coming from
 	 * @param string      $btnClass HTML class names to put into the buttons/links
-	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
+	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint. (not used)
 	 * @param bool        $absoluteLinks  Set true to make the links absolute, so they work from apps or emails.
 	 *
 	 * @return StringableArray
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index cdd2c859..d9d5d61d 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -13,6 +13,7 @@
 	require_once "Interfaces/api.php";
 	require_once "extraValues.php";
 	require_once "jsInstantiation.php";
+	require_once "Interfaces/actionButtons.php";
 	require_once "Interfaces/updatesViaCron.php";
 	require_once "InvolvementMembership.php";
 	require_once "Utilities.php";
@@ -22,6 +23,7 @@
 use Exception;
 use JsonSerializable;
 use stdClass;
+use tp\TouchPointWP\Interfaces\actionButtons;
 use tp\TouchPointWP\Interfaces\api;
 use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Interfaces\updatesViaCron;
@@ -43,7 +45,7 @@
  * @property-read ?WP_Term resCode  The ResCode taxonomy, if present
  * @property ?int          rescode_term_id   The ResCode term ID
  */
-class Person extends WP_User implements api, JsonSerializable, module, updatesViaCron
+class Person extends WP_User implements api, JsonSerializable, module, updatesViaCron, actionButtons
 {
 	use jsInstantiation;
 	use extraValues;
@@ -1163,38 +1165,50 @@ protected function resCode(): ?WP_Term
 
 	/**
 	 * Returns the html with buttons for actions the user can perform.  This must be called *within* an element with
-	 * the `data-tp-person` attribute with the invId as the value.
+	 *  the `data-tp-person` attribute with the peopleId as the value.
 	 *
 	 * @param ?string $context A reference to where the action buttons are meant to be used.
 	 * @param string  $btnClass A string for classes to add to the buttons.  Note that buttons can be a or button
 	 *     elements.
 	 * @param bool    $withTouchPointLink
+	 * @param bool    $absoluteLinks
 	 *
 	 * @return StringableArray
 	 */
-	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true): StringableArray
+	public function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray
 	{
-		TouchPointWP::requireScript('swal2-defer');
-		TouchPointWP::requireScript('base-defer');
-		$this->enqueueForJsInstantiation();
+		if (!$absoluteLinks) {
+			TouchPointWP::requireScript('swal2-defer');
+			TouchPointWP::requireScript('base-defer');
+			$this->enqueueForJsInstantiation();
+			Person::enqueueUsersForJsInstantiation();
+		}
 
+		$classesOnly = $btnClass;
 		if ($btnClass !== "") {
 			$btnClass = " class=\"$btnClass\"";
 		}
+		global $wp;
+		$baseLink = add_query_arg($wp->query_vars, home_url($wp->request));
 
 		$ret = new StringableArray();
 		if (self::allowContact()) {
 			$text = __("Contact", "TouchPoint-WP");
-			TouchPointWP::enqueueActionsStyle('person-contact');
-			self::enqueueUsersForJsInstantiation();
-			$ret[] = "<button type=\"button\" data-tp-action=\"contact\" $btnClass>$text</button>  ";
+			$pid = $this->peopleId;
+			if (!$absoluteLinks) {
+				$ret['contact'] = "<button type=\"button\" data-tp-person=\"$pid\" data-tp-action=\"contact\" $btnClass>$text</button> ";
+				TouchPointWP::enqueueActionsStyle('person-contact');
+				self::enqueueUsersForJsInstantiation();
+			} else {
+				$ret['contact'] = "<a href=\"$baseLink#tp-contact-p$pid\"$btnClass>$text</a> ";
+			}
 		}
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
-			// Translators: %s is the system name.  "TouchPoint" by default.
-			$title  = sprintf(__("Person in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
+			// Translators: %s is the system name, "TouchPoint" by default.
+			$title  = wp_sprintf(__("Person in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$logo = TouchPointWP::TouchPointIcon();
-			$ret[]  = "<a href=\"{$this->getProfileUrl()}\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
+			$ret['inv_tp']  = "<a href=\"{$this->getProfileUrl()}\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
 		}
 
 		/**
@@ -1202,7 +1216,8 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		 * on the Person to allow the user to interact with them.
 		 *
 		 * @since 0.0.90 Added
-		 * @since 0.0.96 Adjusted parameters and return value for StringableArray rather than string.
+		 * @since 0.0.96 Adjusted parameters and return value to have type StringableArray rather than string.  If the
+		 *      return value is not a StringableArray, it will be forced into one.
 		 *
 		 * @see Person::getActionButtons()
 		 *
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 448723f0..45bc3613 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -6,18 +6,19 @@
 
 namespace tp\TouchPointWP;
 
+use tp\TouchPointWP\Interfaces\actionButtons;
 use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Interfaces\storedAsPost;
-use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
 
+require_once 'Interfaces/actionButtons.php';
 require_once 'Interfaces/module.php';
 require_once 'Interfaces/storedAsPost.php';
 
 /**
  * This is a base class for those objects that can be derived from a Post.
  */
-abstract class PostTypeCapable implements module, storedAsPost
+abstract class PostTypeCapable implements module, storedAsPost, actionButtons
 {
 
 	protected int $post_id;
@@ -104,16 +105,6 @@ protected function processAttributeExclusions(array $subject, array $exclude): a
 		return $subject;
 	}
 
-	/**
-	 * @param string|null $context A string that gives filters some context for where the request is coming from
-	 * @param string      $btnClass HTML class names to put into the buttons/links
-	 * @param bool        $withTouchPointLink Whether to include a link to the item within TouchPoint.
-	 * @param bool        $absoluteLinks  Set true to make the links absolute, so they work from apps or emails.
-	 *
-	 * @return StringableArray
-	 */
-	public abstract function getActionButtons(?string $context = null, string $btnClass = "", bool $withTouchPointLink = true, bool $absoluteLinks = false): StringableArray;
-
 	/**
 	 * Indicates if the given post can be instantiated as the given post type.
 	 *

From 3c8264bf9ce462891995a3a091fa9794875e5daf Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sat, 7 Jun 2025 13:39:52 -0400
Subject: [PATCH 295/423] Rework NotableAttributes calls to return a
 StringableArray-based class.  Closes #232

---
 src/TouchPoint-WP/Involvement.php             | 25 +++++++---
 src/TouchPoint-WP/Meeting.php                 | 36 +++++++++-----
 src/TouchPoint-WP/Partner.php                 | 36 ++++++++------
 src/TouchPoint-WP/PostTypeCapable.php         | 21 ++++----
 .../Utilities/NotableAttributes.php           | 22 +++++++++
 .../Utilities/StringableArray.php             | 49 ++++++++++++++++---
 src/templates/involvement-single.php          |  8 +--
 src/templates/partner-single.php              |  9 +---
 src/templates/parts/involvement-list-item.php | 20 +-------
 src/templates/parts/meeting-list-item.php     | 31 ++----------
 src/templates/parts/partner-list-item.php     | 11 +----
 touchpoint-wp.php                             |  1 +
 12 files changed, 152 insertions(+), 117 deletions(-)
 create mode 100644 src/TouchPoint-WP/Utilities/NotableAttributes.php

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index b1665876..84805cf4 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -35,6 +35,7 @@
 use tp\TouchPointWP\Utilities\DateFormats;
 use tp\TouchPointWP\Utilities\DateTimeExtended;
 use tp\TouchPointWP\Utilities\Http;
+use tp\TouchPointWP\Utilities\NotableAttributes;
 use tp\TouchPointWP\Utilities\PersonArray;
 use tp\TouchPointWP\Utilities\PersonQuery;
 use tp\TouchPointWP\Utilities\StringableArray;
@@ -3710,13 +3711,20 @@ public function toJsonLD(): ?array
 	/**
 	 * Get notable attributes, such as gender restrictions, as strings.
 	 *
-	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent inv, not needed
-	 *	 here.)
+	 * @param array|StringableArray $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent inv,
+	 * not needed here.)
 	 *
-	 * @return string[]
+	 * @return NotableAttributes
+	 *
+	 * @since 0.0.11
+	 * @since 0.0.96 Changed to use NotableAttributes class, which is a StringableArray.
 	 */
-	public function notableAttributes(array $exclude = []): array
+	public function notableAttributes(array|StringableArray $exclude = []): NotableAttributes
 	{
+		if (!is_array($exclude)) {
+			$exclude = $exclude->getArrayCopy();
+		}
+
 		$asMeeting = $this->AsAMeeting();
 		if ($asMeeting !== null) {
 			$attrs = $asMeeting->notableAttributes(['involvement']);
@@ -3724,6 +3732,7 @@ public function notableAttributes(array $exclude = []): array
 			$attrs = self::scheduleStrings($this->invId, $this);
 			unset($attrs['combined']);
 			$attrs = array_filter($attrs);
+			$attrs = new NotableAttributes($attrs);
 		}
 		unset($schStr);
 
@@ -3779,6 +3788,8 @@ public function notableAttributes(array $exclude = []): array
 
 		$attrs = $this->processAttributeExclusions($attrs, $exclude);
 
+		$inv = $this;
+
 		/**
 		 * Allows for manipulation of the notable attributes strings for an Involvement.  An array of strings.
 		 * Typically, these are the standardized strings that appear on the Involvement to give information about it,
@@ -3789,10 +3800,10 @@ public function notableAttributes(array $exclude = []): array
 		 *
 		 * @since 0.0.11 Added
 		 *
-		 * @param string[] $attrs The list of notable attributes.
-		 * @param Involvement $this The Involvement object.
+		 * @param NotableAttributes $attrs The list of notable attributes.
+		 * @param Involvement $inv The Involvement object.
 		 */
-		return apply_filters("tp_involvement_attributes", $attrs, $this);
+		return apply_filters("tp_involvement_attributes", $attrs, $inv);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 569210bb..1d20b2e4 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -25,6 +25,7 @@
 use tp\TouchPointWP\Interfaces\scheduled;
 use tp\TouchPointWP\Utilities\DateFormats;
 use tp\TouchPointWP\Utilities\Http;
+use tp\TouchPointWP\Utilities\NotableAttributes;
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
 use WP_Query;
@@ -425,25 +426,37 @@ public function scheduleStringArray(): StringableArray
 	/**
 	 * Get notable attributes, such as gender restrictions, as strings.
 	 *
-	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 * @param array|StringableArray $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not
+	 * needed here.)
 	 *
-	 * @return string[]
+	 * @return NotableAttributes
 	 */
-	public function notableAttributes(array $exclude = []): array
+	public function notableAttributes(array|StringableArray $exclude = []): NotableAttributes
 	{
+		if (!is_array($exclude)) {
+			$exclude = $exclude->getArrayCopy();
+		}
+
 		if (in_array('involvement', $exclude)) {
-			$attrs = [];
+			$attrs = null;
 		} else {
 			try {
 				$attrs = $this->involvement()->notableAttributes(['date', 'datetime', 'time', 'firstLast']);
 			} catch (TouchPointWP_Exception) {
-				$attrs = [];
+				$attrs = null;
 			}
 		}
 
 		$d = $this->scheduleStringArray();
-
-		$attrs = [...$d, ...$attrs];
+		if ($attrs !== null) {
+			foreach ($attrs as $k => $v) {
+				if (is_string($v) && $v !== "") {
+					$d[$k] = $v;
+				}
+			}
+		}
+		$attrs = $d;
+		unset($d);
 
 		$status = $this->status_i18n(true);
 		if ($status) {
@@ -460,8 +473,8 @@ public function notableAttributes(array $exclude = []): array
 			$attrs['location'] = $loc;
 		}
 
-
 		$attrs = $this->processAttributeExclusions($attrs, $exclude);
+		$mtg = $this;
 
 		/**
 		 * Allows for manipulation of the notable attributes strings for a Meeting.  An array of strings.
@@ -472,11 +485,12 @@ public function notableAttributes(array $exclude = []): array
 		 * @see PostTypeCapable::notableAttributes()
 		 *
 		 * @since 0.0.90 Added
+		 * @since 0.0.96 Changed to use NotableAttributes instead of array.
 		 *
-		 * @param string[] $attrs The list of notable attributes.
-		 * @param Meeting $this The Meeting object.
+		 * @param NotableAttributes $attrs The list of notable attributes.
+		 * @param Meeting $mtg The Meeting object.
 		 */
-		return apply_filters("tp_meeting_attributes", $attrs, $this);
+		return apply_filters("tp_meeting_attributes", $attrs, $mtg);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 3b57fd6d..18278e8d 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -23,6 +23,7 @@
 use tp\TouchPointWP\Interfaces\hasGeo;
 use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Interfaces\updatesViaCron;
+use tp\TouchPointWP\Utilities\NotableAttributes;
 use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Error;
 use WP_Post;
@@ -1198,8 +1199,7 @@ public static function filterPublishDate($theDate, $format, $post = null): strin
 			if ($format == '') {
 				try {
 					$gp      = self::fromPost($post);
-					$theDate = $gp->notableAttributes();
-					$theDate = implode(TouchPointWP::$joiner, $theDate);
+					$theDate = $gp->notableAttributes()->join();
 				} catch (TouchPointWP_Exception $e) {
 				}
 			} else {
@@ -1261,33 +1261,40 @@ public static function getFamEvAsContent(string $ev, object $famObj, ?string $de
 	/**
 	 * Get notable attributes as strings.
 	 *
-	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 * @param array|StringableArray $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 *
+	 * @return NotableAttributes
+	 * @since 0.0.6 Added
+	 * @since 0.0.96 Changed to use NotableAttributes instead of array.
 	 *
-	 * @return string[]
 	 */
-	public function notableAttributes(array $exclude = []): array
+	public function notableAttributes(array|StringableArray $exclude = []): NotableAttributes
 	{
-		$r = [];
+		$attrs = new NotableAttributes();
+		if (!is_array($exclude)) {
+			$exclude = $exclude->getArrayCopy();
+		}
 
 		$l = $this->locationName();
 		if ($this->decoupleLocation) {
-			$r['secure'] = $l;
+			$attrs['secure'] = $l;
 		} elseif ($l) {
-			$r['location'] = $l;
+			$attrs['location'] = $l;
 		}
 		unset($l);
 
 		foreach ($this->category as $c) {
-			$r['category'] = $c->name;
+			$attrs['category'] = $c->name;
 		}
 
 		// Not shown on map (only if there is a map, and the partner isn't on it because they lack geo.)
 		if (self::$_hasArchiveMap && $this->geo === null && ! $this->decoupleLocation) {
-			$r['hidden'] = __("Not Shown on Map", "TouchPoint-WP");
+			$attrs['hidden'] = __("Not Shown on Map", "TouchPoint-WP");
 			TouchPointWP::requireScript("fontAwesome");  // For map icons
 		}
 
-		$r = $this->processAttributeExclusions($r, $exclude);
+		$attrs = $this->processAttributeExclusions($attrs, $exclude);
+		$partner = $this;
 
 		/**
 		 * Allows for manipulation of the notable attributes strings for an Partner.  An array of strings.
@@ -1298,11 +1305,12 @@ public function notableAttributes(array $exclude = []): array
 		 * @see PostTypeCapable::notableAttributes()
 		 *
 		 * @since 0.0.6 Added
+		 * @since 0.0.96 Changed to use NotableAttributes instead of array.
 		 *
-		 * @param string[] $attrs The list of notable attributes.
-		 * @param Partner $this The Partner object.
+		 * @param NotableAttributes $attrs The list of notable attributes.
+		 * @param Partner $partner The Partner object.
 		 */
-		return apply_filters("tp_partner_attributes", $r, $this);
+		return apply_filters("tp_partner_attributes", $attrs, $partner);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index 45bc3613..b66296c9 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -6,9 +6,12 @@
 
 namespace tp\TouchPointWP;
 
+use ArrayAccess;
 use tp\TouchPointWP\Interfaces\actionButtons;
 use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Interfaces\storedAsPost;
+use tp\TouchPointWP\Utilities\NotableAttributes;
+use tp\TouchPointWP\Utilities\StringableArray;
 use WP_Post;
 
 require_once 'Interfaces/actionButtons.php';
@@ -78,31 +81,31 @@ public function permalink(): string
 	/**
 	 * Get notable attributes.
 	 *
-	 * @param array $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
+	 * @param array|StringableArray $exclude Attributes listed here will be excluded.  (e.g. if shown for a parent, not needed here.)
 	 *
-	 * @return string[]
+	 * @return NotableAttributes
 	 */
-	public abstract function notableAttributes(array $exclude = []): array;
+	public abstract function notableAttributes(array|StringableArray $exclude = []): NotableAttributes;
 
 	/**
 	 * Handle exclusions for the notableAttributes $exclusion variable.
 	 *
 	 * Removes all array items that have a value or key contained in the $exclude array's values.
 	 *
-	 * @param array $subject
-	 * @param array $exclude
+	 * @param StringableArray $subject
+	 * @param array           $exclude
 	 *
-	 * @return array
+	 * @return NotableAttributes
 	 */
-	protected function processAttributeExclusions(array $subject, array $exclude): array
+	protected function processAttributeExclusions(StringableArray $subject, array $exclude): NotableAttributes
 	{
-		$subject = array_diff($subject, $exclude);
+		$subject = array_diff($subject->getArrayCopy(), $exclude);
 		foreach ($exclude as $e) {
 			if (isset($subject[$e])) {
 				unset($subject[$e]);
 			}
 		}
-		return $subject;
+		return new NotableAttributes($subject);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Utilities/NotableAttributes.php b/src/TouchPoint-WP/Utilities/NotableAttributes.php
new file mode 100644
index 00000000..235dc45f
--- /dev/null
+++ b/src/TouchPoint-WP/Utilities/NotableAttributes.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Utilities;
+
+use tp\TouchPointWP\TouchPointWP;
+
+/**
+ * A collection of things that can be cast to a string by gluing them together with a simple implode().
+ */
+class NotableAttributes extends StringableArray
+{
+	public function __construct($initialValue = [])
+	{
+		parent::__construct($initialValue);
+		$this->separator = TouchPointWP::$joiner;
+		$this->itemPrefix = '<span class="meta-text">';
+		$this->itemSuffix = "</span>";
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index e2f920f1..0561efe8 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -6,6 +6,7 @@
 namespace tp\TouchPointWP\Utilities;
 
 use ArrayObject;
+use tp\TouchPointWP\TouchPointWP;
 use tp\TouchPointWP\Utilities;
 
 /**
@@ -13,19 +14,22 @@
  */
 class StringableArray extends ArrayObject
 {
-	protected string $separator;
+	protected string $separator = "\n";
+	protected string $itemPrefix = "";
+	protected string $itemSuffix = "";
 
 	/**
 	 * StringableArray constructor.
 	 *
-	 * @param string $separator
 	 * @param object|array $array
 	 * @param int $flags
 	 * @param string $iteratorClass
+	 *
+	 * @since 0.0.90 Added
+	 * @since 0.0.96 Changed signature to reflect actual usage.
 	 */
-	public function __construct(string $separator = "\n ", object|array $array = [], int $flags = 0, string $iteratorClass = "ArrayIterator")
+	public function __construct(object|array $array = [], int $flags = 0, string $iteratorClass = "ArrayIterator")
 	{
-		$this->separator = $separator;
 		parent::__construct($array, $flags, $iteratorClass);
 	}
 
@@ -56,6 +60,16 @@ public function prepend(mixed $value, $key = null): void
 		$this->exchangeArray($array);
 	}
 
+	/**
+	 * Get the stringable array, as an array.
+	 *
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return $this->getArrayCopy();
+	}
+
 	/**
 	 * Determine if the stringable array (haystack) contains the given needle
 	 *
@@ -68,6 +82,16 @@ public function contains($needle): bool
 		return in_array($needle, $this->getArrayCopy());
 	}
 
+	/**
+	 * Get the keys of the array.
+	 *
+	 * @return array
+	 */
+	public function keys(): array
+	{
+		return array_keys($this->getArrayCopy());
+	}
+
 	/**
 	 * Standard method to stringify.
 	 *
@@ -82,17 +106,30 @@ public function __toString()
 	 * Link the items together with a given separator, which may be different from the separator used in the constructor.
 	 *
 	 * @param string|null $separator
+	 * @param string|null $prefix
+	 * @param string|null $postfix
 	 *
 	 * @return string
 	 *
 	 * @since 0.0.90 Added
+	 * @since 0.0.96 Added $prefix and $postfix parameters to allow for more flexible joining (and particularly, HTML).
 	 */
-	public function join(?string $separator = null): string
+	public function join(?string $separator = null, ?string $prefix = null, ?string $postfix = null): string
 	{
+		if ($this->count() === 0) {
+			return "";
+		}
 		if (is_null($separator)) {
 			$separator = $this->separator;
 		}
-		return implode($separator, $this->getArrayCopy());
+		if (is_null($prefix)) {
+			$prefix = $this->itemPrefix;
+		}
+		if (is_null($postfix)) {
+			$postfix = $this->itemSuffix;
+		}
+		$joiner = $postfix . $separator . $prefix;
+		return $prefix . implode($joiner, $this->getArrayCopy()) . $postfix;
 	}
 
 	/**
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index 3de1705f..af49238b 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -70,12 +70,8 @@
         <div class="TouchPointWP-detail-cell">
             <div class="TouchPointWP-detail-cell-section involvement-logistics">
                 <?php
-                $metaStrings = [];
-                foreach ($obj->notableAttributes() as $a)
-                {
-                    $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-                }
-                echo implode("<br />", $metaStrings);
+                $notableAttributes = $obj->notableAttributes();
+                echo $notableAttributes->join("<br />");
                 ?>
             </div>
             <div class="TouchPointWP-detail-cell-section involvement-actions">
diff --git a/src/templates/partner-single.php b/src/templates/partner-single.php
index 9f9c0ef6..17a68477 100644
--- a/src/templates/partner-single.php
+++ b/src/templates/partner-single.php
@@ -46,14 +46,7 @@
     <div class="section-inner TouchPointWP-detail">
         <div class="TouchPointWP-detail-cell">
             <div class="TouchPointWP-detail-cell-section partner-logistics" >
-                <?php
-                $metaStrings = [];
-                foreach ($prtnr->notableAttributes() as $a)
-                {
-                    $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-                }
-                echo implode("<br />", $metaStrings);
-                ?>
+                <?php echo $prtnr->notableAttributes()->join("<br />"); ?>
             </div>
             <div class="TouchPointWP-detail-cell-section partner-actions">
                 <?php echo $prtnr->getActionButtons('single-template', "btn button") ?>
diff --git a/src/templates/parts/involvement-list-item.php b/src/templates/parts/involvement-list-item.php
index 80b94498..c6391651 100644
--- a/src/templates/parts/involvement-list-item.php
+++ b/src/templates/parts/involvement-list-item.php
@@ -33,15 +33,8 @@
         <div class="post-meta-single post-meta-single-top">
             <span class="post-meta">
                 <?php
-
-                $metaStrings = [];
                 $notableAttributes = $inv->notableAttributes();
-                foreach ($notableAttributes as $a)
-                {
-                    $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-                }
-                echo implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
-
+                echo $notableAttributes;
                 ?>
             </span><!-- .post-meta -->
         </div>
@@ -69,16 +62,7 @@
             echo "<h3 class='inline'><a href=\"$link\" class='small'>$child->post_title</a></h3>";
 
 	        $childInv = PostTypeCapable::fromPost($child);
-
-	        $metaStrings = [];
-	        foreach ($childInv->notableAttributes($notableAttributes) as $a)
-	        {
-		        $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-	        }
-	        $m = implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
-            if ($m !== "") {
-                echo "<span class=\"post-meta\">$m</span>";
-            }
+            echo $childInv->notableAttributes($notableAttributes);
 
             echo "</div>";
         }
diff --git a/src/templates/parts/meeting-list-item.php b/src/templates/parts/meeting-list-item.php
index f3e45507..3faadf1c 100644
--- a/src/templates/parts/meeting-list-item.php
+++ b/src/templates/parts/meeting-list-item.php
@@ -29,15 +29,8 @@
         <div class="post-meta-single post-meta-single-top">
             <span class="post-meta">
                 <?php
-
-                $metaStrings = [];
                 $notableAttributes = $mtg->notableAttributes();
-                foreach ($notableAttributes as $a)
-                {
-                    $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-                }
-                echo implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
-
+                echo $notableAttributes
                 ?>
             </span><!-- .post-meta -->
         </div>
@@ -79,16 +72,7 @@
             echo "<h3 class='inline'><a href=\"$link\" class='small'>$child->post_title</a></h3>";
 
 	        $childInv = Involvement::fromPost($child);
-
-	        $metaStrings = [];
-	        foreach ($childInv->notableAttributes($notableAttributes) as $a)
-	        {
-		        $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-	        }
-	        $m = implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
-            if ($m !== "") {
-                echo "<span class=\"post-meta\">$m</span>";
-            }
+            echo $childInv->notableAttributes($notableAttributes);
 
             echo "</div>";
         }
@@ -128,16 +112,7 @@
 			echo "<h3 class='inline'><a href=\"$link\" class='small'>$child->post_title</a></h3>";
 
 			$childInv = Meeting::fromPost($child);
-
-			$metaStrings = [];
-			foreach ($childInv->notableAttributes($notableAttributes) as $a)
-			{
-				$metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-			}
-			$m = implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
-			if ($m !== "") {
-				echo "<span class=\"post-meta\">$m</span>";
-			}
+            echo $childInv->notableAttributes($notableAttributes);
 
 			echo "</div>";
 		}
diff --git a/src/templates/parts/partner-list-item.php b/src/templates/parts/partner-list-item.php
index b8c318af..7e3f4dbe 100644
--- a/src/templates/parts/partner-list-item.php
+++ b/src/templates/parts/partner-list-item.php
@@ -31,16 +31,7 @@
         </div>
         <div class="post-meta-list-item">
             <span class="post-meta">
-                <?php
-                $metaStrings = [];
-
-                foreach ($gp->notableAttributes() as $a)
-                {
-                    $metaStrings[] = sprintf( '<span class="meta-text">%s</span>', $a);
-                }
-
-                echo implode(tp\TouchPointWP\TouchPointWP::$joiner, $metaStrings);
-                ?>
+                <?php echo $gp->notableAttributes(); ?>
             </span><!-- .post-meta -->
         </div>
     </header><!-- .entry-header -->
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 2941fb51..8a93d1f8 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -57,6 +57,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Translation.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/PersonArray.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/StringableArray.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/NotableAttributes.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Session.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateFormats.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateTimeExtended.php";

From 35f89253c6db5ca69785554efcdac39f9267b492 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 9 Jun 2025 09:09:08 -0400
Subject: [PATCH 296/423] Initial TP-Inv-List Block

---
 .idea/libraries/Generated_files.xml           |   4 +
 blocks/inv-list/block.json                    |  17 +
 blocks/inv-list/index.js                      | 122 ++++++
 build.sh                                      |  13 +-
 buildPipeline/versionUpdate.js                |  23 +
 i18n/TouchPoint-WP-es_ES.po                   | 390 ++++++++++-------
 i18n/TouchPoint-WP.pot                        | 392 +++++++++++-------
 package.json                                  |   8 +-
 src/TouchPoint-WP/Blocks/BlocksController.php | 118 ++++++
 src/TouchPoint-WP/Involvement.php             |  37 +-
 src/TouchPoint-WP/TouchPointWP.php            |   4 +
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php   |   6 +
 touchpoint-wp.php                             |   2 +
 webpack.config.js                             |  28 ++
 wpml-config.xml                               |   2 +
 15 files changed, 836 insertions(+), 330 deletions(-)
 create mode 100644 blocks/inv-list/block.json
 create mode 100644 blocks/inv-list/index.js
 create mode 100644 buildPipeline/versionUpdate.js
 create mode 100644 src/TouchPoint-WP/Blocks/BlocksController.php
 create mode 100644 webpack.config.js

diff --git a/.idea/libraries/Generated_files.xml b/.idea/libraries/Generated_files.xml
index 11b1f82e..71c16549 100644
--- a/.idea/libraries/Generated_files.xml
+++ b/.idea/libraries/Generated_files.xml
@@ -5,6 +5,8 @@
         <item url="file://$PROJECT_DIR$/build/assets/js/base-defer.js" />
         <item url="file://$PROJECT_DIR$/build/assets/js/meeting-defer.js" />
         <item url="file://$PROJECT_DIR$/build/assets/js/partner-defer.js" />
+        <item url="file://$PROJECT_DIR$/build/blocks/inv-list/index.js" />
+        <item url="file://$PROJECT_DIR$/build/blocks/inv-list/index.min.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
@@ -14,6 +16,8 @@
       <root url="file://$PROJECT_DIR$/build/assets/js/base-defer.js" />
       <root url="file://$PROJECT_DIR$/build/assets/js/meeting-defer.js" />
       <root url="file://$PROJECT_DIR$/build/assets/js/partner-defer.js" />
+      <root url="file://$PROJECT_DIR$/build/blocks/inv-list/index.js" />
+      <root url="file://$PROJECT_DIR$/build/blocks/inv-list/index.min.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
diff --git a/blocks/inv-list/block.json b/blocks/inv-list/block.json
new file mode 100644
index 00000000..89062395
--- /dev/null
+++ b/blocks/inv-list/block.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "name": "touchpoint-wp/inv-list",
+  "version": "0.0.96",
+  "title": "Involvement List",
+  "category": "widgets",
+  "icon": "grid-view",
+  "description": "A list of Involvements from TouchPoint",
+  "supports": {
+    "html": false,
+    "ariaLabel": true,
+    "reusable": false
+  },
+  "textdomain": "TouchPoint-WP",
+  "editorScript": "file:./index.min.js"
+}
\ No newline at end of file
diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
new file mode 100644
index 00000000..e6861277
--- /dev/null
+++ b/blocks/inv-list/index.js
@@ -0,0 +1,122 @@
+/**
+ * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
+ * All files containing `style` keyword are bundled together. The code used
+ * gets applied both to the front of your site and to the editor.
+ *
+ * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
+ */
+// import './style.css';
+
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+import {__} from "@wordpress/i18n";
+
+/**
+ * Every block starts by registering a new block type definition.
+ *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/
+ */
+wp.blocks.registerBlockType( metadata.name, {
+	title: __("Involvement List", "TouchPoint-WP"),
+	category: metadata.category,
+	description: __("A list of Involvements from TouchPoint", "TouchPoint-WP"),
+	icon: metadata.icon,
+	apiVersion: metadata.apiVersion,
+	attributes: {
+		postType: {
+			type: 'string',
+			default: '',
+		},
+		division: {
+			type: 'integer',
+			default: 0,
+		},
+	},
+	edit: function(props) {
+		const { attributes, setAttributes } = props;
+		const { postType, division } = attributes;
+		const blockProps = wp.blockEditor.useBlockProps();
+		const additionalClasses = blockProps.className || '';
+
+		const [postTypeOptions, setPostTypeOptions] = wp.element.useState([]);
+		const [divisionChildren, setDivisionChildren] = wp.element.useState(null);
+
+		wp.element.useEffect(() => {
+			(async () => {
+				try {
+					const response = await fetch('/touchpoint-api/inv/posttypes');
+					const data = await response.json();
+					const formattedOptions = data.map((item) => ({
+						label: item.namePlural,
+						value: item.postType,
+					}));
+					setPostTypeOptions(formattedOptions);setPostTypeOptions(formattedOptions);
+					if (postType === '' && formattedOptions.length > 0) {
+						setAttributes({ postType: formattedOptions[0].value });
+					}
+				} catch (error) {
+					console.error('Error fetching post types:', error);
+				}
+			})();
+		}, []);
+
+		wp.element.useEffect(() => {
+			(async () => {
+				try {
+					const response = await fetch('/touchpoint-api/admin/divisions');
+					const data = await response.json();
+					const groupedOptions = [<option value='0' key={0}>{__("All", "TouchPoint-WP")}</option>];
+					const groupedData = data.reduce((acc, item) => {
+						const group = acc[item.pName] || [];
+						group.push(<option value={item.id} key={item.id}>{item.dName}</option>);
+						acc[item.pName] = group;
+						return acc;
+					}, {});
+					Object.entries(groupedData).forEach(([groupLabel, options]) => {
+						groupedOptions.push(<optgroup key={groupLabel} label={groupLabel}>{options}</optgroup>);
+					});
+					setDivisionChildren(groupedOptions);
+				} catch (error) {
+					console.error('Error fetching divisions:', error);
+				}
+			})();
+		}, []);
+
+		return (
+			<div {...blockProps}>
+				<wp.blockEditor.InspectorControls>
+					<wp.components.PanelBody title={__("Settings", "TouchPoint-WP")}>
+						<wp.components.SelectControl
+							label={__("Post Type", "TouchPoint-WP")}
+							value={postType}
+							options={postTypeOptions}
+							onChange={(value) => setAttributes({ postType: value })}
+						/>
+						<wp.components.SelectControl
+							label={__("Division", "TouchPoint-WP")}
+							value={division}
+							children={divisionChildren}
+							onChange={(value) => setAttributes({ division: Number(value) })}
+							__next40pxDefaultSize={true}
+							__nextHasNoMarginBottom={true}
+						/>
+					</wp.components.PanelBody>
+				</wp.blockEditor.InspectorControls>
+				<p>{`[TP-Inv-List class="${additionalClasses}" type="${postType}"${division !== 0 ? ` div="${division}"` : ""}]`}</p>
+			</div>
+		);
+	},
+	save: function(props) {
+		const { attributes } = props;
+		const { postType, division } = attributes;
+		const blockProps = wp.blockEditor.useBlockProps.save();
+		const additionalClasses = blockProps.className || '';
+
+		return (
+			`[TP-Inv-List class="${additionalClasses}" type="${postType}" div="${division}"]`
+		);
+	},
+
+} );
diff --git a/build.sh b/build.sh
index 7a31b13a..f02a61c6 100644
--- a/build.sh
+++ b/build.sh
@@ -9,6 +9,10 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 nvm install node
 
+# update version in various json files
+node ./buildPipeline/versionUpdate.js
+
+# update NPM packages
 npm update
 
 rm -r build
@@ -26,11 +30,10 @@ cp -r assets build
 cd ./build || exit
 cd ..
 
-
-# compile translations
-if [ ! -f wp-cli.phar ]; then
-    wget -O wp-cli.phar https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-fi
+# build blocks
+npm install -g @wordpress/scripts
+wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks
+wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php
 
 cp -r ./i18n ./build/i18n
 
diff --git a/buildPipeline/versionUpdate.js b/buildPipeline/versionUpdate.js
new file mode 100644
index 00000000..da0c8ac4
--- /dev/null
+++ b/buildPipeline/versionUpdate.js
@@ -0,0 +1,23 @@
+
+
+const fs = require('fs');
+
+// get the version in composer.json
+let version = JSON.parse(fs.readFileSync('./composer.json', 'utf8')).version;
+
+// update the version in package.json
+let packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+packageJson.version = version;
+fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, 2));
+
+// update the version in all blocks/*/block.json
+const blockFiles = fs.readdirSync('./blocks');
+
+blockFiles.forEach((blockFile) => {
+    const blockPath = `./blocks/${blockFile}/block.json`;
+    if (fs.existsSync(blockPath)) {
+        let blockJson = JSON.parse(fs.readFileSync(blockPath, 'utf8'));
+        blockJson.version = version;
+        fs.writeFileSync(blockPath, JSON.stringify(blockJson, null, 2));
+    }
+});
\ No newline at end of file
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 7a3d69d6..4d90565e 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -88,10 +88,10 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:178
 #: src/templates/admin/invKoForm.php:332
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:789
+#: src/TouchPoint-WP/Meeting.php:803
 #: src/TouchPoint-WP/Rsvp.php:77
-#: assets/js/base-defer.js:192
-#: assets/js/base-defer.js:1133
+#: assets/js/base-defer.js:195
+#: assets/js/base-defer.js:1113
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -124,13 +124,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:250
-#: src/TouchPoint-WP/Involvement.php:1872
+#: src/TouchPoint-WP/Involvement.php:1896
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:254
-#: src/TouchPoint-WP/Involvement.php:1898
+#: src/TouchPoint-WP/Involvement.php:1922
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -174,12 +174,14 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2142
+#: src/TouchPoint-WP/Involvement.php:2172
+#, php-format
 msgid "No %s Found."
 msgstr "No se encontraron %s"
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:20
+#, php-format
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
@@ -197,129 +199,131 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:514
+#: src/TouchPoint-WP/Involvement.php:515
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:519
+#: src/TouchPoint-WP/Involvement.php:520
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:526
+#: src/TouchPoint-WP/Involvement.php:527
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:532
+#: src/TouchPoint-WP/Involvement.php:533
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1747
-#: src/TouchPoint-WP/Partner.php:841
+#: src/TouchPoint-WP/Involvement.php:1771
+#: src/TouchPoint-WP/Partner.php:842
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Partner.php:865
+#: src/TouchPoint-WP/Involvement.php:1979
+#: src/TouchPoint-WP/Partner.php:866
+#, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3749
+#: src/TouchPoint-WP/Involvement.php:3787
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3752
+#: src/TouchPoint-WP/Involvement.php:3790
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3829
+#: src/TouchPoint-WP/Involvement.php:3869
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3899
-#: src/TouchPoint-WP/Involvement.php:3958
+#: src/TouchPoint-WP/Involvement.php:3939
+#: src/TouchPoint-WP/Involvement.php:3998
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3905
+#: src/TouchPoint-WP/Involvement.php:3945
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3909
+#: src/TouchPoint-WP/Involvement.php:3949
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3914
+#: src/TouchPoint-WP/Involvement.php:3954
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3917
+#: src/TouchPoint-WP/Involvement.php:3957
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3920
+#: src/TouchPoint-WP/Involvement.php:3960
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3923
+#: src/TouchPoint-WP/Involvement.php:3963
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3949
-#: assets/js/base-defer.js:1001
+#: src/TouchPoint-WP/Involvement.php:3989
+#: assets/js/base-defer.js:1004
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3846
-#: src/TouchPoint-WP/Partner.php:1345
+#: src/TouchPoint-WP/Involvement.php:3886
+#: src/TouchPoint-WP/Partner.php:1353
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:872
+#: src/TouchPoint-WP/Partner.php:873
+#, php-format
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1286
+#: src/TouchPoint-WP/Partner.php:1292
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
-#: src/TouchPoint-WP/Person.php:146
+#: src/TouchPoint-WP/Person.php:148
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr "No se proporcionó una identificación de usuario de WordPress para inicializar un objeto de persona."
 
-#: src/TouchPoint-WP/Person.php:638
+#: src/TouchPoint-WP/Person.php:640
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1187
+#: src/TouchPoint-WP/Person.php:1196
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:788
-#: src/TouchPoint-WP/Meeting.php:809
+#: src/TouchPoint-WP/Meeting.php:802
+#: src/TouchPoint-WP/Meeting.php:823
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2120
+#: src/TouchPoint-WP/TouchPointWP.php:2125
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2177
+#: src/TouchPoint-WP/TouchPointWP.php:2182
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2180
+#: src/TouchPoint-WP/TouchPointWP.php:2185
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2183
+#: src/TouchPoint-WP/TouchPointWP.php:2188
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2188
-#: src/TouchPoint-WP/TouchPointWP.php:2189
+#: src/TouchPoint-WP/TouchPointWP.php:2193
+#: src/TouchPoint-WP/TouchPointWP.php:2194
 msgid "Current Value"
 msgstr "Valor actual"
 
@@ -335,7 +339,7 @@ msgstr "Configuración de API no válida o incompleta."
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2403
+#: src/TouchPoint-WP/TouchPointWP.php:2408
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -779,6 +783,7 @@ msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
 #: src/TouchPoint-WP/Settings.php:1451
+#: blocks/inv-list/index.js:90
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -794,127 +799,127 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1466
+#: src/TouchPoint-WP/Person.php:1490
 #: src/TouchPoint-WP/Utilities.php:299
-#: assets/js/base-defer.js:18
+#: assets/js/base-defer.js:20
 msgid "and"
 msgstr "y"
 
-#: assets/js/base-defer.js:212
-#: assets/js/base-defer.js:1168
+#: assets/js/base-defer.js:215
+#: assets/js/base-defer.js:1148
 msgid "Your Location"
 msgstr "Tu ubicación"
 
-#: assets/js/base-defer.js:233
+#: assets/js/base-defer.js:236
 msgid "User denied the request for Geolocation."
 msgstr "El usuario denegó la solicitud de geolocalización."
 
-#: assets/js/base-defer.js:237
+#: assets/js/base-defer.js:240
 msgid "Location information is unavailable."
 msgstr "La información de ubicación no está disponible."
 
-#: assets/js/base-defer.js:241
+#: assets/js/base-defer.js:244
 msgid "The request to get user location timed out."
 msgstr "Se agotó el tiempo de espera de la solicitud para obtener la ubicación del usuario."
 
-#: assets/js/base-defer.js:245
+#: assets/js/base-defer.js:248
 msgid "An unknown error occurred."
 msgstr "Un error desconocido ocurrió."
 
-#: assets/js/base-defer.js:281
-#: assets/js/base-defer.js:291
+#: assets/js/base-defer.js:284
+#: assets/js/base-defer.js:294
 msgid "No geolocation option available."
 msgstr "No hay opción de geolocalización disponible."
 
-#: assets/js/base-defer.js:931
-#: assets/js/base-defer.js:968
-#: assets/js/base-defer.js:1425
+#: assets/js/base-defer.js:934
+#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:1406
 #: assets/js/meeting-defer.js:211
 msgid "Something strange happened."
 msgstr "Algo extraño sucedió."
 
-#: assets/js/base-defer.js:957
-#: assets/js/base-defer.js:1414
+#: assets/js/base-defer.js:960
+#: assets/js/base-defer.js:1395
 msgid "Your message has been sent."
 msgstr "Tu mensaje ha sido enviado."
 
-#: assets/js/base-defer.js:997
+#: assets/js/base-defer.js:1000
 msgid "Who is joining the group?"
 msgstr "¿Quién se une al grupo?"
 
-#: assets/js/base-defer.js:1002
-#: assets/js/base-defer.js:1060
-#: assets/js/base-defer.js:1376
-#: assets/js/base-defer.js:1469
+#: assets/js/base-defer.js:1005
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1357
+#: assets/js/base-defer.js:1450
 #: assets/js/meeting-defer.js:253
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: assets/js/base-defer.js:1015
+#: assets/js/base-defer.js:1018
 msgid "Select who should be added to the group."
 msgstr "Seleccione quién debe agregarse al grupo."
 
-#: assets/js/base-defer.js:1053
-#: assets/js/base-defer.js:1369
+#: assets/js/base-defer.js:1052
+#: assets/js/base-defer.js:1350
 msgid "From"
 msgstr "De"
 
-#: assets/js/base-defer.js:1054
-#: assets/js/base-defer.js:1370
+#: assets/js/base-defer.js:1053
+#: assets/js/base-defer.js:1351
 msgid "Message"
 msgstr "Mensaje"
 
-#: assets/js/base-defer.js:1069
-#: assets/js/base-defer.js:1385
+#: assets/js/base-defer.js:1068
+#: assets/js/base-defer.js:1366
 msgid "Please provide a message."
 msgstr "Proporcione un mensaje."
 
-#: assets/js/base-defer.js:1154
-#: assets/js/base-defer.js:1156
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1136
 msgid "We don't know where you are."
 msgstr "No sabemos dónde estás."
 
-#: assets/js/base-defer.js:1154
-#: assets/js/base-defer.js:1164
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1144
 msgid "Click here to use your actual location."
 msgstr "Haga clic aquí para usar su ubicación real."
 
-#: assets/js/base-defer.js:1315
-#: assets/js/base-defer.js:1332
+#: assets/js/base-defer.js:1296
+#: assets/js/base-defer.js:1313
 msgid "clear"
 msgstr "borrar"
 
-#: assets/js/base-defer.js:1321
+#: assets/js/base-defer.js:1302
 msgid "Other Relatives..."
 msgstr "Otros familiares..."
 
-#: assets/js/base-defer.js:1459
+#: assets/js/base-defer.js:1440
 msgid "Tell us about yourself."
 msgstr "Dinos sobre ti."
 
-#: assets/js/base-defer.js:1461
-#: assets/js/base-defer.js:1516
+#: assets/js/base-defer.js:1442
+#: assets/js/base-defer.js:1497
 msgid "Email Address"
 msgstr "Correo electrónico"
 
-#: assets/js/base-defer.js:1462
-#: assets/js/base-defer.js:1517
+#: assets/js/base-defer.js:1443
+#: assets/js/base-defer.js:1498
 msgid "Zip Code"
 msgstr "Condigo postal"
 
-#: assets/js/base-defer.js:1514
+#: assets/js/base-defer.js:1495
 msgid "Our system doesn't recognize you,<br />so we need a little more info."
 msgstr "Nuestro sistema no te reconoce.<br />Necesitamos un poco más de información."
 
-#: assets/js/base-defer.js:1518
+#: assets/js/base-defer.js:1499
 msgid "First Name"
 msgstr "Primer nombre"
 
-#: assets/js/base-defer.js:1519
+#: assets/js/base-defer.js:1500
 msgid "Last Name"
 msgstr "Apellido"
 
-#: assets/js/base-defer.js:1521
+#: assets/js/base-defer.js:1502
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -964,6 +969,7 @@ msgstr "Los scripts en TouchPoint que interactúan con este complemento están d
 
 #. translators: "RSVP for {Event Name}"  This is the heading on the RSVP modal.  The event name isn't translated because it comes from TouchPoint.
 #: assets/js/meeting-defer.js:233
+#, js-format
 msgid "RSVP for %s"
 msgstr "RSVP para %s"
 
@@ -974,55 +980,59 @@ msgstr[0] "Respuesta registrada"
 msgstr[1] "Respuestas registrada"
 
 #. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:920
+#: assets/js/base-defer.js:923
+#, js-format
 msgid "Added to %s"
 msgstr "Añadido a %s"
 
 #. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:981
+#: assets/js/base-defer.js:984
+#, js-format
 msgid "Join %s"
 msgstr "Únete %s"
 
 #. translators: %s is a person's name.  This is a heading for a contact modal.
-#: assets/js/base-defer.js:1352
+#: assets/js/base-defer.js:1333
+#, js-format
 msgid "Contact %s"
 msgstr "Contactar a %s"
 
 #. translators: %s is the name of an involvement.  This is a heading for a modal.
-#: assets/js/base-defer.js:1036
+#: assets/js/base-defer.js:1035
+#, js-format
 msgid "Contact the Leaders of %s"
 msgstr "Contacta a los líderes de %s"
 
-#: assets/js/base-defer.js:1059
-#: assets/js/base-defer.js:1375
+#: assets/js/base-defer.js:1058
+#: assets/js/base-defer.js:1356
 msgid "Send"
 msgstr "Envía"
 
-#: assets/js/base-defer.js:923
-#: assets/js/base-defer.js:934
-#: assets/js/base-defer.js:960
-#: assets/js/base-defer.js:971
-#: assets/js/base-defer.js:1417
-#: assets/js/base-defer.js:1428
+#: assets/js/base-defer.js:926
+#: assets/js/base-defer.js:937
+#: assets/js/base-defer.js:963
+#: assets/js/base-defer.js:974
+#: assets/js/base-defer.js:1398
+#: assets/js/base-defer.js:1409
 #: assets/js/meeting-defer.js:203
 #: assets/js/meeting-defer.js:214
 msgid "OK"
 msgstr "OK"
 
-#: assets/js/base-defer.js:1468
+#: assets/js/base-defer.js:1449
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1920
+#: src/TouchPoint-WP/Involvement.php:1944
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1933
+#: src/TouchPoint-WP/Involvement.php:1957
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1804
+#: src/TouchPoint-WP/Involvement.php:1828
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1184,72 +1194,81 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1921
+#: src/TouchPoint-WP/Involvement.php:1945
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1922
+#: src/TouchPoint-WP/Involvement.php:1946
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1963
-#: src/TouchPoint-WP/Partner.php:881
+#: src/TouchPoint-WP/Involvement.php:1987
+#: src/TouchPoint-WP/Partner.php:882
+#, php-format
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1966
-#: src/TouchPoint-WP/Partner.php:884
+#: src/TouchPoint-WP/Involvement.php:1990
+#: src/TouchPoint-WP/Partner.php:885
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1014
-#: src/TouchPoint-WP/Involvement.php:1046
-#: src/TouchPoint-WP/Involvement.php:1139
-#: src/TouchPoint-WP/Involvement.php:1163
+#: src/TouchPoint-WP/Involvement.php:1015
+#: src/TouchPoint-WP/Involvement.php:1047
+#: src/TouchPoint-WP/Involvement.php:1140
+#: src/TouchPoint-WP/Involvement.php:1164
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
+#, php-format
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1055
+#: src/TouchPoint-WP/Involvement.php:1056
+#, php-format
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1064
+#: src/TouchPoint-WP/Involvement.php:1065
+#, php-format
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1073
+#: src/TouchPoint-WP/Involvement.php:1074
+#, php-format
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1081
+#: src/TouchPoint-WP/Involvement.php:1082
+#, php-format
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1089
+#: src/TouchPoint-WP/Involvement.php:1090
+#, php-format
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1097
+#: src/TouchPoint-WP/Involvement.php:1098
+#, php-format
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3770
+#: src/TouchPoint-WP/Involvement.php:3808
+#, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr "%2.1fmi"
@@ -1266,35 +1285,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2083
+#: src/TouchPoint-WP/Involvement.php:2113
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2093
+#: src/TouchPoint-WP/Involvement.php:2123
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2112
+#: src/TouchPoint-WP/Involvement.php:2142
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:715
-#: src/TouchPoint-WP/TouchPointWP.php:1110
+#: src/TouchPoint-WP/Meeting.php:729
+#: src/TouchPoint-WP/TouchPointWP.php:1115
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:743
-#: src/TouchPoint-WP/TouchPointWP.php:370
+#: src/TouchPoint-WP/Meeting.php:757
+#: src/TouchPoint-WP/TouchPointWP.php:374
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:753
-#: src/TouchPoint-WP/TouchPointWP.php:379
+#: src/TouchPoint-WP/Meeting.php:767
+#: src/TouchPoint-WP/TouchPointWP.php:383
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:4066
-#: src/TouchPoint-WP/Involvement.php:4171
+#: src/TouchPoint-WP/Involvement.php:4106
+#: src/TouchPoint-WP/Involvement.php:4211
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1312,6 +1331,7 @@ msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:718
+#, php-format
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
@@ -1369,31 +1389,37 @@ msgstr "Importar campus como taxonomía. (Probablemente quieras hacer esto si ti
 
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:51
+#, php-format
 msgid "Search %s"
 msgstr "Buscar %s"
 
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:53
+#, php-format
 msgid "All %s"
 msgstr "Todos los %s"
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:55
+#, php-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:57
+#, php-format
 msgid "Update %s"
 msgstr "Actualizar %s"
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:59
+#, php-format
 msgid "Add New %s"
 msgstr "Agregar Nuevo %s"
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:61
+#, php-format
 msgid "New %s"
 msgstr "Nuevo %s"
 
@@ -1407,14 +1433,15 @@ msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
 #: src/TouchPoint-WP/Report.php:449
+#, php-format
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:274
+#: src/TouchPoint-WP/TouchPointWP.php:278
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1847
+#: src/TouchPoint-WP/Involvement.php:1871
 msgid "Language"
 msgstr "Idioma"
 
@@ -1426,7 +1453,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1473
+#: src/TouchPoint-WP/Person.php:1497
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1451,8 +1478,8 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4158
-#: src/TouchPoint-WP/Person.php:1855
+#: src/TouchPoint-WP/Involvement.php:4198
+#: src/TouchPoint-WP/Person.php:1879
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1468,30 +1495,30 @@ msgstr "El dominio de los enlaces profundos de su aplicación móvil, sin https
 msgid "Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package."
 msgstr "Una vez que haya configurado y guardado la configuración en esta página, utilice esta herramienta para generar los scripts necesarios para TouchPoint en un paquete de instalación conveniente."
 
-#: assets/js/base-defer.js:1502
+#: assets/js/base-defer.js:1483
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1710
+#: src/TouchPoint-WP/Person.php:1734
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4148
-#: src/TouchPoint-WP/Person.php:1872
+#: src/TouchPoint-WP/Involvement.php:4188
+#: src/TouchPoint-WP/Person.php:1896
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1612
+#: src/TouchPoint-WP/Person.php:1636
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:291
+#: src/TouchPoint-WP/Meeting.php:292
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:292
+#: src/TouchPoint-WP/Meeting.php:293
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1556,59 +1583,67 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:592
+#: src/TouchPoint-WP/Meeting.php:606
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:593
+#: src/TouchPoint-WP/Meeting.php:607
 msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#, php-format
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:153
+#, php-format
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#, php-format
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:164
+#, php-format
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/TouchPoint-WP/CalendarGrid.php:199
+#, php-format
 msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3858
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Involvement.php:3898
+#, php-format
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:454
+#: src/TouchPoint-WP/Meeting.php:467
 msgid "In the Past"
 msgstr "en el pasado"
 
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:527
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Meeting.php:541
+#, php-format
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1195
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Person.php:1209
+#, php-format
 msgid "Person in %s"
 msgstr "Persona en %s"
 
@@ -1668,28 +1703,30 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/Meeting.php:608
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:142
+#: src/TouchPoint-WP/Involvement.php:143
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1017
-#: src/TouchPoint-WP/Involvement.php:1040
+#: src/TouchPoint-WP/Involvement.php:1018
+#: src/TouchPoint-WP/Involvement.php:1041
+#, php-format
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:106
+#: src/TouchPoint-WP/Meeting.php:107
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
 #. translators: %1$s is the start date/time, %2$s is the end date/time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
 #: src/TouchPoint-WP/Utilities/DateFormats.php:331
+#, php-format
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
@@ -1715,35 +1752,41 @@ msgstr "j M Y"
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:364
+#, php-format
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#, php-format
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#, php-format
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#, php-format
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:238
+#, php-format
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
 #: src/TouchPoint-WP/CalendarGrid.php:279
+#, php-format
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
 
@@ -1781,10 +1824,12 @@ msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el ca
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/templates/involvement-single.php:49
+#, php-format
 msgid "This %s has been Cancelled."
 msgstr "Este %s ha sido Cancelado."
 
 #: src/templates/admin/invKoForm.php:210
+#: blocks/inv-list/index.js:98
 msgid "Division"
 msgstr "Division"
 
@@ -1796,7 +1841,7 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1041
+#: src/TouchPoint-WP/Involvement.php:1042
 msgid "All Day"
 msgstr "todo el dia"
 
@@ -1856,6 +1901,7 @@ msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
 #: src/TouchPoint-WP/Auth.php:135
+#, php-format
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
@@ -1871,7 +1917,7 @@ msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2379
+#: src/TouchPoint-WP/TouchPointWP.php:2384
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
@@ -1888,7 +1934,7 @@ msgstr "sin recoger"
 #: src/templates/admin/invKoForm.php:114
 #: src/TouchPoint-WP/Settings.php:984
 msgid "Collect Meetings only from Involvements without Schedules"
-msgstr ""
+msgstr "Recopilar reuniones solo de participaciones sin horarios"
 
 #: src/templates/admin/invKoForm.php:115
 #: src/TouchPoint-WP/Settings.php:988
@@ -1899,3 +1945,29 @@ msgstr "Recopilar reuniones solo de participaciones sin horarios"
 #: src/TouchPoint-WP/Settings.php:980
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
+
+#: blocks/inv-list/index.js:22
+msgid "Involvement List"
+msgstr "Lista de Participaciones"
+
+#: blocks/inv-list/index.js:24
+msgid "A list of Involvements from TouchPoint"
+msgstr "Una lista de participaciones de TouchPoint"
+
+#: blocks/inv-list/index.js:70
+msgid "All"
+msgstr "Todos"
+
+#: blocks/inv-list/index.js:92
+msgid "Post Type"
+msgstr "tipo de publicación"
+
+#: blocks/inv-list/block.json
+msgctxt "block title"
+msgid "Involvement List"
+msgstr "Lista de Participaciones"
+
+#: blocks/inv-list/block.json
+msgctxt "block description"
+msgid "A list of Involvements from TouchPoint"
+msgstr "Una lista de participaciones de TouchPoint"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index ec00ec5f..9308e33f 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,9 +9,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-05-01T19:21:04+00:00\n"
+"POT-Creation-Date: 2025-06-09T12:46:24+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.11.0\n"
+"X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
 
 #. Plugin Name of the plugin
@@ -71,10 +71,10 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:178
 #: src/templates/admin/invKoForm.php:332
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:789
+#: src/TouchPoint-WP/Meeting.php:803
 #: src/TouchPoint-WP/Rsvp.php:77
-#: assets/js/base-defer.js:192
-#: assets/js/base-defer.js:1133
+#: assets/js/base-defer.js:195
+#: assets/js/base-defer.js:1113
 msgid "Loading..."
 msgstr ""
 
@@ -192,6 +192,7 @@ msgid "Default Filters"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:210
+#: blocks/inv-list/index.js:98
 msgid "Division"
 msgstr ""
 
@@ -208,13 +209,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:250
-#: src/TouchPoint-WP/Involvement.php:1872
+#: src/TouchPoint-WP/Involvement.php:1896
 #: src/TouchPoint-WP/Taxonomies.php:750
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:254
-#: src/TouchPoint-WP/Involvement.php:1898
+#: src/TouchPoint-WP/Involvement.php:1922
 #: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Time of Day"
 msgstr ""
@@ -298,29 +299,33 @@ msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/templates/involvement-single.php:49
+#, php-format
 msgid "This %s has been Cancelled."
 msgstr ""
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:291
+#: src/TouchPoint-WP/Meeting.php:292
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2142
+#: src/TouchPoint-WP/Involvement.php:2172
+#, php-format
 msgid "No %s Found."
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:20
+#, php-format
 msgid "%s will be imported overnight for the first time."
 msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3770
+#: src/TouchPoint-WP/Involvement.php:3808
+#, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
@@ -343,6 +348,7 @@ msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
 #: src/TouchPoint-WP/Auth.php:135
+#, php-format
 msgid "Sign in with %s"
 msgstr ""
 
@@ -357,11 +363,13 @@ msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/TouchPoint-WP/CalendarGrid.php:199
+#, php-format
 msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
 #: src/TouchPoint-WP/CalendarGrid.php:279
+#, php-format
 msgid "There are no %s published for this month."
 msgstr ""
 
@@ -374,304 +382,318 @@ msgstr ""
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:142
+#: src/TouchPoint-WP/Involvement.php:143
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:514
+#: src/TouchPoint-WP/Involvement.php:515
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:519
+#: src/TouchPoint-WP/Involvement.php:520
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:526
+#: src/TouchPoint-WP/Involvement.php:527
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:532
+#: src/TouchPoint-WP/Involvement.php:533
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1014
-#: src/TouchPoint-WP/Involvement.php:1046
-#: src/TouchPoint-WP/Involvement.php:1139
-#: src/TouchPoint-WP/Involvement.php:1163
+#: src/TouchPoint-WP/Involvement.php:1015
+#: src/TouchPoint-WP/Involvement.php:1047
+#: src/TouchPoint-WP/Involvement.php:1140
+#: src/TouchPoint-WP/Involvement.php:1164
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
+#, php-format
 msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1017
-#: src/TouchPoint-WP/Involvement.php:1040
+#: src/TouchPoint-WP/Involvement.php:1018
+#: src/TouchPoint-WP/Involvement.php:1041
+#, php-format
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1041
+#: src/TouchPoint-WP/Involvement.php:1042
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1055
+#: src/TouchPoint-WP/Involvement.php:1056
+#, php-format
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1064
+#: src/TouchPoint-WP/Involvement.php:1065
+#, php-format
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1073
+#: src/TouchPoint-WP/Involvement.php:1074
+#, php-format
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1081
+#: src/TouchPoint-WP/Involvement.php:1082
+#, php-format
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1089
+#: src/TouchPoint-WP/Involvement.php:1090
+#, php-format
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1097
+#: src/TouchPoint-WP/Involvement.php:1098
+#, php-format
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1747
-#: src/TouchPoint-WP/Partner.php:841
+#: src/TouchPoint-WP/Involvement.php:1771
+#: src/TouchPoint-WP/Partner.php:842
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1804
+#: src/TouchPoint-WP/Involvement.php:1828
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1847
+#: src/TouchPoint-WP/Involvement.php:1871
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1920
+#: src/TouchPoint-WP/Involvement.php:1944
 #: src/TouchPoint-WP/Taxonomies.php:869
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1921
+#: src/TouchPoint-WP/Involvement.php:1945
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1922
+#: src/TouchPoint-WP/Involvement.php:1946
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1933
+#: src/TouchPoint-WP/Involvement.php:1957
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Partner.php:865
+#: src/TouchPoint-WP/Involvement.php:1979
+#: src/TouchPoint-WP/Partner.php:866
+#, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1963
-#: src/TouchPoint-WP/Partner.php:881
+#: src/TouchPoint-WP/Involvement.php:1987
+#: src/TouchPoint-WP/Partner.php:882
+#, php-format
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1966
-#: src/TouchPoint-WP/Partner.php:884
+#: src/TouchPoint-WP/Involvement.php:1990
+#: src/TouchPoint-WP/Partner.php:885
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2083
+#: src/TouchPoint-WP/Involvement.php:2113
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2093
+#: src/TouchPoint-WP/Involvement.php:2123
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2112
+#: src/TouchPoint-WP/Involvement.php:2142
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3749
+#: src/TouchPoint-WP/Involvement.php:3787
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3752
+#: src/TouchPoint-WP/Involvement.php:3790
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3829
+#: src/TouchPoint-WP/Involvement.php:3869
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3846
-#: src/TouchPoint-WP/Partner.php:1345
+#: src/TouchPoint-WP/Involvement.php:3886
+#: src/TouchPoint-WP/Partner.php:1353
 msgid "Show on Map"
 msgstr ""
 
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3858
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Involvement.php:3898
+#, php-format
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3899
-#: src/TouchPoint-WP/Involvement.php:3958
+#: src/TouchPoint-WP/Involvement.php:3939
+#: src/TouchPoint-WP/Involvement.php:3998
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3905
+#: src/TouchPoint-WP/Involvement.php:3945
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3909
+#: src/TouchPoint-WP/Involvement.php:3949
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3914
+#: src/TouchPoint-WP/Involvement.php:3954
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3917
+#: src/TouchPoint-WP/Involvement.php:3957
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3920
+#: src/TouchPoint-WP/Involvement.php:3960
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3923
+#: src/TouchPoint-WP/Involvement.php:3963
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3949
-#: assets/js/base-defer.js:1001
+#: src/TouchPoint-WP/Involvement.php:3989
+#: assets/js/base-defer.js:1004
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4066
-#: src/TouchPoint-WP/Involvement.php:4171
+#: src/TouchPoint-WP/Involvement.php:4106
+#: src/TouchPoint-WP/Involvement.php:4211
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4148
-#: src/TouchPoint-WP/Person.php:1872
+#: src/TouchPoint-WP/Involvement.php:4188
+#: src/TouchPoint-WP/Person.php:1896
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4158
-#: src/TouchPoint-WP/Person.php:1855
+#: src/TouchPoint-WP/Involvement.php:4198
+#: src/TouchPoint-WP/Person.php:1879
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:106
+#: src/TouchPoint-WP/Meeting.php:107
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:292
+#: src/TouchPoint-WP/Meeting.php:293
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:454
+#: src/TouchPoint-WP/Meeting.php:467
 msgid "In the Past"
 msgstr ""
 
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:527
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Meeting.php:541
+#, php-format
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:592
+#: src/TouchPoint-WP/Meeting.php:606
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:593
+#: src/TouchPoint-WP/Meeting.php:607
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:594
+#: src/TouchPoint-WP/Meeting.php:608
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:715
-#: src/TouchPoint-WP/TouchPointWP.php:1110
+#: src/TouchPoint-WP/Meeting.php:729
+#: src/TouchPoint-WP/TouchPointWP.php:1115
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:743
-#: src/TouchPoint-WP/TouchPointWP.php:370
+#: src/TouchPoint-WP/Meeting.php:757
+#: src/TouchPoint-WP/TouchPointWP.php:374
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:753
-#: src/TouchPoint-WP/TouchPointWP.php:379
+#: src/TouchPoint-WP/Meeting.php:767
+#: src/TouchPoint-WP/TouchPointWP.php:383
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:788
-#: src/TouchPoint-WP/Meeting.php:809
+#: src/TouchPoint-WP/Meeting.php:802
+#: src/TouchPoint-WP/Meeting.php:823
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:872
+#: src/TouchPoint-WP/Partner.php:873
+#, php-format
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1286
+#: src/TouchPoint-WP/Partner.php:1292
 msgid "Not Shown on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:146
+#: src/TouchPoint-WP/Person.php:148
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:638
+#: src/TouchPoint-WP/Person.php:640
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1187
+#: src/TouchPoint-WP/Person.php:1196
 msgid "Contact"
 msgstr ""
 
-#. Translators: %s is the system name.  "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1195
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Person.php:1209
+#, php-format
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1466
+#: src/TouchPoint-WP/Person.php:1490
 #: src/TouchPoint-WP/Utilities.php:299
-#: assets/js/base-defer.js:18
+#: assets/js/base-defer.js:20
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1473
+#: src/TouchPoint-WP/Person.php:1497
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1612
+#: src/TouchPoint-WP/Person.php:1636
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1710
+#: src/TouchPoint-WP/Person.php:1734
 msgid "You may need to sign in."
 msgstr ""
 
@@ -685,6 +707,7 @@ msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
 #: src/TouchPoint-WP/Report.php:449
+#, php-format
 msgid "Updated on %1$s at %2$s"
 msgstr ""
 
@@ -1306,6 +1329,7 @@ msgid "TouchPoint-WP"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:1451
+#: blocks/inv-list/index.js:90
 msgid "Settings"
 msgstr ""
 
@@ -1335,31 +1359,37 @@ msgstr ""
 
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:51
+#, php-format
 msgid "Search %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:53
+#, php-format
 msgid "All %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:55
+#, php-format
 msgid "Edit %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:57
+#, php-format
 msgid "Update %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:59
+#, php-format
 msgid "Add New %s"
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:61
+#, php-format
 msgid "New %s"
 msgstr ""
 
@@ -1373,6 +1403,7 @@ msgstr ""
 
 #. translators: %s: taxonomy name, singular
 #: src/TouchPoint-WP/Taxonomies.php:718
+#, php-format
 msgid "Classify things by %s."
 msgstr ""
 
@@ -1424,36 +1455,36 @@ msgstr ""
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:274
+#: src/TouchPoint-WP/TouchPointWP.php:278
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2120
+#: src/TouchPoint-WP/TouchPointWP.php:2125
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2177
+#: src/TouchPoint-WP/TouchPointWP.php:2182
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2180
+#: src/TouchPoint-WP/TouchPointWP.php:2185
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2183
+#: src/TouchPoint-WP/TouchPointWP.php:2188
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2188
-#: src/TouchPoint-WP/TouchPointWP.php:2189
+#: src/TouchPoint-WP/TouchPointWP.php:2193
+#: src/TouchPoint-WP/TouchPointWP.php:2194
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2379
+#: src/TouchPoint-WP/TouchPointWP.php:2384
 msgid "People Count Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2403
+#: src/TouchPoint-WP/TouchPointWP.php:2408
 msgid "People Query Failed"
 msgstr ""
 
@@ -1574,6 +1605,7 @@ msgstr ""
 #. translators: %1$s is the start date/time, %2$s is the end date/time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:89
 #: src/TouchPoint-WP/Utilities/DateFormats.php:331
+#, php-format
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
@@ -1619,24 +1651,28 @@ msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#, php-format
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:153
+#, php-format
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#, php-format
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:164
+#, php-format
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
@@ -1663,192 +1699,201 @@ msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#, php-format
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#, php-format
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#, php-format
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
 #: src/TouchPoint-WP/Utilities/DateFormats.php:238
+#, php-format
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
 #: src/TouchPoint-WP/Utilities/DateFormats.php:364
+#, php-format
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""
 
-#: assets/js/base-defer.js:212
-#: assets/js/base-defer.js:1168
+#: assets/js/base-defer.js:215
+#: assets/js/base-defer.js:1148
 msgid "Your Location"
 msgstr ""
 
-#: assets/js/base-defer.js:233
+#: assets/js/base-defer.js:236
 msgid "User denied the request for Geolocation."
 msgstr ""
 
-#: assets/js/base-defer.js:237
+#: assets/js/base-defer.js:240
 msgid "Location information is unavailable."
 msgstr ""
 
-#: assets/js/base-defer.js:241
+#: assets/js/base-defer.js:244
 msgid "The request to get user location timed out."
 msgstr ""
 
-#: assets/js/base-defer.js:245
+#: assets/js/base-defer.js:248
 msgid "An unknown error occurred."
 msgstr ""
 
-#: assets/js/base-defer.js:281
-#: assets/js/base-defer.js:291
+#: assets/js/base-defer.js:284
+#: assets/js/base-defer.js:294
 msgid "No geolocation option available."
 msgstr ""
 
 #. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:920
+#: assets/js/base-defer.js:923
+#, js-format
 msgid "Added to %s"
 msgstr ""
 
-#: assets/js/base-defer.js:923
-#: assets/js/base-defer.js:934
-#: assets/js/base-defer.js:960
-#: assets/js/base-defer.js:971
-#: assets/js/base-defer.js:1417
-#: assets/js/base-defer.js:1428
+#: assets/js/base-defer.js:926
+#: assets/js/base-defer.js:937
+#: assets/js/base-defer.js:963
+#: assets/js/base-defer.js:974
+#: assets/js/base-defer.js:1398
+#: assets/js/base-defer.js:1409
 #: assets/js/meeting-defer.js:203
 #: assets/js/meeting-defer.js:214
 msgid "OK"
 msgstr ""
 
-#: assets/js/base-defer.js:931
-#: assets/js/base-defer.js:968
-#: assets/js/base-defer.js:1425
+#: assets/js/base-defer.js:934
+#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:1406
 #: assets/js/meeting-defer.js:211
 msgid "Something strange happened."
 msgstr ""
 
-#: assets/js/base-defer.js:957
-#: assets/js/base-defer.js:1414
+#: assets/js/base-defer.js:960
+#: assets/js/base-defer.js:1395
 msgid "Your message has been sent."
 msgstr ""
 
 #. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:981
+#: assets/js/base-defer.js:984
+#, js-format
 msgid "Join %s"
 msgstr ""
 
-#: assets/js/base-defer.js:997
+#: assets/js/base-defer.js:1000
 msgid "Who is joining the group?"
 msgstr ""
 
-#: assets/js/base-defer.js:1002
-#: assets/js/base-defer.js:1060
-#: assets/js/base-defer.js:1376
-#: assets/js/base-defer.js:1469
+#: assets/js/base-defer.js:1005
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1357
+#: assets/js/base-defer.js:1450
 #: assets/js/meeting-defer.js:253
 msgid "Cancel"
 msgstr ""
 
-#: assets/js/base-defer.js:1015
+#: assets/js/base-defer.js:1018
 msgid "Select who should be added to the group."
 msgstr ""
 
 #. translators: %s is the name of an involvement.  This is a heading for a modal.
-#: assets/js/base-defer.js:1036
+#: assets/js/base-defer.js:1035
+#, js-format
 msgid "Contact the Leaders of %s"
 msgstr ""
 
-#: assets/js/base-defer.js:1053
-#: assets/js/base-defer.js:1369
+#: assets/js/base-defer.js:1052
+#: assets/js/base-defer.js:1350
 msgid "From"
 msgstr ""
 
-#: assets/js/base-defer.js:1054
-#: assets/js/base-defer.js:1370
+#: assets/js/base-defer.js:1053
+#: assets/js/base-defer.js:1351
 msgid "Message"
 msgstr ""
 
-#: assets/js/base-defer.js:1059
-#: assets/js/base-defer.js:1375
+#: assets/js/base-defer.js:1058
+#: assets/js/base-defer.js:1356
 msgid "Send"
 msgstr ""
 
-#: assets/js/base-defer.js:1069
-#: assets/js/base-defer.js:1385
+#: assets/js/base-defer.js:1068
+#: assets/js/base-defer.js:1366
 msgid "Please provide a message."
 msgstr ""
 
-#: assets/js/base-defer.js:1154
-#: assets/js/base-defer.js:1156
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1136
 msgid "We don't know where you are."
 msgstr ""
 
-#: assets/js/base-defer.js:1154
-#: assets/js/base-defer.js:1164
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1144
 msgid "Click here to use your actual location."
 msgstr ""
 
-#: assets/js/base-defer.js:1315
-#: assets/js/base-defer.js:1332
+#: assets/js/base-defer.js:1296
+#: assets/js/base-defer.js:1313
 msgid "clear"
 msgstr ""
 
-#: assets/js/base-defer.js:1321
+#: assets/js/base-defer.js:1302
 msgid "Other Relatives..."
 msgstr ""
 
 #. translators: %s is a person's name.  This is a heading for a contact modal.
-#: assets/js/base-defer.js:1352
+#: assets/js/base-defer.js:1333
+#, js-format
 msgid "Contact %s"
 msgstr ""
 
-#: assets/js/base-defer.js:1459
+#: assets/js/base-defer.js:1440
 msgid "Tell us about yourself."
 msgstr ""
 
-#: assets/js/base-defer.js:1461
-#: assets/js/base-defer.js:1516
+#: assets/js/base-defer.js:1442
+#: assets/js/base-defer.js:1497
 msgid "Email Address"
 msgstr ""
 
-#: assets/js/base-defer.js:1462
-#: assets/js/base-defer.js:1517
+#: assets/js/base-defer.js:1443
+#: assets/js/base-defer.js:1498
 msgid "Zip Code"
 msgstr ""
 
-#: assets/js/base-defer.js:1468
+#: assets/js/base-defer.js:1449
 msgid "Next"
 msgstr ""
 
-#: assets/js/base-defer.js:1502
+#: assets/js/base-defer.js:1483
 msgid "Something went wrong."
 msgstr ""
 
-#: assets/js/base-defer.js:1514
+#: assets/js/base-defer.js:1495
 msgid "Our system doesn't recognize you,<br />so we need a little more info."
 msgstr ""
 
-#: assets/js/base-defer.js:1518
+#: assets/js/base-defer.js:1499
 msgid "First Name"
 msgstr ""
 
-#: assets/js/base-defer.js:1519
+#: assets/js/base-defer.js:1500
 msgid "Last Name"
 msgstr ""
 
-#: assets/js/base-defer.js:1521
+#: assets/js/base-defer.js:1502
 msgid "Phone"
 msgstr ""
 
@@ -1864,6 +1909,7 @@ msgstr[1] ""
 
 #. translators: "RSVP for {Event Name}"  This is the heading on the RSVP modal.  The event name isn't translated because it comes from TouchPoint.
 #: assets/js/meeting-defer.js:233
+#, js-format
 msgid "RSVP for %s"
 msgstr ""
 
@@ -1902,3 +1948,29 @@ msgstr ""
 #: assets/js/meeting-defer.js:271
 msgid "Nothing to submit."
 msgstr ""
+
+#: blocks/inv-list/index.js:22
+msgid "Involvement List"
+msgstr ""
+
+#: blocks/inv-list/index.js:24
+msgid "A list of Involvements from TouchPoint"
+msgstr ""
+
+#: blocks/inv-list/index.js:70
+msgid "All"
+msgstr ""
+
+#: blocks/inv-list/index.js:92
+msgid "Post Type"
+msgstr ""
+
+#: blocks/inv-list/block.json
+msgctxt "block title"
+msgid "Involvement List"
+msgstr ""
+
+#: blocks/inv-list/block.json
+msgctxt "block description"
+msgid "A list of Involvements from TouchPoint"
+msgstr ""
diff --git a/package.json b/package.json
index ddbe5cce..f6ff979a 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,12 @@
   },
   "homepage": "https://github.com/TenthPres/TouchPoint-WP#readme",
   "devDependencies": {
+    "@wordpress/block-editor": "^14.17.0",
+    "@wordpress/blocks": "^14.11.0",
+    "@wordpress/env": "^10.22.0",
+    "@wordpress/i18n": "^5.22.0",
+    "@wordpress/scripts": "^30.15.0",
+    "style-loader": "^4.0.0",
     "uglify-js": "^3.17.4"
   }
-}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
new file mode 100644
index 00000000..c167c16d
--- /dev/null
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * @package TouchPointWP
+ */
+namespace tp\TouchPointWP\Blocks;
+
+use tp\TouchPointWP\TouchPointWP;
+
+abstract class BlocksController
+{
+
+	/**
+	 * Registers the block using a `blocks-manifest.php` file, which improves the performance of block type registration.
+	 * Behind the scenes, it also registers all assets so they can be enqueued
+	 * through the block editor in the corresponding context.
+	 *
+	 * @see https://make.wordpress.org/core/2025/03/13/more-efficient-block-type-registration-in-6-8/
+	 * @see https://make.wordpress.org/core/2024/10/17/new-block-type-registration-apis-to-improve-performance-in-wordpress-6-7/
+	 */
+	public static function init(): void
+	{
+		$blocksRoot = TouchPointWP::$dir . '/blocks/';
+
+		// Hook the enqueue function
+		add_action('enqueue_block_editor_assets', [BlocksController::class, 'enqueueBlockAssets']);
+		add_action('wp_enqueue_scripts', [BlocksController::class, 'enqueueBlockAssets']);
+
+		/**
+		 * Registers the block(s) metadata from the `blocks-manifest.php` and registers the block type(s)
+		 * based on the registered block metadata.
+		 * Added in WordPress 6.8 to simplify the block metadata registration process added in WordPress 6.7.
+		 *
+		 * @see https://make.wordpress.org/core/2025/03/13/more-efficient-block-type-registration-in-6-8/
+		 */
+		if (function_exists('wp_register_block_types_from_metadata_collection')) {
+			wp_register_block_types_from_metadata_collection($blocksRoot, $blocksRoot . 'blocks-manifest.php');
+			return;
+		}
+
+		/**
+		 * Registers the block(s) metadata from the `blocks-manifest.php` file.
+		 * Added to WordPress 6.7 to improve the performance of block type registration.
+		 *
+		 * @see https://make.wordpress.org/core/2024/10/17/new-block-type-registration-apis-to-improve-performance-in-wordpress-6-7/
+		 */
+		if (function_exists('wp_register_block_metadata_collection')) {
+			wp_register_block_metadata_collection($blocksRoot, $blocksRoot . 'blocks-manifest.php');
+		}
+
+		/**
+		 * Registers the block type(s) in the `blocks-manifest.php` file.
+		 *
+		 * @see https://developer.wordpress.org/reference/functions/register_block_type/
+		 */
+		$manifest_data = require $blocksRoot . '/blocks-manifest.php';
+		foreach ($manifest_data as $block_type) {
+			register_block_type($block_type['name'], $block_type);
+		}
+	}
+
+	public static function enqueueBlockAssets(): void
+	{
+		$blocksRoot = TouchPointWP::$dir . '/blocks/';
+		$manifestPath = $blocksRoot . 'blocks-manifest.php';
+
+		if (!file_exists($manifestPath)) {
+			return;
+		}
+
+		$manifest_data = require $manifestPath;
+
+		foreach ($manifest_data as $block_name => $block_metadata) {
+			$block_dir = $blocksRoot . $block_name;
+
+			if (isset($block_metadata['editorScript'])) {
+				$fileName = substr($block_metadata['editorScript'], 7);
+				wp_enqueue_script(
+					"{$block_name}-editor-script",
+					plugins_url("$block_name/$fileName", $block_dir),
+					['wp-blocks', 'wp-element', 'wp-editor'],
+					TouchPointWP::VERSION
+				);
+			}
+
+			if (isset($block_metadata['editorStyle'])) {
+				$fileName = substr($block_metadata['editorStyle'], 7);
+				wp_enqueue_style(
+					"{$block_name}-editor-style",
+					plugins_url("$block_name/$fileName", $block_dir),
+					[],
+					TouchPointWP::VERSION
+				);
+			}
+
+			if (isset($block_metadata['style'])) {
+				$fileName = substr($block_metadata['style'], 7);
+				wp_enqueue_style(
+					"{$block_name}-style",
+					plugins_url("$block_name/$fileName", $block_dir),
+					[],
+					TouchPointWP::VERSION
+				);
+			}
+
+			if (isset($block_metadata['viewScript'])) {
+				$fileName = substr($block_metadata['viewScript'], 7);
+				wp_enqueue_script(
+					"{$block_name}-view-script",
+					plugins_url("$block_name/$fileName", $block_dir),
+					[],
+					TouchPointWP::VERSION
+				);
+			}
+		}
+	}
+}
+
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 84805cf4..f056e0e4 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -69,7 +69,7 @@ class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo
 	protected const MEETING_STRATEGY_MULTIPLE = 2;
 
 	public const CRON_HOOK = TouchPointWP::HOOK_PREFIX . "inv_cron_hook";
-	public const CRON_OFFSET = 86400 + 3600;
+	public const CRON_OFFSET = 86400 - 3600;
 
 	protected static bool $_hasUsedMap = false;
 	protected static bool $_hasArchiveMap = false;
@@ -374,7 +374,7 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 		$startTime = microtime(true);
 
 		// Prevent other threads from attempting for an hour.
-		TouchPointWP::instance()->settings->set('inv_cron_last_run', time() - self::CRON_OFFSET + 3600);
+		TouchPointWP::instance()->settings->set('inv_cron_last_run', time() + 3600);
 
 		$verbose &= TouchPointWP::currentUserIsAdmin();
 
@@ -1267,6 +1267,26 @@ public static function getPostTypes(): array
 		return $r;
 	}
 
+
+	/**
+	 * Get an array of Involvement Post Types, with some basic info
+	 *
+	 * @return array[]
+	 */
+	public static function getPostTypesSummary(): array
+	{
+		$r = [];
+		foreach (self::allTypeSettings() as $pt) {
+			$r[] = [
+				/** @var Involvement_PostTypeSettings $pt */
+				'postType' => $pt->postTypeWithoutPrefix(),
+				'nameSingular' => $pt->nameSingular,
+				'namePlural' => $pt->namePlural
+			];
+		}
+		return $r;
+	}
+
 	/**
 	 * Display action buttons for an involvement.  Takes an id parameter for the Involvement ID.  If not provided,
 	 * the current post will be used.
@@ -2052,6 +2072,13 @@ public static function api(array $uri): bool
 				self::ajaxNearby();
 				exit;
 
+			/** @noinspection SpellCheckingInspection */
+			case "posttypes":
+				// Return the post types that are available for involvements.
+				header('Content-Type: application/json');
+				echo json_encode(Involvement::getPostTypesSummary());
+				exit;
+
 			case "force-sync":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
 				echo self::updateFromTouchPoint(true);
@@ -2294,9 +2321,6 @@ public static function load(): bool
 		/// Syncing ///
 		///////////////
 
-		// Do an update if needed.
-		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'checkUpdates']);
-
 		// Setup cron for updating Involvements daily.
 		add_action(self::CRON_HOOK, [self::class, 'updateCron']);
 		if ( ! wp_next_scheduled(self::CRON_HOOK)) {
@@ -2308,6 +2332,9 @@ public static function load(): bool
 			);
 		}
 
+		// Do an update if needed.
+		add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'checkUpdates']);
+
 		return true;
 	}
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 6fbe7eec..c2402273 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -7,6 +7,7 @@
 
 use JsonException;
 use stdClass;
+use tp\TouchPointWP\Blocks\BlocksController;
 use tp\TouchPointWP\Utilities\Cleanup;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\Session;
@@ -233,6 +234,9 @@ protected function __construct(string $file = '')
 		// Register frontend JS & CSS.
 		add_action('init', [$this, 'registerScriptsAndStyles'], 0);
 
+		// Register blocks
+		add_action('init', [BlocksController::class, 'init']);
+
 		add_action('wp_print_footer_scripts', [$this, 'printDynamicFooterScripts'], 1000);
 		add_action('admin_print_footer_scripts', [$this, 'printDynamicFooterScripts'], 1000);
 
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 0888657a..92b9a334 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -50,6 +50,12 @@ public static function api(array $uri): bool
 				echo json_encode($mt);
 				exit;
 
+			case "divisions":
+				header('Content-Type: application/json');
+				$divs = TouchPointWP::instance()->getDivisions();
+				echo json_encode($divs);
+				exit;
+
 			case self::API_ENDPOINT_SCRIPTZIP:
 				if ( ! TouchPointWP::currentUserIsAdmin()) {
 					return false;
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 8a93d1f8..da743135 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -65,6 +65,8 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/Taxonomies.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/hasGeo.php";
 
+	require_once __DIR__ . "/src/TouchPoint-WP/Blocks/BlocksController.php";
+
 	require_once __DIR__ . "/src/TouchPoint-WP/Person.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Meeting.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/CalendarGrid.php";
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 00000000..f556a0dc
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,28 @@
+const path = require('path');
+
+module.exports = {
+    entry: './blocks/inv-list/index.js',
+    output: {
+        path: path.resolve(__dirname, 'build/blocks/inv-list'),
+        filename: 'inv-list/index.min.js',
+    },
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                exclude: /node_modules/,
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        presets: ['@babel/preset-env', '@babel/preset-react'],
+                    },
+                },
+            },
+            {
+                test: /\.css$/,
+                use: ['style-loader', 'css-loader'],
+            },
+        ],
+    },
+    mode: 'production',
+};
diff --git a/wpml-config.xml b/wpml-config.xml
index 622386c7..57fe652f 100644
--- a/wpml-config.xml
+++ b/wpml-config.xml
@@ -2,6 +2,7 @@
     <custom-types>
         <custom-type translate="0">tp_partner</custom-type>
         <custom-type translate="0">tp_report</custom-type>
+        <custom-type translate="1">tp_meeting</custom-type>
     </custom-types>
     <taxonomies>
         <taxonomy translate="1" display-as-translated="1">tp_rescode</taxonomy>
@@ -47,4 +48,5 @@
         <key name="tp_rc_name_singular"/>
         <key name="tp_system_name"/>
     </admin-texts>
+    <shortcode-list>TP-Inv-Nearby,TP-Inv-List,TP-People,TP-RSVP,TP-Report</shortcode-list>
 </wpml-config>
\ No newline at end of file

From 0be95ee5cc192b9cea30c1732834a2a5fbb7954f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 9 Jun 2025 16:31:05 -0400
Subject: [PATCH 297/423] Editor UX for inv list block

---
 .idea/watcherTasks.xml                      | 40 +++++++++
 assets/template/block-preview-style.css     | 21 +++++
 blocks/inv-list/index.js                    | 93 +++++++++++++++-----
 package.json                                |  2 +-
 src/TouchPoint-WP/Involvement.php           | 94 +++++++++++++++++----
 src/TouchPoint-WP/Taxonomies.php            |  9 +-
 src/TouchPoint-WP/TouchPointWP.php          | 21 +++++
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php |  2 +-
 8 files changed, 233 insertions(+), 49 deletions(-)
 create mode 100644 assets/template/block-preview-style.css

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 49ba7008..8129e6ac 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -121,5 +121,45 @@
       <option name="workingDir" value="$ProjectFileDir$" />
       <envs />
     </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="js" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="Build Blocks from JS" />
+      <option name="output" value="" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="npx" />
+      <option name="runOnExternalChanges" value="false" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="true" />
+      <option name="workingDir" value="$ProjectFileDir$" />
+      <envs />
+    </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="js" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="Build Block Manifest from JS" />
+      <option name="output" value="" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="npx" />
+      <option name="runOnExternalChanges" value="false" />
+      <option name="scopeName" value="Open Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="$ProjectFileDir$" />
+      <envs />
+    </TaskOptions>
   </component>
 </project>
\ No newline at end of file
diff --git a/assets/template/block-preview-style.css b/assets/template/block-preview-style.css
new file mode 100644
index 00000000..731b5bd5
--- /dev/null
+++ b/assets/template/block-preview-style.css
@@ -0,0 +1,21 @@
+.tp-preview-block::before {
+    content: attr(data-preview-message);
+    width: 100%;
+    top: 0;
+    bottom: 0;
+    background: #00000088;
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+    position: absolute;
+    z-index: 11;
+    color: #ccc;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+}
+
+.tp-preview-block:hover::before {
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index e6861277..89acab3e 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -5,13 +5,16 @@
  *
  * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
  */
-// import './style.css';
+import "../../assets/template/partials-template-style.css";
+import "../../assets/template/actions-style.css";
+import "../../assets/template/block-preview-style.css"
 
 /**
  * Internal dependencies
  */
 import metadata from './block.json';
 import {__} from "@wordpress/i18n";
+import {uniqueId} from "@wordpress/block-editor/src/components/link-control/test/fixtures";
 
 /**
  * Every block starts by registering a new block type definition.
@@ -38,21 +41,29 @@ wp.blocks.registerBlockType( metadata.name, {
 		const { attributes, setAttributes } = props;
 		const { postType, division } = attributes;
 		const blockProps = wp.blockEditor.useBlockProps();
-		const additionalClasses = blockProps.className || '';
+		const placeholderId = `tp-inv-list-${uniqueId()}`;
 
 		const [postTypeOptions, setPostTypeOptions] = wp.element.useState([]);
 		const [divisionChildren, setDivisionChildren] = wp.element.useState(null);
 
+		props.onReplace(() => updateListContent())
+
+		let lastPath = '',
+			lastFetch = null;
+
 		wp.element.useEffect(() => {
 			(async () => {
 				try {
 					const response = await fetch('/touchpoint-api/inv/posttypes');
 					const data = await response.json();
-					const formattedOptions = data.map((item) => ({
-						label: item.namePlural,
-						value: item.postType,
-					}));
-					setPostTypeOptions(formattedOptions);setPostTypeOptions(formattedOptions);
+					const formattedOptions = data
+						.filter((item) => item.postType !== 'meeting')
+						.map((item) => ({
+							label: item.namePlural,
+							value: item.postType,
+						}));
+
+					setPostTypeOptions(formattedOptions);
 					if (postType === '' && formattedOptions.length > 0) {
 						setAttributes({ postType: formattedOptions[0].value });
 					}
@@ -84,27 +95,63 @@ wp.blocks.registerBlockType( metadata.name, {
 			})();
 		}, []);
 
+		function updateListContent() {
+			const newPath = `/touchpoint-api/inv/list?type=${postType}&div=${division}&class=${blockProps.className || ''}`;
+			if (lastPath === newPath) {
+				return
+			}
+			if (lastFetch) {
+				if (lastFetch.abort) { // TODO never true
+					lastFetch.abort();
+				}
+			}
+			lastPath = newPath;
+			lastFetch = fetch(newPath)
+				.then(response => response.text())
+				.then(data => {
+					const placeholder = document.getElementById(placeholderId);
+					if (placeholder) {
+						placeholder.innerHTML = data;
+					}
+				})
+				.catch(error => {
+					console.error('Error fetching involvement list:', error);
+				});
+		}
+
+		updateListContent();
+
 		return (
-			<div {...blockProps}>
+			<div {...blockProps} >
 				<wp.blockEditor.InspectorControls>
 					<wp.components.PanelBody title={__("Settings", "TouchPoint-WP")}>
-						<wp.components.SelectControl
-							label={__("Post Type", "TouchPoint-WP")}
-							value={postType}
-							options={postTypeOptions}
-							onChange={(value) => setAttributes({ postType: value })}
-						/>
-						<wp.components.SelectControl
-							label={__("Division", "TouchPoint-WP")}
-							value={division}
-							children={divisionChildren}
-							onChange={(value) => setAttributes({ division: Number(value) })}
-							__next40pxDefaultSize={true}
-							__nextHasNoMarginBottom={true}
-						/>
+						{postTypeOptions.length === 0 ? (
+							<div style={{ padding: '1em', color: 'red' }}>
+								{__("To use this block, import Involvements in the TouchPoint-WP settings.", "TouchPoint-WP")}
+							</div>
+						) : (
+							<>
+								<wp.components.SelectControl
+									label={__("Post Type", "TouchPoint-WP")}
+									value={postType}
+									options={postTypeOptions}
+									onChange={(value) => setAttributes({ postType: value })}
+									__next40pxDefaultSize={true}
+									__nextHasNoMarginBottom={true}
+								/>
+								<wp.components.SelectControl
+									label={__("Division", "TouchPoint-WP")}
+									value={division}
+									children={divisionChildren}
+									onChange={(value) => setAttributes({ division: Number(value) })}
+									__next40pxDefaultSize={true}
+									__nextHasNoMarginBottom={true}
+								/>
+							</>
+						)}
 					</wp.components.PanelBody>
 				</wp.blockEditor.InspectorControls>
-				<p>{`[TP-Inv-List class="${additionalClasses}" type="${postType}"${division !== 0 ? ` div="${division}"` : ""}]`}</p>
+				<div id={placeholderId} className="tp-preview-block" data-preview-message={__('Preview Only', 'TouchPoint-WP')}></div>
 			</div>
 		);
 	},
diff --git a/package.json b/package.json
index f6ff979a..d2d3c079 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "@wordpress/blocks": "^14.11.0",
     "@wordpress/env": "^10.22.0",
     "@wordpress/i18n": "^5.22.0",
-    "@wordpress/scripts": "^30.15.0",
+    "@wordpress/scripts": "^30.18.0",
     "style-loader": "^4.0.0",
     "uglify-js": "^3.17.4"
   }
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index f056e0e4..5eb7ad8c 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1512,7 +1512,10 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 			}
 		}
 
-		$containerClass = $params['class'] ?? self::$containerClass;
+		$containerClass = $params['class'] ?? [];
+		if (!str_contains(" " . $containerClass . " ", " " . self::$containerClass . " ")) {
+			$containerClass .= " " . self::$containerClass;
+		}
 
 		// Groupings
 		foreach ($terms as $termId => $name) {
@@ -1602,11 +1605,10 @@ private static function getWpPostByInvolvementId($postType, $involvementId): WP_
 	 * Print a list of involvements that match the given criteria.
 	 *
 	 * @param array|string $params
-	 * @param string       $content
+	 * @param string       $content  A string that is shown if no content is available.
 	 *
 	 * @return string
 	 *
-	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	public static function listShortcode($params = [], string $content = ""): string
@@ -1653,12 +1655,31 @@ public static function listShortcode($params = [], string $content = ""): string
 		$render = ob_get_clean();
 
 		if (trim($render) == "") {
+			if ($content !== "") {
+				return apply_shortcodes($content);
+			}
 			return "<!-- Nothing to show -->";
 		}
 
 		return apply_shortcodes($render);
 	}
 
+
+	/**
+	 * Get the list of involvements through API endpoint.  This is used by the Involvement List Shortcode.
+	 * 
+	 * @return void
+	 */
+	public static function ajaxListShortcode(): void
+	{
+		// This is an AJAX call, so we need to set the headers.
+		if ( ! headers_sent()) {
+			TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE);
+		}
+
+		echo self::listShortcode($_GET, __('None right now.', 'TouchPoint-WP'));
+	}
+
 	/**
 	 * @param array|string $params
 	 * @param string       $content
@@ -1666,7 +1687,7 @@ public static function listShortcode($params = [], string $content = ""): string
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public static function nearbyShortcode($params = [], string $content = ""): string
+	public static function nearbyShortcode(array|string $params = [], string $content = ""): string
 	{
 		TouchPointWP::requireScript("knockout-defer");
 		TouchPointWP::requireScript("base-defer");
@@ -2009,6 +2030,14 @@ public static function fromPost(WP_Post $post): ?Involvement
 	{
 		$iid = intval($post->{TouchPointWP::INVOLVEMENT_META_KEY});
 
+		if ($iid === 0) {
+			$iid = intval(get_post_meta($post->ID, TouchPointWP::INVOLVEMENT_META_KEY, true));
+		}
+
+		if (Meeting::postIsType($post) && !Involvement::postIsType($post)) {
+			throw new TouchPointWP_Exception("The post is a Meeting, not an Involvement.", 171004);
+		}
+
 		if ($iid === 0) {
 			throw new TouchPointWP_Exception("Invalid Involvement ID provided.", 171002);
 		}
@@ -2072,6 +2101,10 @@ public static function api(array $uri): bool
 				self::ajaxNearby();
 				exit;
 
+			case "list":
+				self::ajaxListShortcode();
+				exit;
+
 			/** @noinspection SpellCheckingInspection */
 			case "posttypes":
 				// Return the post types that are available for involvements.
@@ -2435,21 +2468,46 @@ public static function sort(Involvement $a, Involvement $b): int
 	/**
 	 * Put Post objects that represent Small Groups in order of increasing distance.
 	 *
-	 * @param WP_Post $a
-	 * @param WP_Post $b
+	 * @param WP_Post|Involvement $a
+	 * @param WP_Post|Involvement $b
 	 *
 	 * @return int
 	 */
-	public static function sortPosts(WP_Post $a, WP_Post $b): int
+	public static function sortPosts(WP_Post|Involvement $a, WP_Post|Involvement $b): int
 	{
-		try {
-			$a = self::fromPost($a);
-			$b = self::fromPost($b);
+		$comparable = true;
+		if ($a instanceof WP_Post) {
+			try {
+				if (Meeting::postIsType($a)) {
+					$a = Meeting::fromPost($a)->involvement();
+				} elseif (Involvement::postIsType($a)) {
+					$a = Involvement::fromPost($a);
+				} else {
+					$comparable = false;
+				}
+			} catch (TouchPointWP_Exception) {
+				$comparable = false;
+			}
+		}
+		if ($b instanceof WP_Post) {
+			try {
+				if (Meeting::postIsType($b)) {
+					$b = Meeting::fromPost($b)->involvement();
+				} elseif (Involvement::postIsType($b)) {
+					$b = Involvement::fromPost($b);
+				} else {
+					$comparable = false;
+				}
+			} catch (TouchPointWP_Exception) {
+				$comparable = false;
+			}
+		}
 
+		if ($comparable) {
 			return self::sort($a, $b);
-		} catch (TouchPointWP_Exception) {
-			return $a <=> $b;
 		}
+
+		return $a <=> $b;
 	}
 
 
@@ -2508,10 +2566,14 @@ public static function mapShortcode($params = [], string $content = ""): string
 				$post = get_post();
 				if ($post) {
 					$inv = null;
-					if (Meeting::postIsType($post)) {
-						$inv = Meeting::fromPost($post)?->involvement();
-					} elseif (Involvement::postIsType($post)) {
-						$inv = Involvement::fromPost($post);
+					try {
+						if (Meeting::postIsType($post)) {
+							$inv = Meeting::fromPost($post)?->involvement();
+						} elseif (Involvement::postIsType($post)) {
+							$inv = Involvement::fromPost($post);
+						}
+					} catch (TouchPointWP_Exception) {
+						// If the post is not an involvement, do nothing.
 					}
 					$inv?->enqueueForJsInstantiation();
 				}
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 63184c4a..388bc9e8 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -316,14 +316,7 @@ public static function insertTerms($instance = null): void
 		$types = self::getPostTypesForTaxonomy($instance, self::TAX_DIV);
 		if (count($types) > 0) {
 			$existingIds = [];
-			$enabledDivisions = $instance->settings->dv_divisions;
-			foreach ($instance->getDivisions() as $d) {
-				if (!in_array('div' . $d->id, $enabledDivisions)) {
-					continue;
-				}
-				if (!$d->pName || !$d->dName) {
-					continue;
-				}
+			foreach ($instance->getImportedDivisions() as $d) {
 
 				// Program
 				$idUpdate = self::$forceTermLookupIdUpdate;
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index c2402273..4a615b8d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1671,6 +1671,27 @@ public function getDivisionsAsKVArray(): array
 		return self::flattenArrayToKV($this->getDivisions(), 'id', 'name', 'div');
 	}
 
+	/**
+	 * Returns an array of objects that correspond to divisions that are actively being imported as a taxonomy.  Each
+	 * Division has a name and an id.  The name is both the Program and Division.
+	 *
+	 * @return object[]
+	 */
+	public function getImportedDivisions(): array
+	{
+		$enabledDivisions = $this->settings->dv_divisions;
+		$enabled = [];
+		foreach ($this->getDivisions() as $d) {
+			if (!$d->pName || !$d->dName) {
+				continue;
+			}
+			if (in_array('div' . $d->id, $enabledDivisions)) {
+				$enabled[] = $d;
+			}
+		}
+		return $enabled;
+	}
+
 	/**
 	 * Returns an array of objects that correspond to divisions.  Each Division has a name and an id.  The name is both
 	 * the Program and Division.
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 92b9a334..318cca78 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -52,7 +52,7 @@ public static function api(array $uri): bool
 
 			case "divisions":
 				header('Content-Type: application/json');
-				$divs = TouchPointWP::instance()->getDivisions();
+				$divs = TouchPointWP::instance()->getImportedDivisions();
 				echo json_encode($divs);
 				exit;
 

From 9e9b50ab042ce4395bc3d4ce8b27283824c9535b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 9 Jun 2025 16:33:29 -0400
Subject: [PATCH 298/423] i18n and docs

---
 docs                        |   2 +-
 i18n/TouchPoint-WP-es_ES.po | 148 +++++++++++++++++++----------------
 i18n/TouchPoint-WP.pot      | 150 +++++++++++++++++++-----------------
 3 files changed, 162 insertions(+), 138 deletions(-)

diff --git a/docs b/docs
index 3346e39a..783c1759 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 3346e39a85f9a7db0426c55790d6bfe11bc9b19e
+Subproject commit 783c1759ae57890df4f68ed800da1b09c45803b7
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 4d90565e..bd5698e2 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -124,14 +124,14 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:250
-#: src/TouchPoint-WP/Involvement.php:1896
-#: src/TouchPoint-WP/Taxonomies.php:750
+#: src/TouchPoint-WP/Involvement.php:1914
+#: src/TouchPoint-WP/Taxonomies.php:743
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:254
-#: src/TouchPoint-WP/Involvement.php:1922
-#: src/TouchPoint-WP/Taxonomies.php:808
+#: src/TouchPoint-WP/Involvement.php:1940
+#: src/TouchPoint-WP/Taxonomies.php:801
 msgid "Time of Day"
 msgstr "Hora del día"
 
@@ -140,7 +140,7 @@ msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
 #: src/templates/admin/invKoForm.php:262
-#: src/TouchPoint-WP/Taxonomies.php:837
+#: src/TouchPoint-WP/Taxonomies.php:830
 msgid "Age Group"
 msgstr "Grupo de edad"
 
@@ -174,7 +174,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2172
+#: src/TouchPoint-WP/Involvement.php:2203
 #, php-format
 msgid "No %s Found."
 msgstr "No se encontraron %s"
@@ -215,65 +215,65 @@ msgstr "Registro aún no abierto"
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1771
+#: src/TouchPoint-WP/Involvement.php:1789
 #: src/TouchPoint-WP/Partner.php:842
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1979
+#: src/TouchPoint-WP/Involvement.php:1997
 #: src/TouchPoint-WP/Partner.php:866
 #, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3787
+#: src/TouchPoint-WP/Involvement.php:3847
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3790
+#: src/TouchPoint-WP/Involvement.php:3850
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3869
+#: src/TouchPoint-WP/Involvement.php:3929
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3939
-#: src/TouchPoint-WP/Involvement.php:3998
+#: src/TouchPoint-WP/Involvement.php:3999
+#: src/TouchPoint-WP/Involvement.php:4058
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:3945
+#: src/TouchPoint-WP/Involvement.php:4005
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:3949
+#: src/TouchPoint-WP/Involvement.php:4009
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:3954
+#: src/TouchPoint-WP/Involvement.php:4014
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:3957
+#: src/TouchPoint-WP/Involvement.php:4017
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:3960
+#: src/TouchPoint-WP/Involvement.php:4020
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:3963
+#: src/TouchPoint-WP/Involvement.php:4023
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:3989
+#: src/TouchPoint-WP/Involvement.php:4049
 #: assets/js/base-defer.js:1004
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3886
+#: src/TouchPoint-WP/Involvement.php:3946
 #: src/TouchPoint-WP/Partner.php:1353
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -306,24 +306,24 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2125
+#: src/TouchPoint-WP/TouchPointWP.php:2146
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2182
+#: src/TouchPoint-WP/TouchPointWP.php:2203
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2185
+#: src/TouchPoint-WP/TouchPointWP.php:2206
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2188
+#: src/TouchPoint-WP/TouchPointWP.php:2209
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2193
-#: src/TouchPoint-WP/TouchPointWP.php:2194
+#: src/TouchPoint-WP/TouchPointWP.php:2214
+#: src/TouchPoint-WP/TouchPointWP.php:2215
 msgid "Current Value"
 msgstr "Valor actual"
 
@@ -339,7 +339,7 @@ msgstr "Configuración de API no válida o incompleta."
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2408
+#: src/TouchPoint-WP/TouchPointWP.php:2429
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -783,7 +783,7 @@ msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
 #: src/TouchPoint-WP/Settings.php:1451
-#: blocks/inv-list/index.js:90
+#: blocks/inv-list/index.js:127
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -1023,16 +1023,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1944
-#: src/TouchPoint-WP/Taxonomies.php:869
+#: src/TouchPoint-WP/Involvement.php:1962
+#: src/TouchPoint-WP/Taxonomies.php:862
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1957
+#: src/TouchPoint-WP/Involvement.php:1975
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1828
+#: src/TouchPoint-WP/Involvement.php:1846
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1194,24 +1194,24 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1945
+#: src/TouchPoint-WP/Involvement.php:1963
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1946
+#: src/TouchPoint-WP/Involvement.php:1964
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1987
+#: src/TouchPoint-WP/Involvement.php:2005
 #: src/TouchPoint-WP/Partner.php:882
 #, php-format
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:1990
+#: src/TouchPoint-WP/Involvement.php:2008
 #: src/TouchPoint-WP/Partner.php:885
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
@@ -1267,7 +1267,7 @@ msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3808
+#: src/TouchPoint-WP/Involvement.php:3868
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -1285,15 +1285,15 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2113
+#: src/TouchPoint-WP/Involvement.php:2144
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2123
+#: src/TouchPoint-WP/Involvement.php:2154
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2142
+#: src/TouchPoint-WP/Involvement.php:2173
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
@@ -1312,8 +1312,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:4106
-#: src/TouchPoint-WP/Involvement.php:4211
+#: src/TouchPoint-WP/Involvement.php:4166
+#: src/TouchPoint-WP/Involvement.php:4271
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1321,65 +1321,65 @@ msgstr "Tipo de publicación no válida."
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/Taxonomies.php:658
+#: src/TouchPoint-WP/Taxonomies.php:651
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/Taxonomies.php:687
+#: src/TouchPoint-WP/Taxonomies.php:680
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:718
+#: src/TouchPoint-WP/Taxonomies.php:711
 #, php-format
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/Taxonomies.php:749
+#: src/TouchPoint-WP/Taxonomies.php:742
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:750
+#: src/TouchPoint-WP/Taxonomies.php:743
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/Taxonomies.php:776
+#: src/TouchPoint-WP/Taxonomies.php:769
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/Taxonomies.php:780
+#: src/TouchPoint-WP/Taxonomies.php:773
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/Taxonomies.php:780
+#: src/TouchPoint-WP/Taxonomies.php:773
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/Taxonomies.php:803
+#: src/TouchPoint-WP/Taxonomies.php:796
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:809
+#: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/Taxonomies.php:835
+#: src/TouchPoint-WP/Taxonomies.php:828
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/Taxonomies.php:838
+#: src/TouchPoint-WP/Taxonomies.php:831
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/Taxonomies.php:864
+#: src/TouchPoint-WP/Taxonomies.php:857
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/Taxonomies.php:870
+#: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:903
+#: src/TouchPoint-WP/Taxonomies.php:896
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1441,7 +1441,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1889
 msgid "Language"
 msgstr "Idioma"
 
@@ -1478,7 +1478,7 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4198
+#: src/TouchPoint-WP/Involvement.php:4258
 #: src/TouchPoint-WP/Person.php:1879
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
@@ -1503,7 +1503,7 @@ msgstr "Algo salió mal."
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4188
+#: src/TouchPoint-WP/Involvement.php:4248
 #: src/TouchPoint-WP/Person.php:1896
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
@@ -1626,7 +1626,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3898
+#: src/TouchPoint-WP/Involvement.php:3958
 #, php-format
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
@@ -1829,7 +1829,7 @@ msgid "This %s has been Cancelled."
 msgstr "Este %s ha sido Cancelado."
 
 #: src/templates/admin/invKoForm.php:210
-#: blocks/inv-list/index.js:98
+#: blocks/inv-list/index.js:143
 msgid "Division"
 msgstr "Division"
 
@@ -1917,7 +1917,7 @@ msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2384
+#: src/TouchPoint-WP/TouchPointWP.php:2405
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
@@ -1946,19 +1946,19 @@ msgstr "Recopilar reuniones solo de participaciones sin horarios"
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
 
-#: blocks/inv-list/index.js:22
+#: blocks/inv-list/index.js:25
 msgid "Involvement List"
 msgstr "Lista de Participaciones"
 
-#: blocks/inv-list/index.js:24
+#: blocks/inv-list/index.js:27
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
-#: blocks/inv-list/index.js:70
+#: blocks/inv-list/index.js:81
 msgid "All"
 msgstr "Todos"
 
-#: blocks/inv-list/index.js:92
+#: blocks/inv-list/index.js:135
 msgid "Post Type"
 msgstr "tipo de publicación"
 
@@ -1971,3 +1971,15 @@ msgstr "Lista de Participaciones"
 msgctxt "block description"
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
+
+#: src/TouchPoint-WP/Involvement.php:1680
+msgid "None right now."
+msgstr "Nada por ahora"
+
+#: blocks/inv-list/index.js:130
+msgid "To use this block, import Involvements in the TouchPoint-WP settings."
+msgstr "Para utilizar este bloque, importe Involvements en la configuración de TouchPoint-WP."
+
+#: blocks/inv-list/index.js:154
+msgid "Preview Only"
+msgstr "Solo vista previa"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 9308e33f..aa1fff7a 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-06-09T12:46:24+00:00\n"
+"POT-Creation-Date: 2025-06-09T20:32:07+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -192,7 +192,7 @@ msgid "Default Filters"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:210
-#: blocks/inv-list/index.js:98
+#: blocks/inv-list/index.js:143
 msgid "Division"
 msgstr ""
 
@@ -209,14 +209,14 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:250
-#: src/TouchPoint-WP/Involvement.php:1896
-#: src/TouchPoint-WP/Taxonomies.php:750
+#: src/TouchPoint-WP/Involvement.php:1914
+#: src/TouchPoint-WP/Taxonomies.php:743
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:254
-#: src/TouchPoint-WP/Involvement.php:1922
-#: src/TouchPoint-WP/Taxonomies.php:808
+#: src/TouchPoint-WP/Involvement.php:1940
+#: src/TouchPoint-WP/Taxonomies.php:801
 msgid "Time of Day"
 msgstr ""
 
@@ -225,7 +225,7 @@ msgid "Prevailing Marital Status"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:262
-#: src/TouchPoint-WP/Taxonomies.php:837
+#: src/TouchPoint-WP/Taxonomies.php:830
 msgid "Age Group"
 msgstr ""
 
@@ -311,7 +311,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2172
+#: src/TouchPoint-WP/Involvement.php:2203
 #, php-format
 msgid "No %s Found."
 msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3808
+#: src/TouchPoint-WP/Involvement.php:3868
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -461,138 +461,142 @@ msgstr ""
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1771
+#: src/TouchPoint-WP/Involvement.php:1680
+msgid "None right now."
+msgstr ""
+
+#: src/TouchPoint-WP/Involvement.php:1789
 #: src/TouchPoint-WP/Partner.php:842
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1828
+#: src/TouchPoint-WP/Involvement.php:1846
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1871
+#: src/TouchPoint-WP/Involvement.php:1889
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1944
-#: src/TouchPoint-WP/Taxonomies.php:869
+#: src/TouchPoint-WP/Involvement.php:1962
+#: src/TouchPoint-WP/Taxonomies.php:862
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1945
+#: src/TouchPoint-WP/Involvement.php:1963
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1946
+#: src/TouchPoint-WP/Involvement.php:1964
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1957
+#: src/TouchPoint-WP/Involvement.php:1975
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1979
+#: src/TouchPoint-WP/Involvement.php:1997
 #: src/TouchPoint-WP/Partner.php:866
 #, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:1987
+#: src/TouchPoint-WP/Involvement.php:2005
 #: src/TouchPoint-WP/Partner.php:882
 #, php-format
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1990
+#: src/TouchPoint-WP/Involvement.php:2008
 #: src/TouchPoint-WP/Partner.php:885
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2113
+#: src/TouchPoint-WP/Involvement.php:2144
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2123
+#: src/TouchPoint-WP/Involvement.php:2154
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2142
+#: src/TouchPoint-WP/Involvement.php:2173
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3787
+#: src/TouchPoint-WP/Involvement.php:3847
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3790
+#: src/TouchPoint-WP/Involvement.php:3850
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3869
+#: src/TouchPoint-WP/Involvement.php:3929
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3886
+#: src/TouchPoint-WP/Involvement.php:3946
 #: src/TouchPoint-WP/Partner.php:1353
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3898
+#: src/TouchPoint-WP/Involvement.php:3958
 #, php-format
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3939
-#: src/TouchPoint-WP/Involvement.php:3998
+#: src/TouchPoint-WP/Involvement.php:3999
+#: src/TouchPoint-WP/Involvement.php:4058
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3945
+#: src/TouchPoint-WP/Involvement.php:4005
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3949
+#: src/TouchPoint-WP/Involvement.php:4009
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3954
+#: src/TouchPoint-WP/Involvement.php:4014
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3957
+#: src/TouchPoint-WP/Involvement.php:4017
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3960
+#: src/TouchPoint-WP/Involvement.php:4020
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3963
+#: src/TouchPoint-WP/Involvement.php:4023
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3989
+#: src/TouchPoint-WP/Involvement.php:4049
 #: assets/js/base-defer.js:1004
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4106
-#: src/TouchPoint-WP/Involvement.php:4211
+#: src/TouchPoint-WP/Involvement.php:4166
+#: src/TouchPoint-WP/Involvement.php:4271
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4188
+#: src/TouchPoint-WP/Involvement.php:4248
 #: src/TouchPoint-WP/Person.php:1896
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4198
+#: src/TouchPoint-WP/Involvement.php:4258
 #: src/TouchPoint-WP/Person.php:1879
 msgid "Contact Prohibited."
 msgstr ""
@@ -1329,7 +1333,7 @@ msgid "TouchPoint-WP"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:1451
-#: blocks/inv-list/index.js:90
+#: blocks/inv-list/index.js:127
 msgid "Settings"
 msgstr ""
 
@@ -1393,65 +1397,65 @@ msgstr ""
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:658
+#: src/TouchPoint-WP/Taxonomies.php:651
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:687
+#: src/TouchPoint-WP/Taxonomies.php:680
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:718
+#: src/TouchPoint-WP/Taxonomies.php:711
 #, php-format
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:749
+#: src/TouchPoint-WP/Taxonomies.php:742
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:750
+#: src/TouchPoint-WP/Taxonomies.php:743
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:776
+#: src/TouchPoint-WP/Taxonomies.php:769
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:780
+#: src/TouchPoint-WP/Taxonomies.php:773
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:780
+#: src/TouchPoint-WP/Taxonomies.php:773
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:803
+#: src/TouchPoint-WP/Taxonomies.php:796
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:809
+#: src/TouchPoint-WP/Taxonomies.php:802
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:835
+#: src/TouchPoint-WP/Taxonomies.php:828
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:838
+#: src/TouchPoint-WP/Taxonomies.php:831
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:864
+#: src/TouchPoint-WP/Taxonomies.php:857
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:870
+#: src/TouchPoint-WP/Taxonomies.php:863
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:903
+#: src/TouchPoint-WP/Taxonomies.php:896
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
@@ -1459,32 +1463,32 @@ msgstr ""
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2125
+#: src/TouchPoint-WP/TouchPointWP.php:2146
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2182
+#: src/TouchPoint-WP/TouchPointWP.php:2203
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2185
+#: src/TouchPoint-WP/TouchPointWP.php:2206
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2188
+#: src/TouchPoint-WP/TouchPointWP.php:2209
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2193
-#: src/TouchPoint-WP/TouchPointWP.php:2194
+#: src/TouchPoint-WP/TouchPointWP.php:2214
+#: src/TouchPoint-WP/TouchPointWP.php:2215
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2384
+#: src/TouchPoint-WP/TouchPointWP.php:2405
 msgid "People Count Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2408
+#: src/TouchPoint-WP/TouchPointWP.php:2429
 msgid "People Query Failed"
 msgstr ""
 
@@ -1949,22 +1953,30 @@ msgstr ""
 msgid "Nothing to submit."
 msgstr ""
 
-#: blocks/inv-list/index.js:22
+#: blocks/inv-list/index.js:25
 msgid "Involvement List"
 msgstr ""
 
-#: blocks/inv-list/index.js:24
+#: blocks/inv-list/index.js:27
 msgid "A list of Involvements from TouchPoint"
 msgstr ""
 
-#: blocks/inv-list/index.js:70
+#: blocks/inv-list/index.js:81
 msgid "All"
 msgstr ""
 
-#: blocks/inv-list/index.js:92
+#: blocks/inv-list/index.js:130
+msgid "To use this block, import Involvements in the TouchPoint-WP settings."
+msgstr ""
+
+#: blocks/inv-list/index.js:135
 msgid "Post Type"
 msgstr ""
 
+#: blocks/inv-list/index.js:154
+msgid "Preview Only"
+msgstr ""
+
 #: blocks/inv-list/block.json
 msgctxt "block title"
 msgid "Involvement List"

From 56d24abad625b2e8f0ea6569aa41b02960c83cc6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 9 Jun 2025 17:21:21 -0400
Subject: [PATCH 299/423] Reducing redundant API calls

---
 blocks/inv-list/index.js | 60 +++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index 89acab3e..cadc1afe 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -48,9 +48,6 @@ wp.blocks.registerBlockType( metadata.name, {
 
 		props.onReplace(() => updateListContent())
 
-		let lastPath = '',
-			lastFetch = null;
-
 		wp.element.useEffect(() => {
 			(async () => {
 				try {
@@ -67,6 +64,7 @@ wp.blocks.registerBlockType( metadata.name, {
 					if (postType === '' && formattedOptions.length > 0) {
 						setAttributes({ postType: formattedOptions[0].value });
 					}
+					updateListContent(postType, division, blockProps, placeholderId);
 				} catch (error) {
 					console.error('Error fetching post types:', error);
 				}
@@ -89,37 +87,16 @@ wp.blocks.registerBlockType( metadata.name, {
 						groupedOptions.push(<optgroup key={groupLabel} label={groupLabel}>{options}</optgroup>);
 					});
 					setDivisionChildren(groupedOptions);
+					updateListContent(postType, division, blockProps, placeholderId);
 				} catch (error) {
 					console.error('Error fetching divisions:', error);
 				}
 			})();
 		}, []);
 
-		function updateListContent() {
-			const newPath = `/touchpoint-api/inv/list?type=${postType}&div=${division}&class=${blockProps.className || ''}`;
-			if (lastPath === newPath) {
-				return
-			}
-			if (lastFetch) {
-				if (lastFetch.abort) { // TODO never true
-					lastFetch.abort();
-				}
-			}
-			lastPath = newPath;
-			lastFetch = fetch(newPath)
-				.then(response => response.text())
-				.then(data => {
-					const placeholder = document.getElementById(placeholderId);
-					if (placeholder) {
-						placeholder.innerHTML = data;
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching involvement list:', error);
-				});
-		}
-
-		updateListContent();
+		wp.element.useEffect(() => {
+			updateListContent(postType, division, blockProps, placeholderId);
+		}, [postType, division, blockProps.className, placeholderId]);
 
 		return (
 			<div {...blockProps} >
@@ -167,3 +144,30 @@ wp.blocks.registerBlockType( metadata.name, {
 	},
 
 } );
+
+let lastPath = null;
+let controller = null;
+
+function updateListContent(postType, division, blockProps, placeholderId) {
+    const newPath = `/touchpoint-api/inv/list?type=${postType}&div=${division}&class=${blockProps.className || ''}`;
+    if (lastPath === newPath) {
+        return;
+    }
+
+    if (controller) {
+        controller.abort();
+    }
+
+    controller = new AbortController();
+    lastPath = newPath;
+
+    fetch(newPath, { signal: controller.signal })
+        .then(response => response.text())
+        .then(data => {
+            const placeholder = document.getElementById(placeholderId);
+            if (placeholder) {
+                placeholder.innerHTML = data;
+            }
+        })
+        .catch(() => {}); // suppress error from abortion.
+}

From 835e2f81ab42edd5f841684e4a511c44818af6fa Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 15 Jun 2025 19:12:31 -0400
Subject: [PATCH 300/423] Hotfix: don't apply deeplinks to Android where they
 don't work.

---
 src/TouchPoint-WP/EventsCalendar.php | 37 +++++++++++++++++-----------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/TouchPoint-WP/EventsCalendar.php b/src/TouchPoint-WP/EventsCalendar.php
index 5afb5d1f..e23d6cce 100644
--- a/src/TouchPoint-WP/EventsCalendar.php
+++ b/src/TouchPoint-WP/EventsCalendar.php
@@ -21,7 +21,7 @@
  * This class and its features are deprecated since it will no longer be needed when mobile v2 is retired.
  *
  * @since 0.0.90 Deprecated.  Will be removed once v2.0 apps are no longer in use, as this won't be necessary for 3.0+.
- * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 exists.
+ * @deprecated since 0.0.90  Will not be necessary once mobile 3.0 is dependable.
  */
 abstract class EventsCalendar implements api, module
 {
@@ -83,6 +83,7 @@ protected static function generateEventsList(array $params = []): array
 
 			$content = trim(get_the_content(null, true, $eQ->ID));
 			$content = self::formatContent($content);
+			$content_ios = self::deeplinkReplacements($content);
 
 			// Not needed for apps, but helpful for diagnostics
 			$eO['ID'] = $eQ->ID;
@@ -96,7 +97,7 @@ protected static function generateEventsList(array $params = []): array
 			$eO['RelatedImageFileKey'] = $eO['image'];
 
 			// iOS
-			$eO['Description'] = str_replace("{{MOBILE_OS}}", "iOS", $content);
+			$eO['Description'] = str_replace("{{MOBILE_OS}}", "iOS", $content_ios);
 			// Android
 			$eO['content'] = str_replace("{{MOBILE_OS}}", "android", $content);
 
@@ -120,12 +121,27 @@ protected static function generateEventsList(array $params = []): array
 
 		return $eventsList;
 	}
-	
-	private static function formatContent(?string $content): string
+
+	private static function deeplinkReplacements(string $content): string
 	{
 		$tpDomain = TouchPointWP::instance()->settings->host;
 		$dlDomain = TouchPointWP::instance()->settings->host_deeplink;
 
+		// Replace TouchPoint links with deeplinks where applicable
+		// Registration Links
+		if ($tpDomain !== '' && $dlDomain !== '') {
+			$content = preg_replace(
+				"/:\/\/$tpDomain\/OnlineReg\/([\d]+)/i",
+				"://" . $dlDomain . '/registrations/register/${1}?from={{MOBILE_OS}}',
+				$content
+			);
+		}
+
+		return $content;
+	}
+	
+	private static function formatContent(?string $content): string
+	{
 		$content = apply_filters('the_content', $content);
 
 		/**
@@ -160,15 +176,7 @@ private static function formatContent(?string $content): string
 			$content
 		);
 
-		// Replace TouchPoint links with deeplinks where applicable
-		// Registration Links
-		if ($tpDomain !== '' && $dlDomain !== '') {
-			$content = preg_replace(
-				"/:\/\/$tpDomain\/OnlineReg\/([\d]+)/i",
-				"://" . $dlDomain . '/registrations/register/${1}?from={{MOBILE_OS}}',
-				$content
-			);
-		}
+		// Deeplink replacements should really happen here if they were dependable on Android.
 
 		if ($content !== '') {
 			$cssUrl = null;
@@ -301,6 +309,7 @@ protected static function generateEventsListFromMeetings(array $params = []): ar
 			$content = trim(get_the_content(null, true, $eQ->ID));
 			$content .= "<div>" . $e->getActionButtons('mobile', 'btn', withTouchPointLink: false, absoluteLinks: true)->join("  ") . "</div>";
 			$content = self::formatContent($content);
+			$content_ios = self::deeplinkReplacements($content);
 
 			// Not needed for apps, but helpful for diagnostics
 			$eO['ID'] = $eQ->ID;
@@ -315,7 +324,7 @@ protected static function generateEventsListFromMeetings(array $params = []): ar
 			$eO['RelatedImageFileKey'] = $eO['image'];
 
 			// iOS
-			$eO['Description'] = str_replace("{{MOBILE_OS}}", "iOS", $content);
+			$eO['Description'] = str_replace("{{MOBILE_OS}}", "iOS", $content_ios);
 			// Android
 			$eO['content'] = str_replace("{{MOBILE_OS}}", "android", $content);
 

From 1afdca0a7eb3955f713fee37d1bdade9491d8c75 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 16 Jun 2025 19:31:59 -0400
Subject: [PATCH 301/423] Add uGet for user-auth GET requests.

---
 src/TouchPoint-WP/Api.php | 120 +++++++++++++++++++++++++++++++++++---
 1 file changed, 113 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 00ef508e..45a7f675 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -76,6 +76,95 @@ public static function instance(?TouchPointWP $parent = null): Api
 	}
 
 
+	/**
+	 * Gets data from the API with Basic User Auth.
+	 *
+	 * This method is provided until TouchPoint has been updated to allow PAT authentication on more endpoints.  The
+	 * signature is identical to the PAT version so replacement later should be easy, however, onbehalf
+	 *
+	 * @param string $command The API endpoint to call
+	 * @param array $headers Headers to send with the request.
+	 * @param ?int $onBehalfPid The PID of the user to act on behalf of.
+	 * @param int $timeout Amount of time in sec to wait before timing out.
+	 * @param float $timeTaken The time taken to complete the request.
+	 *
+	 * @return array|WP_Error An array with headers, body, and other keys
+	 *
+	 * @throws TouchPointWP_Exception Thrown if the API credentials are incomplete.
+	 * @throws TouchPointWP_WPError
+	 *
+	 * @deprecated Use `get()` instead once possible, which uses PAT authentication.
+	 *
+	 * @since 0.0.96 Added and deprecated.
+	 *
+	 */
+	public function uGet(string $command, array $parameters = [], array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	{
+		$tik = microtime(true);
+
+		if ( ! $this->settings()->hasValidApiSettings()) {
+			TouchPointWP::instance()->logoutServiceMaybe();
+			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
+		}
+
+		$this->checkApiValidity();
+		$host = $this->parent->host();
+		$url = $host . "/api/" . $command;
+
+		self::$apiCallLog[] = $url;
+
+		$headers['Authorization'] = $this->getBasicAuth();
+
+		if (!isset($headers['Content-Type'])) {
+			$headers['Content-Type'] = 'text/plain';
+		}
+
+		if ($onBehalfPid) {
+			TouchPointWP::instance()->logoutServiceMaybe();
+			throw new TouchPointWP_Exception("On-Behalf-Of is not supported for Basic Auth.");
+		}
+
+		// build query string
+		if (!empty($parameters)) {
+			$url .= (!str_contains($url, '?') ? '?' : '&') . http_build_query($parameters);
+		}
+
+		for ($attempt = 0; $attempt < 2; $attempt++) {
+			$r   = $this->getHttpClient()->request(
+				$url,
+				[
+					'method'  => 'GET',
+					'headers' => $headers,
+					'timeout' => $timeout
+				]
+			);
+
+			if ($r instanceof WP_Error) {
+				return $r;
+			}
+		}
+
+		$timeTaken = microtime(true) - $tik;
+
+		return $r;
+	}
+
+
+	/**
+	 * Get the Basic Auth header for the API.  Only used until PAT is fully implemented.
+	 *
+	 * @deprecated
+	 *
+	 * @since 0.0.96 Added and deprecated.
+	 *
+	 * @return string
+	 */
+	protected function getBasicAuth(): string
+	{
+		return 'Basic ' . base64_encode($this->settings()->api_user . ':' . $this->settings()->api_pass);
+	}
+
+
 	/**
 	 * Gets data from the API via the python script.
 	 *
@@ -95,10 +184,12 @@ public function pyGet(string $command, ?array $parameters = null, int $timeout =
 		}
 
 		if ( ! $this->settings()->hasValidApiSettings()) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
 		}
 
 		if (!self::$allowApiCalls) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
 		}
 
@@ -109,6 +200,7 @@ public function pyGet(string $command, ?array $parameters = null, int $timeout =
 		$host = $this->parent->host();
 
 		if (!$host) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception(__('Host appears to be missing from TouchPoint-WP configuration.', 'TouchPoint-WP'), 170002);
 		}
 
@@ -126,9 +218,7 @@ public function pyGet(string $command, ?array $parameters = null, int $timeout =
 			[
 				'method'  => 'GET',
 				'headers' => [
-					'Authorization' => 'Basic ' . base64_encode(
-							$this->settings()->api_user . ':' . $this->settings()->api_pass
-						)
+					'Authorization' => $this->getBasicAuth()
 				],
 				'timeout' => $timeout
 			]
@@ -156,6 +246,7 @@ public function pyPost(string $command, mixed $data = null, int $timeout = 5, fl
 		$host = $this->parent->host();
 
 		if ( ! $host) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception(
 				__("Host appears to be missing from TouchPoint-WP configuration.", "TouchPoint-WP"), 170002
 			);
@@ -223,9 +314,10 @@ protected function prepareRequest(string $command, mixed &$headers, ?int $onBeha
 
 
 	/**
-	 * Do a GET to the standard API using a PAB.
+	 * Do a GET to the standard API using a PAT.
 	 *
 	 * @param string $command The API endpoint to call
+	 * @param array  $parameters URL parameters to be added.
 	 * @param array  $headers Headers to send with the request.
 	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
 	 * @param int    $timeout Amount of time in sec to wait before timing out.
@@ -234,12 +326,17 @@ protected function prepareRequest(string $command, mixed &$headers, ?int $onBeha
 	 * @return array|WP_Error The response from the Http request call.
 	 * @throws TouchPointWP_Exception  If anything went wrong.
 	 */
-	public function get(string $command, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	public function get(string $command, array $parameters = [], array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
 	{
 		$tik = microtime(true);
-
 		for ($attempt = 0; $attempt < 2; $attempt++) {
 			$url = $this->prepareRequest($command, $headers, $onBehalfPid);
+
+			// build query string
+			if (!empty($parameters)) {
+				$url .= (!str_contains($url, '?') ? '?' : '&') . http_build_query($parameters);
+			}
+
 			$r   = $this->getHttpClient()->request(
 				$url,
 				[
@@ -271,7 +368,7 @@ public function get(string $command, array $headers = [], ?int $onBehalfPid = nu
 
 
 	/**
-	 * Do a POST to the standard API using a PAB.
+	 * Do a POST to the standard API using a PAT.
 	 *
 	 * @param string $command The API endpoint to call
 	 * @param ?mixed $data Data to post
@@ -483,10 +580,12 @@ protected final function getHttpClient(): ?WP_Http
 	protected function checkApiValidity(): void
 	{
 		if ( ! $this->settings()->hasValidApiSettings()) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001);
 		}
 
 		if (!self::$allowApiCalls) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
 		}
 
@@ -498,6 +597,7 @@ protected function checkApiValidity(): void
 				$mostCommon = "  Most Common: " . key($counts);
 			}
 
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("Too many API calls have been attempted in this session.$mostCommon", 170009);
 		}
 	}
@@ -513,33 +613,39 @@ protected function checkApiValidity(): void
 	private static function parsePyApiResponse(WP_Error|array $response): array|stdClass
 	{
 		if ($response instanceof WP_Error) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_WPError($response);
 		}
 
 		if ($response['response']['code'] === 429) {
 			self::$allowApiCalls = false;
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009);
 		}
 
 		$respDecoded = json_decode($response['body']);
 
 		if ($respDecoded === null) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("Connection Error", 179000);
 		}
 
 		// Most likely the issue where a module import failed for no apparent reason.
 		if (property_exists($respDecoded, 'output') &&
 		    str_starts_with($respDecoded->output, "Traceback (most recent call last):")) {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001);
 		}
 
 		// Some other script error
 		if (property_exists($respDecoded, 'output') && $respDecoded->output !== '') {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179002);
 		}
 
 		// Error caught by error handling within Python script
 		if (property_exists($respDecoded, 'message') && $respDecoded->message !== '') {
+			TouchPointWP::instance()->logoutServiceMaybe();
 			throw new TouchPointWP_Exception($respDecoded->message, 179003);
 		}
 

From a49db1b772196dd7c562350ebfb49c3a198dca8c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 16 Jun 2025 19:34:28 -0400
Subject: [PATCH 302/423] Closes #233

---
 src/TouchPoint-WP/Auth.php         |  1 +
 src/TouchPoint-WP/TouchPointWP.php | 56 ++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 7e7199d2..498ff472 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -194,6 +194,7 @@ public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $
 		}
 
 		$redirect = TouchPointWP::instance()->settings->auth_change_profile_urls === 'on';
+		$redirect &= !TouchPointWP::userHasEditingPermissions();
 
 		/**
 		 * Controls whether to redirect to the TouchPoint login automatically.
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 4a615b8d..011ba7a3 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -556,7 +556,7 @@ public static function currentUserIsAdmin(): bool
 
 
 	/**
-	 * Determine if the current user can edit anything and therefore may need access to wp-admin.
+	 * Determine if the current user can edit *anything* and therefore may need access to wp-admin.
 	 *
 	 * @param int|null $userId
 	 *
@@ -573,6 +573,25 @@ public static function userHasEditingPermissions(?int $userId = null): bool
 		}
 
 		$user = get_user($userId);
+		
+		foreach ($user->caps as $cap => $enabled) {
+			if (!$enabled) {
+				continue;
+			}
+
+			// if cap starts with any of several terms "edit", "Manage", etc, return true.
+			if (str_starts_with($cap, 'edit_') ||
+			    str_starts_with($cap, 'manage_') ||
+			    str_starts_with($cap, 'publish_') ||
+			    str_starts_with($cap, 'delete_') ||
+			    str_starts_with($cap, 'create_') ||
+			    str_starts_with($cap, 'switch_') ||
+			    str_contains($cap, 'admin') || // various admin-like stuff.
+			    str_contains($cap, "translat") // various WPML capabilities
+			) {
+				return true;
+			}
+		}
 
 		foreach ($user->roles as $role) {
 			$role = get_role($role);
@@ -2628,13 +2647,42 @@ public function setTpWpUserAsCurrent(): void
 
 		$priorUser = wp_get_current_user();
 
-		$tpUser = get_user_by('login', 'touchpoint-wp');
+		$tpUser = self::getTpUser();
 		if ($tpUser && $tpUser !== $priorUser) {
 			$this->priorUser = $priorUser;
 			wp_set_current_user($tpUser->ID, $tpUser->user_login);
 		}
 	}
 
+
+
+	/**
+	 * If the current user is somehow making requests as the TouchPoint service, log out (or switch back to the proper user)
+	 *
+	 * @return void
+	 */
+	public function logoutServiceMaybe(): void
+	{
+		$currentUser = wp_get_current_user();
+		$tpUser = self::getTpUser();
+
+		if ($tpUser && $currentUser && $currentUser->ID === $tpUser->ID) {
+			$this->unsetTpWpUserAsCurrent();
+		}
+	}
+
+
+	/**
+	 * Returns the TouchPoint-WP Service user, or false if it doesn't exist.
+	 *
+	 * @return false|WP_User
+	 */
+	protected static function getTpUser(): false|WP_User
+	{
+		return get_user_by('login', 'touchpoint-wp');
+	}
+
+
 	/**
 	 * Restore the actual user to the user position.
 	 *
@@ -2642,7 +2690,9 @@ public function setTpWpUserAsCurrent(): void
 	 */
 	public function unsetTpWpUserAsCurrent(): void
 	{
-		if ($this->priorUser) {
+		$tpUser = self::getTpUser();
+
+		if ($this->priorUser && (!$tpUser || $this->priorUser->ID !== $tpUser->ID)) {
 			wp_set_current_user($this->priorUser->ID, $this->priorUser->user_login);
 			$this->priorUser = null;
 		} else {

From ee9a4b4c74479be36302dee237f42c4aeaed8046 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 22 Jun 2025 17:59:23 -0400
Subject: [PATCH 303/423] Remove checkUpdates from init to make init more
 efficient.

---
 src/TouchPoint-WP/Partner.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 18278e8d..c59217a1 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -262,8 +262,6 @@ public static function init(): void
 		// Register function to return nulls instead of authors
 		add_filter('the_author', [self::class, 'filterAuthor'], 10, 3);
 		add_filter('get_the_author_display_name', [self::class, 'filterAuthor'], 10, 3);
-
-		self::checkUpdates();
 	}
 
 	public static function checkUpdates(): void

From 96bcd48de16277b770ac8199b36af9ffe7a2172f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 17 Jul 2025 10:16:54 -0400
Subject: [PATCH 304/423] Fix an issue where sometimes parent posts aren't
 imported.

---
 src/TouchPoint-WP/Involvement.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 5eb7ad8c..f1fc4e54 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2895,10 +2895,13 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 			$parent = 0;
 			if ($inv->parentInvId > 0) {
 				$parent = self::getWpPostByInvolvementId($typeSets->postType, $inv->parentInvId);
-				$parent = $parent->ID;
-
-				if ($verbose) {
-					echo "<p>Parent Post: $parent</p>";
+				if ($parent !== null) {
+					$parent = $parent->ID;
+					if ($verbose) {
+						echo "<p>Parent Post: $parent</p>";
+					}
+				} elseif ($verbose) {
+					echo "<p>Parent Post could not be bound.</p>";
 				}
 			}
 

From f322eb0ad95fc20e52bc174178123938d6e03ca9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 17 Jul 2025 10:50:47 -0400
Subject: [PATCH 305/423] Resolve a notice that happens when user is not
 authenticated. Will help speed some page loads.

---
 src/TouchPoint-WP/TouchPointWP.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 011ba7a3..b6292067 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -574,6 +574,10 @@ public static function userHasEditingPermissions(?int $userId = null): bool
 
 		$user = get_user($userId);
 		
+		if (!$user) {
+			return false;
+		}
+		
 		foreach ($user->caps as $cap => $enabled) {
 			if (!$enabled) {
 				continue;

From a9bd46ed5a68fdb5a4c217cf1e4fcd1c9d814dad Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 25 Jul 2025 10:54:35 -0400
Subject: [PATCH 306/423] Correcting a bug with incomplete quotes

---
 src/templates/admin/invKoForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index fe88f491..ea313319 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -315,7 +315,7 @@ function InvType(data) {
         this.excludeIf = ko.observable(data.excludeIf ?? []);
         this.hierarchical = ko.observable(data.hierarchical ?? false);
         this.importMeetings = ko.observable(data.importMeetings ?? false);
-        this.meetingGroupingMethod = ko.observable(data.meetingGroupingMethod ?? <?php echo Meeting::GROUP_NONE ?>);
+        this.meetingGroupingMethod = ko.observable(data.meetingGroupingMethod ?? "<?php echo Meeting::GROUP_NONE ?>");
         this.groupBy = ko.observable(data.groupBy ?? "");
         this.leaderTypes = ko.observableArray(data.leaderTypes ?? []);
         this.hostTypes = ko.observableArray(data.hostTypes ?? []);

From 8ff49d8f8edf631a2bad2d455532ad597958fea8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 25 Jul 2025 11:01:02 -0400
Subject: [PATCH 307/423] Improving some labels

---
 src/templates/admin/invKoForm.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index fe88f491..525dbb21 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -47,6 +47,7 @@
         <tr>
             <th><?php _e("Divisions to Import", "TouchPoint-WP"); ?></th>
             <td colspan="2" class="column-wrap">
+                <p><?php _e("Only involvements from the selected divisions will be included.", "TouchPoint-WP"); ?></p>
                 <!-- ko foreach: $root.divisions -->
                 <p>
                     <input id="it-div" type="checkbox" data-bind="value: 'div' + id, checked: $parent.importDivs, attr: {id: 'it-' + $parent.slug() + '-div-' + id}" />
@@ -59,6 +60,7 @@
         <tr>
             <th><?php _e("Import Campuses", "TouchPoint-WP"); ?></th>
             <td colspan="2">
+                <p><?php _e("Only involvements from the selected campuses will be included.", "TouchPoint-WP"); ?></p>
                 <!-- ko if: $root.campuses.length < 1 -->
                 <p><?php _e("Loading...", "TouchPoint-WP"); ?></p>
                 <!-- /ko -->

From b6468ae48b46e64e1e2f5fa666dbbba8e65f9372 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 25 Jul 2025 11:01:23 -0400
Subject: [PATCH 308/423] Improving some labels

---
 src/templates/admin/invKoForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 525dbb21..b4ebd498 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -58,7 +58,7 @@
         </tr>
 
         <tr>
-            <th><?php _e("Import Campuses", "TouchPoint-WP"); ?></th>
+            <th><?php _e("Campuses to Import", "TouchPoint-WP"); ?></th>
             <td colspan="2">
                 <p><?php _e("Only involvements from the selected campuses will be included.", "TouchPoint-WP"); ?></p>
                 <!-- ko if: $root.campuses.length < 1 -->

From 26347ab7dbdec549d1f90bc0330db87d5b9bb2c2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 27 Jul 2025 12:18:23 -0400
Subject: [PATCH 309/423] Commenting out the 6.7 block registration that causes
 deprecation warnings. Should re-activate in the future.

---
 src/TouchPoint-WP/Blocks/BlocksController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index c167c16d..bba09438 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -33,10 +33,10 @@ public static function init(): void
 		 *
 		 * @see https://make.wordpress.org/core/2025/03/13/more-efficient-block-type-registration-in-6-8/
 		 */
-		if (function_exists('wp_register_block_types_from_metadata_collection')) {
-			wp_register_block_types_from_metadata_collection($blocksRoot, $blocksRoot . 'blocks-manifest.php');
-			return;
-		}
+//		if (function_exists('wp_register_block_types_from_metadata_collection')) {  TODO re-enable when it doesn't cause warnings in the logs. 
+//			wp_register_block_types_from_metadata_collection($blocksRoot, $blocksRoot . 'blocks-manifest.php');
+//			return;
+//		}
 
 		/**
 		 * Registers the block(s) metadata from the `blocks-manifest.php` file.

From fe58859bf06898fb42a63a0a7b8108d4f284236f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 28 Jul 2025 20:19:12 -0400
Subject: [PATCH 310/423] Fix a bug where small group leaders aren't always
 being assigned tasks. Related to #146 and #175.

---
 src/python/WebApi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 939588b3..78407a44 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -793,7 +793,7 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0} AND MainLeaderId IS NOT NULL
     UNION
     SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)
@@ -843,7 +843,7 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0} AND MainLeaderId IS NOT NULL
     UNION
     SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)

From 6979021eb5c67bcd82e854571d3248e9ee64ad61 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 28 Jul 2025 20:19:12 -0400
Subject: [PATCH 311/423] Fix a bug where small group leaders aren't always
 being assigned tasks. Related to #146 and #175.

---
 src/python/WebApi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 939588b3..78407a44 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -793,7 +793,7 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0} AND MainLeaderId IS NOT NULL
     UNION
     SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)
@@ -843,7 +843,7 @@ def get_person_info_for_sync(person_obj):
     orgContactSql = '''
     SELECT TOP 1 IntValue as contactId FROM OrganizationExtra WHERE OrganizationId = {0} AND Field = '{1}'
     UNION
-    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0}
+    SELECT TOP 1 MainLeaderId as contactId FROM Organizations WHERE OrganizationId = {0} AND MainLeaderId IS NOT NULL
     UNION
     SELECT TOP 1 PeopleId as contactId FROM OrganizationMembers WHERE OrganizationId = {0} AND MemberTypeId in ({2})
     '''.format(oid, sgContactEvName, memTypes)

From 0979494463435259d002a2d745dd004d46b404f5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 25 Aug 2025 15:33:24 -0400
Subject: [PATCH 312/423] Resolving an issue where dates aren't consistently
 translated.  Closes #235.

---
 src/TouchPoint-WP/Utilities/DateTimeExtended.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities/DateTimeExtended.php b/src/TouchPoint-WP/Utilities/DateTimeExtended.php
index fe5e2efa..8e311c7b 100644
--- a/src/TouchPoint-WP/Utilities/DateTimeExtended.php
+++ b/src/TouchPoint-WP/Utilities/DateTimeExtended.php
@@ -9,7 +9,7 @@
 use DateTimeImmutable;
 
 /**
- * A collection of people, easily cast to string.
+ * A helper class for DateTimeImmutable.
  */
 class DateTimeExtended extends DateTimeImmutable
 {
@@ -19,4 +19,9 @@ public function __construct($time = "now", $timezone = null)
 	{
 		parent::__construct($time, $timezone);
 	}
+
+	public function format(string $format): string
+	{
+		return date_i18n($format, $this->getTimestamp());
+	}
 }
\ No newline at end of file

From bfe12a17233fe0951e789bb5c44388ad382266c9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 21:44:21 -0400
Subject: [PATCH 313/423] Bump tested version to 6.8.2

---
 touchpoint-wp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index da743135..fc321ebc 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -20,7 +20,7 @@
 License:            AGPLv3+
 Text Domain:        TouchPoint-WP
 Requires at least:  6.0
-Tested up to:       6.8
+Tested up to:       6.8.2
 Requires PHP:       8.0
 Release Asset:      true
 */

From 35d15e19412cfbd1e0e7b7b9afe64159f751e055 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:04:12 -0400
Subject: [PATCH 314/423] Removing an unused var and making sure style resets
 properly

---
 assets/js/base-defer.js | 2 +-
 blocks/common.js        | 9 +++++++++
 src/python/WebApi.py    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 blocks/common.js

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 13030a6a..68ab0f84 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -621,7 +621,6 @@
             }
 
             map.fitBounds(bounds);
-            let originalZoom = map.getZoom();
 
             map.addListener('bounds_changed', this.handleZoom);
 
@@ -652,6 +651,7 @@
         static updateFilterWarnings() {
             let elts = document.getElementsByClassName("TouchPointWP-map-warning-visibleOnly"),
                 includesBoth = TP_Mappable.mapIncludesVisibleItemsWhichAreBothInAndOutOfBounds;
+            elts[ei].style = undefined;
             for (const ei in elts) {
                 if (!elts.hasOwnProperty(ei))
                     continue;
diff --git a/blocks/common.js b/blocks/common.js
new file mode 100644
index 00000000..345bd6ec
--- /dev/null
+++ b/blocks/common.js
@@ -0,0 +1,9 @@
+export function generateUniqueId() {
+    // generate a string of incrementing numbers based on a static variable
+    if (typeof generateUniqueId.counter == 'undefined') {
+        generateUniqueId.counter = 0;
+    }
+
+    return ++generateUniqueId.counter;
+}
+
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 78407a44..81203936 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -344,7 +344,7 @@ def get_person_info_for_sync(person_obj):
                         FORMAT(om.MeetingEnd, 'yyyy-MM-ddTHH:mm:ss') as mtgEndDt,
                         om.Location as location,
                         om.Description as name,
-                        1 - om.DidNotMeet as status,
+                        1 - (om.DidNotMeet or om.Canceled or om.ApprovalStatus = 2) as status, -- ApprovalStatus 2 = Rejected
                         om.Capacity as capacity,
                         CAST(me.Data as INT) as parentMtgId
                     FROM dbo.Meetings om

From 24da71edd82ceac6af4362364988fcac6ab04b13 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:04:53 -0400
Subject: [PATCH 315/423] Adding involvementsearch API endpoint for admin UI

---
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 318cca78..2a508263 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -56,6 +56,14 @@ public static function api(array $uri): bool
 				echo json_encode($divs);
 				exit;
 
+			case "involvementsearch":
+				header('Content-Type: application/json');
+				$result = TouchPointWP::instance()->api->uGet('v1/Involvements', [
+					'terms' => $_GET['s']
+				]);
+				echo $result['body'];
+				exit;
+
 			case self::API_ENDPOINT_SCRIPTZIP:
 				if ( ! TouchPointWP::currentUserIsAdmin()) {
 					return false;

From 5d3baabf9ec59773b3bcb4fd9d2337a57326b6ee Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:05:39 -0400
Subject: [PATCH 316/423] Resolve an issue where symbols in error messages are
 being handled badly.

---
 src/TouchPoint-WP/TouchPointWP_Exception.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index efdddbef..e3040b14 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -34,7 +34,7 @@ public function __construct(string $message = "", int $code = 0, ?Throwable $pre
 			$message = $this->getMessage();
 			if (current_user_can('manage_options') && self::debugMode()) {
 				$message .= "<br />" . $this->getFile() . " @ " . $this->getLine() . "<br />";
-				$message .= str_replace("\n", "<br />", $this->getTraceAsString());
+				$message .= str_replace("\n", "<br />", esc_html($this->getTraceAsString()));
 			}
 			self::showAdminError($message);
 		}

From 5a660d43fb43da624eaba937cd6fb1deaf727c77 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:08:17 -0400
Subject: [PATCH 317/423] Resolve a JS error that can happen if tpvm doesn't
 initialize when expected.

---
 src/TouchPoint-WP/TouchPointWP.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index b6292067..dd56529e 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -635,7 +635,7 @@ public function printDynamicFooterScripts(): void
 
 		echo "<script defer id=\"TP-Dynamic-Instantiation\">\n";
 		if ($this->debug) {
-			echo "\ttpvm.DEBUG = true;\n";
+			echo "\tif (tpvm) tpvm.DEBUG = true;\n";
 		}
 
 		// TODO this should possibly be moved to ajax for better caching -- especially if only used for RSVP.

From f588029d4da0a602a3be940b4082781637c69157 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:10:48 -0400
Subject: [PATCH 318/423] metadata file updates

---
 .gitignore                          |  2 ++
 .idea/libraries/Generated_files.xml |  6 ++++--
 .idea/php.xml                       | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12986275..255836ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ composer.lock
 /.idea/dataSources.xml
 /.idea/webServers.xml
 /.idea/runConfigurations/Local.xml
+/.idea/copilotDiffState.xml
+/.idea/data_source_mapping.xml
 
 *.min.js
 node_modules
diff --git a/.idea/libraries/Generated_files.xml b/.idea/libraries/Generated_files.xml
index 71c16549..885dc173 100644
--- a/.idea/libraries/Generated_files.xml
+++ b/.idea/libraries/Generated_files.xml
@@ -5,8 +5,9 @@
         <item url="file://$PROJECT_DIR$/build/assets/js/base-defer.js" />
         <item url="file://$PROJECT_DIR$/build/assets/js/meeting-defer.js" />
         <item url="file://$PROJECT_DIR$/build/assets/js/partner-defer.js" />
+        <item url="file://$PROJECT_DIR$/build/blocks/common.js" />
         <item url="file://$PROJECT_DIR$/build/blocks/inv-list/index.js" />
-        <item url="file://$PROJECT_DIR$/build/blocks/inv-list/index.min.js" />
+        <item url="file://$PROJECT_DIR$/build/blocks/people-list/index.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
@@ -16,8 +17,9 @@
       <root url="file://$PROJECT_DIR$/build/assets/js/base-defer.js" />
       <root url="file://$PROJECT_DIR$/build/assets/js/meeting-defer.js" />
       <root url="file://$PROJECT_DIR$/build/assets/js/partner-defer.js" />
+      <root url="file://$PROJECT_DIR$/build/blocks/common.js" />
       <root url="file://$PROJECT_DIR$/build/blocks/inv-list/index.js" />
-      <root url="file://$PROJECT_DIR$/build/blocks/inv-list/index.min.js" />
+      <root url="file://$PROJECT_DIR$/build/blocks/people-list/index.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
diff --git a/.idea/php.xml b/.idea/php.xml
index fd18050b..83aebbe3 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -19,6 +19,32 @@
       <path value="$PROJECT_DIR$/../WordPressDemo" />
       <path value="$PROJECT_DIR$/vendor/composer" />
       <path value="$PROJECT_DIR$/../TenthDev/app/public" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
+      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/pronamic/wp-documentor" />
+      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/twig/twig" />
+      <path value="$PROJECT_DIR$/vendor/skayo/phpdoc-md" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.0">

From d3d87a39f89004f5001b09ddd060de740e311b73 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:22:55 -0400
Subject: [PATCH 319/423] Point to non-minified js files

---
 blocks/inv-list/block.json                    |  2 +-
 blocks/people-list/block.json                 | 17 +++++++++++++++++
 src/TouchPoint-WP/Blocks/BlocksController.php |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 blocks/people-list/block.json

diff --git a/blocks/inv-list/block.json b/blocks/inv-list/block.json
index 89062395..d956eed4 100644
--- a/blocks/inv-list/block.json
+++ b/blocks/inv-list/block.json
@@ -13,5 +13,5 @@
     "reusable": false
   },
   "textdomain": "TouchPoint-WP",
-  "editorScript": "file:./index.min.js"
+  "editorScript": "file:./index.js"
 }
\ No newline at end of file
diff --git a/blocks/people-list/block.json b/blocks/people-list/block.json
new file mode 100644
index 00000000..a09e669d
--- /dev/null
+++ b/blocks/people-list/block.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "name": "touchpoint-wp/people-list",
+  "version": "0.0.96",
+  "title": "People List",
+  "category": "widgets",
+  "icon": "groups",
+  "description": "A collection of People from TouchPoint",
+  "supports": {
+    "html": false,
+    "ariaLabel": true,
+    "reusable": false
+  },
+  "textdomain": "TouchPoint-WP",
+  "editorScript": "file:./index.js"
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index bba09438..f2e732ce 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -33,7 +33,7 @@ public static function init(): void
 		 *
 		 * @see https://make.wordpress.org/core/2025/03/13/more-efficient-block-type-registration-in-6-8/
 		 */
-//		if (function_exists('wp_register_block_types_from_metadata_collection')) {  TODO re-enable when it doesn't cause warnings in the logs. 
+//		if (function_exists('wp_register_block_types_from_metadata_collection')) {  TODO re-enable when it doesn't cause warnings in the logs.
 //			wp_register_block_types_from_metadata_collection($blocksRoot, $blocksRoot . 'blocks-manifest.php');
 //			return;
 //		}

From 9795826fdaa94c29520f1767dc9d43d9179f004c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 8 Sep 2025 22:33:27 -0400
Subject: [PATCH 320/423] phpunit initial

---
 .idea/phpunit.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .idea/phpunit.xml

diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
new file mode 100644
index 00000000..4f8104cf
--- /dev/null
+++ b/.idea/phpunit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPUnit">
+    <option name="directories">
+      <list>
+        <option value="$PROJECT_DIR$/tests" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file

From 23c40c19b84a98ab511b89007151f49c8b25961d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 10 Sep 2025 21:14:36 -0400
Subject: [PATCH 321/423] Add meetingseries to involvement meeting query

---
 src/python/WebApi.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 81203936..c392498b 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -372,6 +372,27 @@ def get_person_info_for_sync(person_obj):
             FOR JSON PATH, INCLUDE_NULL_VALUES
             ) as OrgSchedule
             FROM cteTargetOrgs cto),
+        -- pull aggregate MeetingSeries for all target organizations
+        cteMeetingSeries AS
+        (
+            SELECT cto.OrganizationId,
+                (
+                    SELECT DISTINCT ms.MeetingSeriesId as mtgSeriesId,
+                        FORMAT(ms.MeetingStart, 'yyyy-MM-ddTHH:mm:ss') as mtgStartDt,
+                        FORMAT(ms.MeetingEnd, 'yyyy-MM-ddTHH:mm:ss') as mtgEndDt,
+                        ms.RRuleString as RRuleString,
+                        ms.Description as name,
+                        1 - (ms.Canceled or ms.ApprovalStatus = 2) as status, -- ApprovalStatus 2 = Rejected
+                        ms.Capacity as capacity
+                    FROM dbo.MeetingSeries ms
+                        INNER JOIN cteTargetOrgs o
+                            ON ms.OrganizationId = o.OrganizationId
+                    WHERE ms.OrganizationId = cto.OrganizationId AND
+                        ms.SeriesCompleted = 0
+                    FOR JSON PATH, INCLUDE_NULL_VALUES
+                ) as OrgMeetingSeries
+            FROM cteTargetOrgs cto
+        ),
         -- pull aggregate divisions for all target organizations
         cteDivision AS 
         (SELECT OrganizationId, STRING_AGG(divId, ',') WITHIN GROUP (ORDER BY divId ASC) AS OrgDivision
@@ -448,6 +469,7 @@ def get_person_info_for_sync(person_obj):
             , aa.PeopleAge                   AS [age_groups]
             , s.OrgSchedule                  AS [schedules]
             , m.OrgMeetings                  AS [meetings]
+            , e.OrgMeetingSeries             AS [meetingSeries]
             , d.OrgDivision                  AS [divs]
             , ol.lat                         AS [lat]
             , ol.lng                         AS [lng]
@@ -460,6 +482,8 @@ def get_person_info_for_sync(person_obj):
                 ON o.OrganizationId = aa.OrganizationId
             LEFT JOIN cteSchedule s
                 ON o.OrganizationId = s.OrganizationId
+            LEFT JOIN cteMeetingSeries e
+                ON o.OrganizationId = e.OrganizationId
             LEFT JOIN cteMeeting m
                 ON o.OrganizationId = m.OrganizationId
             LEFT JOIN cteDivision d

From 0bd8acf642a9931c1aadb8f7e652c205f2eca75d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 16 Sep 2025 13:45:32 -0500
Subject: [PATCH 322/423] Adding packages for blocks

---
 package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package.json b/package.json
index d2d3c079..b9f2a14a 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,12 @@
     "@wordpress/env": "^10.22.0",
     "@wordpress/i18n": "^5.22.0",
     "@wordpress/scripts": "^30.18.0",
+    "glob": "^11.0.2",
     "style-loader": "^4.0.0",
     "uglify-js": "^3.17.4"
+  },
+  "dependencies": {
+    "@wordpress/components": "^30.0.0",
+    "@wordpress/element": "^6.27.0"
   }
 }
\ No newline at end of file

From 1c8ab20d2ee4f1207afbe0e6eb5c2e57e26d8b26 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 16 Sep 2025 13:50:33 -0500
Subject: [PATCH 323/423] Scoping changes for shortcodes methods

---
 src/TouchPoint-WP/Involvement.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index f1fc4e54..9da2af34 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1434,7 +1434,7 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 		$q->set('orderby', 'title'); // will mostly be overwritten by geographic sort, if available.
 		$q->set('order', 'ASC');
 
-		if ($q->is_post_type_archive()) {
+		if ( ! isset($q->query['post_parent'])) {
 			$q->set('post_parent', 0);
 		}
 
@@ -1670,7 +1670,7 @@ public static function listShortcode($params = [], string $content = ""): string
 	 * 
 	 * @return void
 	 */
-	public static function ajaxListShortcode(): void
+	protected static function ajaxListShortcode(): void
 	{
 		// This is an AJAX call, so we need to set the headers.
 		if ( ! headers_sent()) {

From d9a733b0210f96a6f3045048b4b83ffe8c862970 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 16 Sep 2025 13:51:15 -0500
Subject: [PATCH 324/423] Adding peopleList function and endpoint

---
 src/TouchPoint-WP/Person.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index d9d5d61d..8521e407 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1818,6 +1818,10 @@ public static function api(array $uri): bool
 				self::ajaxContact();
 				exit;
 
+			case "list":
+				self::ajaxPeopleListShortcode();
+				exit;
+
 			case "force-sync":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
 				try {
@@ -1914,6 +1918,21 @@ private static function ajaxContact(): void
 		exit;
 	}
 
+	/**
+	 * Handles the AJAX call to return a list of people.
+	 *
+	 * @return void
+	 */
+	protected static function ajaxPeopleListShortcode(): void
+	{
+		// This is an AJAX call, so we need to set the headers.
+		if ( ! headers_sent()) {
+			TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE);
+		}
+
+		echo self::peopleListShortcode($_GET, __('None right now.', 'TouchPoint-WP'));
+	}
+
 	/**
 	 * Loads the module and initializes the other actions.
 	 *

From 8858ddfd410255a9be6f80f9a1bc90ee185428af Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 16 Sep 2025 13:57:55 -0500
Subject: [PATCH 325/423] Adding some help language to UI for inv list block

---
 blocks/inv-list/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index cadc1afe..fa00de44 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -14,7 +14,7 @@ import "../../assets/template/block-preview-style.css"
  */
 import metadata from './block.json';
 import {__} from "@wordpress/i18n";
-import {uniqueId} from "@wordpress/block-editor/src/components/link-control/test/fixtures";
+import { generateUniqueId } from '../common';
 
 /**
  * Every block starts by registering a new block type definition.
@@ -41,7 +41,7 @@ wp.blocks.registerBlockType( metadata.name, {
 		const { attributes, setAttributes } = props;
 		const { postType, division } = attributes;
 		const blockProps = wp.blockEditor.useBlockProps();
-		const placeholderId = `tp-inv-list-${uniqueId()}`;
+		const placeholderId = `tp-inv-list-${generateUniqueId()}`;
 
 		const [postTypeOptions, setPostTypeOptions] = wp.element.useState([]);
 		const [divisionChildren, setDivisionChildren] = wp.element.useState(null);
@@ -71,6 +71,7 @@ wp.blocks.registerBlockType( metadata.name, {
 			})();
 		}, []);
 
+		// Get options for divisions
 		wp.element.useEffect(() => {
 			(async () => {
 				try {
@@ -94,6 +95,7 @@ wp.blocks.registerBlockType( metadata.name, {
 			})();
 		}, []);
 
+		// preview
 		wp.element.useEffect(() => {
 			updateListContent(postType, division, blockProps, placeholderId);
 		}, [postType, division, blockProps.className, placeholderId]);
@@ -110,6 +112,7 @@ wp.blocks.registerBlockType( metadata.name, {
 							<>
 								<wp.components.SelectControl
 									label={__("Post Type", "TouchPoint-WP")}
+									help={__("These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings.", "TouchPoint-WP")}
 									value={postType}
 									options={postTypeOptions}
 									onChange={(value) => setAttributes({ postType: value })}
@@ -118,6 +121,7 @@ wp.blocks.registerBlockType( metadata.name, {
 								/>
 								<wp.components.SelectControl
 									label={__("Division", "TouchPoint-WP")}
+									help={__("This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings.", "TouchPoint-WP")}
 									value={division}
 									children={divisionChildren}
 									onChange={(value) => setAttributes({ division: Number(value) })}

From b8f74d39a76c9a7e71435a4796bb1758d471ab2f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 Oct 2025 11:33:13 -0400
Subject: [PATCH 326/423] Correcting syntactical issue for meetings

---
 src/python/WebApi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index c392498b..b3e429ac 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -344,7 +344,7 @@ def get_person_info_for_sync(person_obj):
                         FORMAT(om.MeetingEnd, 'yyyy-MM-ddTHH:mm:ss') as mtgEndDt,
                         om.Location as location,
                         om.Description as name,
-                        1 - (om.DidNotMeet or om.Canceled or om.ApprovalStatus = 2) as status, -- ApprovalStatus 2 = Rejected
+                        IIF(om.DidNotMeet = 1 OR om.Canceled = 1 OR om.ApprovalStatus = 2, 0, 1) as status,  -- ApprovalStatus 2 = Rejected
                         om.Capacity as capacity,
                         CAST(me.Data as INT) as parentMtgId
                     FROM dbo.Meetings om
@@ -382,7 +382,7 @@ def get_person_info_for_sync(person_obj):
                         FORMAT(ms.MeetingEnd, 'yyyy-MM-ddTHH:mm:ss') as mtgEndDt,
                         ms.RRuleString as RRuleString,
                         ms.Description as name,
-                        1 - (ms.Canceled or ms.ApprovalStatus = 2) as status, -- ApprovalStatus 2 = Rejected
+                        IIF(ms.Canceled = 1 or ms.ApprovalStatus = 2, 0, 1) as status, -- ApprovalStatus 2 = Rejected
                         ms.Capacity as capacity
                     FROM dbo.MeetingSeries ms
                         INNER JOIN cteTargetOrgs o

From 0109ee0a41728c3164b644c0f93d011847acaea9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 Oct 2025 11:54:39 -0400
Subject: [PATCH 327/423] Adding a warning for events in the past.

---
 assets/template/partials-template-style.css |  5 +++++
 src/templates/involvement-single.php        | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index 429b627e..9a548abb 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -247,4 +247,9 @@ header .tpwp-alert-block {
     margin: 2em 20%;
     background: #f003;
     padding: 1em;
+}
+header .tpwp-warn-block {
+    margin: 2em 20%;
+    background: #ff03;
+    padding: 1em;
 }
\ No newline at end of file
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index af49238b..b76e4ba8 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -3,6 +3,7 @@
 use tp\TouchPointWP\Involvement;
 use tp\TouchPointWP\Meeting;
 use tp\TouchPointWP\PostTypeCapable;
+use tp\TouchPointWP\Taxonomies;
 use tp\TouchPointWP\TouchPointWP;
 
 $postType = get_post_type();
@@ -50,6 +51,17 @@
                 __($meetingsCalled) // deliberately no domain
             );
             echo "</div>";
+        } elseif ($obj->tense() === Taxonomies::TAX_TENSE_PAST) {
+            echo "<div class='section-inner tpwp-alert-block tpwp-alert-info'>";
+
+            $meetingsCalled = $tps->mc_name_singular;
+
+            echo wp_sprintf(
+            // Translators: %s is the singular name of the of a Meeting, such as "Event".
+                    __('This %s has already happened.', 'TouchPoint-WP'),
+                    __($meetingsCalled) // deliberately no domain
+            );
+            echo "</div>";
         }
     }
 

From 43f3ea78854aafaa49e6de5789f613043711953b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 14 Oct 2025 11:59:09 -0400
Subject: [PATCH 328/423] Simplifying logic for determining if an event is in
 the past.

---
 src/TouchPoint-WP/Meeting.php        | 12 +++++++++++-
 src/templates/involvement-single.php |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 1d20b2e4..d3c64a18 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -463,7 +463,7 @@ public function notableAttributes(array|StringableArray $exclude = []): NotableA
 			$attrs['status'] = $status;
 		} else {
 			// Add an "in the past" label if the thing is already past. (end may be null)
-			if (($this->endDt ?? $this->startDt) < Utilities::dateTimeNow()) {
+			if ($this->isPast()) {
 				$attrs['past'] = __("In the Past", "TouchPoint-WP");
 			}
 		}
@@ -900,6 +900,16 @@ public function tense(): string
 		return Taxonomies::TAX_TENSE_PRESENT;
 	}
 
+	/**
+	 * Indicates if the meeting is in the past.
+	 *
+	 * @return bool
+	 */
+	public function isPast(): bool
+	{
+		return ($this->endDt ?? $this->startDt) < Utilities::dateTimeNow();
+	}
+
 	/**
 	 * Indicates if the meeting is multi-day.
 	 *
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index b76e4ba8..ef466613 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -51,7 +51,7 @@
                 __($meetingsCalled) // deliberately no domain
             );
             echo "</div>";
-        } elseif ($obj->tense() === Taxonomies::TAX_TENSE_PAST) {
+        } elseif ($obj->isPast()) {
             echo "<div class='section-inner tpwp-alert-block tpwp-alert-info'>";
 
             $meetingsCalled = $tps->mc_name_singular;

From 46a2e90fd37ebff54aaab649adc9b3d5e986dcff Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 09:52:16 -0500
Subject: [PATCH 329/423] Cause events to list in their proper order.  Closes
 #218

---
 src/TouchPoint-WP/Involvement.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 9da2af34..5fe31108 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -678,6 +678,10 @@ protected function meetings(): array
 			// Make sure items are unique.  #204
 			$m = array_unique($m, SORT_REGULAR);
 
+			usort($m, function ($a, $b) {
+				return $a->mtgStartDt <=> $b->mtgStartDt;
+			});
+
 			$this->_meetings = $m;
 		}
 
@@ -797,8 +801,10 @@ public function nextMeeting(): ?DateTimeExtended
 			foreach ($this->meetings() as $m) {
 				$mdt = $m->mtgStartDt;
 				if ($mdt > $now) {
+					// meetings are sorted, so first one past now is the next meeting
 					if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) {
 						$this->_nextMeeting = $mdt;
+						break;
 					}
 				}
 			}

From 4617e9b2fcce61671402a16f4ec3688225b037c9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 11:36:36 -0500
Subject: [PATCH 330/423] add copilot files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 255836ae..b524939c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ composer.lock
 /.idea/runConfigurations/Local.xml
 /.idea/copilotDiffState.xml
 /.idea/data_source_mapping.xml
+/.idea/copilot*
 
 *.min.js
 node_modules

From ad73ea73b34b4d40f0a5d6232154d784329a49a0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 11:54:45 -0500
Subject: [PATCH 331/423] Person-list now obeys parameters, I think.

---
 src/TouchPoint-WP/Person.php        | 12 ++++++++++--
 src/templates/parts/person-list.php |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 8521e407..59922bc4 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -394,9 +394,8 @@ public static function peopleListShortcode($params = [], string $content = ""):
 		/** @noinspection SpellCheckingInspection */
 		$params = shortcode_atts(
 			[
-				'class'         => 'TouchPoint-person people-list',
+				'class'         => 'people-list',
 				'invid'         => null,
-				'id'            => wp_unique_id('tp-actions-'),
 				'withsubgroups' => false,
 				'btnclass'      => 'btn button'
 			],
@@ -475,6 +474,11 @@ public static function peopleListShortcode($params = [], string $content = ""):
 
 		$people   = $q->get_results();
 		$btnClass = $params['btnclass'];
+		$listClass = $params['class'];
+
+		var_dump($q->request);
+
+		var_dump($people);
 
 		$loadedPart = get_template_part('person-list', 'person-list');
 		if ($loadedPart === false) {
@@ -485,6 +489,10 @@ public static function peopleListShortcode($params = [], string $content = ""):
 		}
 		// TODO DIR make sure this actually works with external partials.
 		// TODO DIR provide an alternate if there are no people available.
+		
+		if ($out === "") {
+			return $content;
+		}
 
 
 		return $out;
diff --git a/src/templates/parts/person-list.php b/src/templates/parts/person-list.php
index 8aabc69e..892b95ab 100644
--- a/src/templates/parts/person-list.php
+++ b/src/templates/parts/person-list.php
@@ -1,13 +1,15 @@
 <?php
 
 /** @var $people Person[] */
+/** @var $listClass string */
 
 
+use tp\TouchPointWP\Person;
 use tp\TouchPointWP\TouchPointWP;
 
 if (! empty($people)) { ?>
 
-<div <?php post_class("person-list"); ?>>
+<div class="<?php echo $listClass; ?>" >
 <?php
     foreach ($people as $person) {
         /** @noinspection PhpIncludeInspection */

From 9495a0f8567513468d28be436f1219f14a2f9cee Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 11:56:00 -0500
Subject: [PATCH 332/423] Improving speed and output info for build procedure.

---
 build.sh | 46 +++++++++++++++++++++++++++++-----------------
 docs     |  2 +-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/build.sh b/build.sh
index f02a61c6..51214e3d 100644
--- a/build.sh
+++ b/build.sh
@@ -2,27 +2,35 @@
 
 # Assumes PHP CLI, curl, and zip are already installed.
 
-# install NVM, Node, and NPM
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-nvm install node
-
-# update version in various json files
+# check if node is installed and install it if not
+if ! command -v node &> /dev/null; then
+  echo "Node.js is not installed. Installing Node.js and NPM using NVM..."
+
+  # install NVM, Node, and NPM
+  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
+  export NVM_DIR="$HOME/.nvm"
+  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+#  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+  nvm install node
+fi
+
+echo "Update version in various json files..."
 node ./buildPipeline/versionUpdate.js
 
-# update NPM packages
-npm update
+echo "Update NPM packages..."
+npm update --no-audit --prefer-offline
 
+echo "Cleaning up old build directory..."
 rm -r build
-rm touchpoint-wp.zip
+if [ -f touchpoint-wp.zip ]; then
+  rm touchpoint-wp.zip
+fi
 mkdir build
 mkdir build/assets
 mkdir build/assets/js
 
-# install uglify and uglify the JS files.
-echo $(npm install -g uglify-js)
+echo "Install uglify and uglify the JS files..."
+#echo $(npm install -g uglify-js)
 uglifyjs assets/js/base-defer.js -o build/assets/js/base-defer.min.js --source-map
 uglifyjs assets/js/meeting-defer.js -o build/assets/js/meeting-defer.min.js --source-map
 uglifyjs assets/js/partner-defer.js -o build/assets/js/partner-defer.min.js --source-map
@@ -30,10 +38,12 @@ cp -r assets build
 cd ./build || exit
 cd ..
 
-# build blocks
-npm install -g @wordpress/scripts
-wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks
-wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php
+echo "Build blocks..."
+#npm install -g @wordpress/scripts
+npx wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks
+npx wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php
+
+echo "Internationalization..."
 
 cp -r ./i18n ./build/i18n
 
@@ -42,6 +52,8 @@ php ./wp-cli.phar i18n make-mo ./build/i18n
 cp ./wpml-config.xml ./build/wpml-config.xml
 cp ./composer.json ./build/composer.json
 
+echo "Copy stuff..."
+
 cp -r ./ext ./build/ext
 cp -r ./src ./build/src
 
diff --git a/docs b/docs
index 783c1759..68151bdb 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 783c1759ae57890df4f68ed800da1b09c45803b7
+Subproject commit 68151bdb813cb88298470a1d3e2effd8af98120b

From 06840804e6a46ec67a57e0c458ae9308602e4279 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 12:06:02 -0500
Subject: [PATCH 333/423] Add involvementMeetingCommon.php for the surprisingly
 few things that Involvements and Meetings have in common that aren't covered
 elsewhere. Also renamed asAMeeting and added isPast()

---
 .../Interfaces/involvementMeetingCommon.php   | 20 +++++++++++++
 src/TouchPoint-WP/Involvement.php             | 30 ++++++++++++++-----
 src/TouchPoint-WP/Meeting.php                 |  7 ++---
 3 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php

diff --git a/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php b/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php
new file mode 100644
index 00000000..d5ef2cac
--- /dev/null
+++ b/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP\Interfaces;
+
+/**
+ * This class contains the elements common between the Involvement and Meeting classes.
+ */
+interface involvementMeetingCommon extends scheduled, hierarchical, actionButtons, hasGeo
+{
+	/**
+	 * Indicates if the meeting is in the past.
+	 *
+	 * @return bool
+	 */
+	public function isPast(): bool;
+
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 5fe31108..55765a12 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -13,6 +13,7 @@
 	require_once "jsInstantiation.php";
 	require_once "jsonLd.php";
 	require_once "Interfaces/hierarchical.php";
+	require_once "Interfaces/involvementMeetingCommon.php";
 	require_once "Interfaces/scheduled.php";
 	require_once "Interfaces/updatesViaCron.php";
 	require_once "Utilities.php";
@@ -27,10 +28,8 @@
 use JsonSerializable;
 use stdClass;
 use tp\TouchPointWP\Interfaces\api;
-use tp\TouchPointWP\Interfaces\hasGeo;
-use tp\TouchPointWP\Interfaces\hierarchical;
+use tp\TouchPointWP\Interfaces\involvementMeetingCommon;
 use tp\TouchPointWP\Interfaces\module;
-use tp\TouchPointWP\Interfaces\scheduled;
 use tp\TouchPointWP\Interfaces\updatesViaCron;
 use tp\TouchPointWP\Utilities\DateFormats;
 use tp\TouchPointWP\Utilities\DateTimeExtended;
@@ -49,7 +48,7 @@
 /**
  * Fundamental object meant to correspond to an Involvement in TouchPoint
  */
-class Involvement extends PostTypeCapable implements api, updatesViaCron, hasGeo, module, hierarchical, JsonSerializable, scheduled
+class Involvement extends PostTypeCapable implements api, updatesViaCron, module, JsonSerializable, involvementMeetingCommon
 {
 	use jsInstantiation;
 	use jsonLd;
@@ -2613,7 +2612,8 @@ public function hasGeo(): bool
 			return false;
 		}
 
-		return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null;
+		return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null && 
+		       is_numeric($this->geo->lat) && is_numeric($this->geo->lng);
 	}
 
 	public function asGeoIFace(string $type = "unknown"): ?Geo
@@ -3823,7 +3823,7 @@ public function notableAttributes(array|StringableArray $exclude = []): NotableA
 			$exclude = $exclude->getArrayCopy();
 		}
 
-		$asMeeting = $this->AsAMeeting();
+		$asMeeting = $this->asAMeeting();
 		if ($asMeeting !== null) {
 			$attrs = $asMeeting->notableAttributes(['involvement']);
 		} else {
@@ -4072,7 +4072,7 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false,
 				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
 			case RegistrationType::RSVP:
-				$asAMeeting = $this->AsAMeeting();
+				$asAMeeting = $this->asAMeeting();
 				if ($asAMeeting !== null) {
 					if ($absoluteLinks) {
 						return $asAMeeting->getRsvpLink($btnClass);
@@ -4088,7 +4088,7 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false,
 	 *
 	 * @return ?Meeting
 	 */
-	protected function AsAMeeting(): ?Meeting
+	protected function asAMeeting(): ?Meeting
 	{
 		if (!$this->post) {
 			$this->post = get_post($this->post_id);
@@ -4103,6 +4103,20 @@ protected function AsAMeeting(): ?Meeting
 		return null;
 	}
 
+	/**
+	 * Indicates if the meeting is in the past.
+	 *
+	 * @return bool
+	 */
+	public function isPast(): bool
+	{
+		$m = $this->asAMeeting();
+		if ($m) {
+			return $m->isPast();
+		}
+		return false;
+	}
+
 	/**
 	 * Get the JS for instantiation.
 	 *
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index d3c64a18..3db2e072 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -12,6 +12,7 @@
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "Interfaces/api.php";
 	require_once "Interfaces/hierarchical.php";
+	require_once "Interfaces/involvementMeetingCommon.php";
 	require_once "Interfaces/scheduled.php";
 }
 
@@ -19,10 +20,8 @@
 use DateTimeImmutable;
 use Exception;
 use tp\TouchPointWP\Interfaces\api;
-use tp\TouchPointWP\Interfaces\hasGeo;
-use tp\TouchPointWP\Interfaces\hierarchical;
+use tp\TouchPointWP\Interfaces\involvementMeetingCommon;
 use tp\TouchPointWP\Interfaces\module;
-use tp\TouchPointWP\Interfaces\scheduled;
 use tp\TouchPointWP\Utilities\DateFormats;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\NotableAttributes;
@@ -34,7 +33,7 @@
 /**
  * Handle meeting content, particularly RSVPs.
  */
-class Meeting extends PostTypeCapable implements api, module, hasGeo, hierarchical, scheduled
+class Meeting extends PostTypeCapable implements api, module, involvementMeetingCommon
 {
 	use jsInstantiation;
 //	use jsonLd; TODO

From 1afc0030a735b1006831cadb4d688a4b00c43f72 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 12:06:36 -0500
Subject: [PATCH 334/423] Adding block assets to version update script

---
 buildPipeline/versionUpdate.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/buildPipeline/versionUpdate.js b/buildPipeline/versionUpdate.js
index da0c8ac4..ab82b6f2 100644
--- a/buildPipeline/versionUpdate.js
+++ b/buildPipeline/versionUpdate.js
@@ -20,4 +20,11 @@ blockFiles.forEach((blockFile) => {
         blockJson.version = version;
         fs.writeFileSync(blockPath, JSON.stringify(blockJson, null, 2));
     }
+
+    const blockAssetPath = `./blocks/${blockFile}/block.asset.php`;
+    if (fs.existsSync(blockAssetPath)) {
+        let blockAssetContent = fs.readFileSync(blockAssetPath, 'utf8');
+        blockAssetContent.replaceAll("\"VERSION\"", `"${version}"`);
+        fs.writeFileSync(blockAssetPath, blockAssetContent);
+    }
 });
\ No newline at end of file

From f2bed049fd939db96b6cd4a6bc90a9139b0a5a5d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 4 Nov 2025 14:58:37 -0500
Subject: [PATCH 335/423] Build fixing.

---
 build.sh                                                  | 6 +++---
 src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php | 7 +++++++
 src/TouchPoint-WP/Involvement.php                         | 2 --
 src/TouchPoint-WP/Meeting.php                             | 2 --
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 51214e3d..87a2c3a4 100644
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,7 @@ if ! command -v node &> /dev/null; then
   nvm install node
 fi
 
-echo "Update version in various json files..."
+echo "Update version in various json and js files..."
 node ./buildPipeline/versionUpdate.js
 
 echo "Update NPM packages..."
@@ -30,7 +30,7 @@ mkdir build/assets
 mkdir build/assets/js
 
 echo "Install uglify and uglify the JS files..."
-#echo $(npm install -g uglify-js)
+npm install -g uglify-js
 uglifyjs assets/js/base-defer.js -o build/assets/js/base-defer.min.js --source-map
 uglifyjs assets/js/meeting-defer.js -o build/assets/js/meeting-defer.min.js --source-map
 uglifyjs assets/js/partner-defer.js -o build/assets/js/partner-defer.min.js --source-map
@@ -39,7 +39,7 @@ cd ./build || exit
 cd ..
 
 echo "Build blocks..."
-#npm install -g @wordpress/scripts
+npm install -g @wordpress/scripts
 npx wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks
 npx wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php
 
diff --git a/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php b/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php
index d5ef2cac..734282a3 100644
--- a/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php
+++ b/src/TouchPoint-WP/Interfaces/involvementMeetingCommon.php
@@ -5,6 +5,13 @@
 
 namespace tp\TouchPointWP\Interfaces;
 
+if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+	require_once "hierarchical.php";
+	require_once "scheduled.php";
+	require_once "actionButtons.php";
+	require_once "hasGeo.php";
+}
+
 /**
  * This class contains the elements common between the Involvement and Meeting classes.
  */
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 55765a12..cecb6e0a 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -12,9 +12,7 @@
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "jsInstantiation.php";
 	require_once "jsonLd.php";
-	require_once "Interfaces/hierarchical.php";
 	require_once "Interfaces/involvementMeetingCommon.php";
-	require_once "Interfaces/scheduled.php";
 	require_once "Interfaces/updatesViaCron.php";
 	require_once "Utilities.php";
 	require_once "Involvement_PostTypeSettings.php";
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 3db2e072..b6403453 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -11,9 +11,7 @@
 
 if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
 	require_once "Interfaces/api.php";
-	require_once "Interfaces/hierarchical.php";
 	require_once "Interfaces/involvementMeetingCommon.php";
-	require_once "Interfaces/scheduled.php";
 }
 
 use DateTime;

From 8e8a253bba0b393061b1fb36215c61e2d87c0773 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 15:43:07 -0500
Subject: [PATCH 336/423] Tracking time and installing npm items more reliably.

---
 build.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index 87a2c3a4..22b8db36 100644
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,9 @@
 
 # Assumes PHP CLI, curl, and zip are already installed.
 
+# get start time
+START_TIME=$SECONDS
+
 # check if node is installed and install it if not
 if ! command -v node &> /dev/null; then
   echo "Node.js is not installed. Installing Node.js and NPM using NVM..."
@@ -14,12 +17,13 @@ if ! command -v node &> /dev/null; then
   nvm install node
 fi
 
+echo "Install NPM packages for build..."
+npm install --prefer-offline --no-audit --progress=false
+npm update --prefer-offline --progress=false
+
 echo "Update version in various json and js files..."
 node ./buildPipeline/versionUpdate.js
 
-echo "Update NPM packages..."
-npm update --no-audit --prefer-offline
-
 echo "Cleaning up old build directory..."
 rm -r build
 if [ -f touchpoint-wp.zip ]; then
@@ -30,7 +34,7 @@ mkdir build/assets
 mkdir build/assets/js
 
 echo "Install uglify and uglify the JS files..."
-npm install -g uglify-js
+#npm install -g uglify-js
 uglifyjs assets/js/base-defer.js -o build/assets/js/base-defer.min.js --source-map
 uglifyjs assets/js/meeting-defer.js -o build/assets/js/meeting-defer.min.js --source-map
 uglifyjs assets/js/partner-defer.js -o build/assets/js/partner-defer.min.js --source-map
@@ -39,21 +43,18 @@ cd ./build || exit
 cd ..
 
 echo "Build blocks..."
-npm install -g @wordpress/scripts
+#npm install -g @wordpress/scripts
 npx wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks
 npx wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php
 
 echo "Internationalization..."
-
 cp -r ./i18n ./build/i18n
-
 php ./wp-cli.phar i18n make-json ./build/i18n
 php ./wp-cli.phar i18n make-mo ./build/i18n
 cp ./wpml-config.xml ./build/wpml-config.xml
 cp ./composer.json ./build/composer.json
 
 echo "Copy stuff..."
-
 cp -r ./ext ./build/ext
 cp -r ./src ./build/src
 
@@ -64,3 +65,8 @@ find . -maxdepth 1 -iname "*.json" -exec cp {} build/ \;
 cd ./build || exit
 find . -exec zip ../touchpoint-wp.zip {} \;
 cd ..
+
+# get end time and calculate duration
+END_TIME=$SECONDS
+DURATION=$((END_TIME - START_TIME))
+echo -e "\e[34mBuild completed in $DURATION seconds.\e[0m"
\ No newline at end of file

From d1eb072341502fe56200bf8b65c9ef7bbd5fc7b4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 15:51:38 -0500
Subject: [PATCH 337/423] Adding return types

---
 src/TouchPoint-WP/Interfaces/updatesViaCron.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Interfaces/updatesViaCron.php b/src/TouchPoint-WP/Interfaces/updatesViaCron.php
index a1de1e53..4190e5d4 100644
--- a/src/TouchPoint-WP/Interfaces/updatesViaCron.php
+++ b/src/TouchPoint-WP/Interfaces/updatesViaCron.php
@@ -15,13 +15,12 @@
  */
 interface updatesViaCron
 {
-
 	/**
 	 * Check to see if a cron run is needed, and run it if so.  Connected to an init function.
 	 *
 	 * @return void
 	 */
-	public static function checkUpdates();
+	public static function checkUpdates(): void;
 
 	/**
 	 * Run the updating cron task.  Fail quietly to not disturb the visitor experience if using WP default cron
@@ -29,5 +28,5 @@ public static function checkUpdates();
 	 *
 	 * @return void
 	 */
-	public static function updateCron();
+	public static function updateCron(): void;
 }
\ No newline at end of file

From a95ff643a9808bf32995a6f2ed4c14d3894e1239 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 15:57:29 -0500
Subject: [PATCH 338/423] Allowing for alt text when no people are available
 for a people list.

---
 src/TouchPoint-WP/Person.php                | 15 +++++++--------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php |  5 +++++
 src/templates/parts/person-list.php         |  9 ++++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 59922bc4..9813cac4 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -138,7 +138,7 @@ protected function __construct($id = 0, $name = '', $site_id = '')
 	 *
 	 * @return Person|TouchPointWP_Exception If a WP User ID is not provided, this exception is returned.
 	 */
-	public static function fromQueryResult($queryResult): Person
+	public static function fromQueryResult($queryResult): Person|TouchPointWP_Exception
 	{
 		if (is_numeric($queryResult)) {
 			return new Person($queryResult);
@@ -397,7 +397,8 @@ public static function peopleListShortcode($params = [], string $content = ""):
 				'class'         => 'people-list',
 				'invid'         => null,
 				'withsubgroups' => false,
-				'btnclass'      => 'btn button'
+				'btnclass'      => 'btn button',
+				'context'       => ''
 			],
 			$params,
 			self::SHORTCODE_PEOPLE_LIST
@@ -476,9 +477,9 @@ public static function peopleListShortcode($params = [], string $content = ""):
 		$btnClass = $params['btnclass'];
 		$listClass = $params['class'];
 
-		var_dump($q->request);
-
-		var_dump($people);
+		if ($content === "") {
+			$content = "<!-- " . __("No people to show.  This may be because the list hasn't synced yet, or because it is not configured correctly.") . " -->";
+		}
 
 		$loadedPart = get_template_part('person-list', 'person-list');
 		if ($loadedPart === false) {
@@ -488,13 +489,11 @@ public static function peopleListShortcode($params = [], string $content = ""):
 			$out .= ob_get_clean();
 		}
 		// TODO DIR make sure this actually works with external partials.
-		// TODO DIR provide an alternate if there are no people available.
 		
-		if ($out === "") {
+		if (trim($out) === "") {
 			return $content;
 		}
 
-
 		return $out;
 	}
 
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 2a508263..dee67aa1 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -58,6 +58,11 @@ public static function api(array $uri): bool
 
 			case "involvementsearch":
 				header('Content-Type: application/json');
+				if ( ! isset($_GET['s']) || trim($_GET['s']) === '') {
+					echo json_encode([]);
+					exit;
+				}
+
 				$result = TouchPointWP::instance()->api->uGet('v1/Involvements', [
 					'terms' => $_GET['s']
 				]);
diff --git a/src/templates/parts/person-list.php b/src/templates/parts/person-list.php
index 892b95ab..96e88687 100644
--- a/src/templates/parts/person-list.php
+++ b/src/templates/parts/person-list.php
@@ -1,22 +1,21 @@
 <?php
 
-/** @var $people Person[] */
+/** @var $people tp\TouchPointWP\Person[] */
 /** @var $listClass string */
+/** @var $content string Alternative text to use if no people are  */
 
 
-use tp\TouchPointWP\Person;
 use tp\TouchPointWP\TouchPointWP;
 
-if (! empty($people)) { ?>
+if (count($people) > 0) { ?>
 
 <div class="<?php echo $listClass; ?>" >
 <?php
     foreach ($people as $person) {
-        /** @noinspection PhpIncludeInspection */
         require TouchPointWP::$dir . "/src/templates/parts/person-list-item.php";
     } ?>
 </div>
 <?php
 } else {
-    echo "<!-- " . __("No people to show.  This may be because the list hasn't synced yet, or because it is not configured correctly.") . " -->";
+    echo $content;
 }
\ No newline at end of file

From 5cbe79c26899175cd9ba6ddca3e7dd4587ab364c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 15:58:52 -0500
Subject: [PATCH 339/423] Updating php libraries

---
 .idea/php.xml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.idea/php.xml b/.idea/php.xml
index 83aebbe3..3935a063 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -16,35 +16,35 @@
   </component>
   <component name="PhpIncludePathManager">
     <include_path>
-      <path value="$PROJECT_DIR$/../WordPressDemo" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
       <path value="$PROJECT_DIR$/../TenthDev/app/public" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
       <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
-      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
       <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
       <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
+      <path value="$PROJECT_DIR$/vendor/pronamic/wp-documentor" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/skayo/phpdoc-md" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
-      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
       <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
-      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
-      <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
-      <path value="$PROJECT_DIR$/vendor/pronamic/wp-documentor" />
-      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/symfony/string" />
       <path value="$PROJECT_DIR$/vendor/twig/twig" />
-      <path value="$PROJECT_DIR$/vendor/skayo/phpdoc-md" />
-      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/../WordPressDemo" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.0">

From 16f8cf33eb7a48691daf1f886d71e01f38ce132e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 15:59:23 -0500
Subject: [PATCH 340/423] Remove package-lock.json

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b524939c..d97c6172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,5 @@ node_modules
 /i18n/*.mo
 /i18n/*.l10n.php
 
-package-lock.json
-
 /build/
 /touchpoint-wp.zip

From f4899fdd8dd94f6506097490609c79e427f9cd8a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 16:24:37 -0500
Subject: [PATCH 341/423] Updating declaration

---
 src/TouchPoint-WP/Stats.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 3144ac0d..bec3652c 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -175,7 +175,7 @@ public static function updateCron(): void
 	 *
 	 * @return void
 	 */
-	public static function checkUpdates()
+	public static function checkUpdates(): void
 	{
 		// This method does nothing because the overhead is relatively great, and should not be hooked to every page load.
 	}

From 9695bfaf6fc2d4c6a6fa6e5d84b672e6beb04b74 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 16:25:52 -0500
Subject: [PATCH 342/423] Updating declaration

---
 src/TouchPoint-WP/Report.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 4a5dbe36..c40186d5 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -783,7 +783,7 @@ public function jsonSerialize(): array
 	 *
 	 * @return void
 	 */
-	public static function checkUpdates()
+	public static function checkUpdates(): void
 	{
 		// This method does nothing because the overhead is relatively great, and should not be hooked to every page load.
 	}

From 581d8f3f5e1564afbb8bc73c2c7fac4dc1f6816d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 21:17:05 -0500
Subject: [PATCH 343/423] Fixing some issues with block building file watcher

---
 .idea/watcherTasks.xml | 24 ++----------------------
 build.sh               |  3 +--
 package.json           |  4 ++++
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 8129e6ac..28d71314 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -122,7 +122,7 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks" />
+      <option name="arguments" value="run build-blocks" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
@@ -134,32 +134,12 @@
         <array />
       </option>
       <option name="outputFromStdout" value="false" />
-      <option name="program" value="npx" />
+      <option name="program" value="npm" />
       <option name="runOnExternalChanges" value="false" />
       <option name="scopeName" value="Project Files" />
       <option name="trackOnlyRoot" value="true" />
       <option name="workingDir" value="$ProjectFileDir$" />
       <envs />
     </TaskOptions>
-    <TaskOptions isEnabled="true">
-      <option name="arguments" value="wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php" />
-      <option name="checkSyntaxErrors" value="true" />
-      <option name="description" />
-      <option name="exitCodeBehavior" value="ERROR" />
-      <option name="fileExtension" value="js" />
-      <option name="immediateSync" value="true" />
-      <option name="name" value="Build Block Manifest from JS" />
-      <option name="output" value="" />
-      <option name="outputFilters">
-        <array />
-      </option>
-      <option name="outputFromStdout" value="false" />
-      <option name="program" value="npx" />
-      <option name="runOnExternalChanges" value="false" />
-      <option name="scopeName" value="Open Files" />
-      <option name="trackOnlyRoot" value="false" />
-      <option name="workingDir" value="$ProjectFileDir$" />
-      <envs />
-    </TaskOptions>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 22b8db36..7d5f9ff9 100644
--- a/build.sh
+++ b/build.sh
@@ -44,8 +44,7 @@ cd ..
 
 echo "Build blocks..."
 #npm install -g @wordpress/scripts
-npx wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks
-npx wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php
+npm run build-blocks
 
 echo "Internationalization..."
 cp -r ./i18n ./build/i18n
diff --git a/package.json b/package.json
index b9f2a14a..386a90df 100644
--- a/package.json
+++ b/package.json
@@ -36,5 +36,9 @@
   "dependencies": {
     "@wordpress/components": "^30.0.0",
     "@wordpress/element": "^6.27.0"
+  },
+  "scripts": {
+    "build-blocks": "wp-scripts build --webpack-src-dir=blocks --output-path=build/blocks ",
+    "postbuild-blocks": "wp-scripts build-blocks-manifest --input=blocks --output=build/blocks/blocks-manifest.php"
   }
 }
\ No newline at end of file

From b9567516a102329e3afb99fb62f58819807b884d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 21:27:20 -0500
Subject: [PATCH 344/423] Adding people list block

---
 blocks/people-list/index.js | 146 ++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 blocks/people-list/index.js

diff --git a/blocks/people-list/index.js b/blocks/people-list/index.js
new file mode 100644
index 00000000..2230c803
--- /dev/null
+++ b/blocks/people-list/index.js
@@ -0,0 +1,146 @@
+/**
+ * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
+ * All files containing `style` keyword are bundled together. The code used
+ * gets applied both to the front of your site and to the editor.
+ *
+ * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
+ */
+import "../../assets/template/partials-template-style.css";
+import "../../assets/template/actions-style.css";
+import "../../assets/template/block-preview-style.css";
+
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+import {__} from '@wordpress/i18n';
+import {generateUniqueId} from '../common.js';
+
+/**
+ * Every block starts by registering a new block type definition.
+ *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/
+ */
+wp.blocks.registerBlockType(metadata.name, {
+    title: __('People List', 'TouchPoint-WP'),
+    category: metadata.category,
+    description: __('A list of People from TouchPoint', 'TouchPoint-WP'),
+    icon: metadata.icon,
+    apiVersion: metadata.apiVersion,
+    attributes: {
+        invId: {
+            type: 'integer',
+            default: 0,
+        },
+    },
+    edit: function (props) {
+        const {attributes, setAttributes} = props;
+        const {invId} = attributes;
+        const blockProps = wp.blockEditor.useBlockProps();
+        const placeholderId = `tp-people-list-${generateUniqueId()}`;
+        const [filteredOptions, setFilteredOptions] = wp.element.useState([]);
+        const [isLoading, setIsLoading] = wp.element.useState(true);
+
+        const getOptionsFromApi = async (searchQ) => {
+            if (invOptionsController) {
+                invOptionsController.abort(); // Abort previous API call
+            }
+
+            invOptionsController = new AbortController(); // Create a new AbortController
+            setIsLoading(true);
+            try {
+                const response = await fetch(`/touchpoint-api/admin/involvementsearch?s=${searchQ}`, {signal: invOptionsController.signal});
+                const data = await response.json();
+                invOptionsController = null;
+                const formattedOptions = data
+                    .map((inv) => ({
+                        label: `${inv.organizationName}  (${inv.organizationId})`,
+                        value: Number(inv.organizationId),
+                    }));
+
+                setFilteredOptions(formattedOptions);
+                setIsLoading(false);
+            } catch (error) {
+                if (error.name !== 'AbortError') {
+                    console.error('Error fetching post types:', error);
+                    setIsLoading(false);
+                }
+            }
+        }
+
+        // get involvement options from API on initial load
+        wp.element.useEffect(() => {
+            getOptionsFromApi(invId);
+        }, [invId]);
+
+        // Update preview
+        wp.element.useEffect(() => {
+            updateListContent(invId, blockProps, placeholderId);
+        }, [invId, blockProps.className, placeholderId]);
+
+        return (
+            <div {...blockProps}>
+                <wp.blockEditor.InspectorControls>
+                    <wp.components.PanelBody title={__('Settings', 'TouchPoint-WP')}>
+                        <wp.components.ComboboxControl
+                            label={__("Involvement", "TouchPoint-WP")}
+                            value={invId}
+                            onChange={(v) => setAttributes({invId: Number(v)})}
+                            isLoading={isLoading}
+                            options={filteredOptions}
+                            onFilterValueChange={getOptionsFromApi}
+                            __next40pxDefaultSize={true}
+                            __nextHasNoMarginBottom={true}
+                        />
+                    </wp.components.PanelBody>
+                </wp.blockEditor.InspectorControls>
+                <div id={placeholderId} className="tp-preview-block" data-preview-message={__('Preview Only', 'TouchPoint-WP')}></div>
+            </div>
+        );
+    },
+    save: function (props) {
+        const {attributes} = props;
+        const {invId} = attributes;
+        const blockProps = wp.blockEditor.useBlockProps.save();
+        const additionalClasses = blockProps.className || '';
+
+        return `[TP-People class="${additionalClasses}" invId="${invId}"]`;
+    },
+});
+
+let invOptionsController = null;
+let lastPath = null;
+let previewController = null;
+
+function updateListContent(invId, blockProps, placeholderId) {
+    const placeholder = document.getElementById(placeholderId);
+    if (!invId || invId <= 0) {
+        if (placeholder) {
+            placeholder.innerHTML = '<div class="tp-preview-block-error">' + __('Please select an Involvement to display.', 'TouchPoint-WP') + '</div>';
+        }
+        return;
+    }
+
+    const newPath = `/touchpoint-api/person/list?invId=${invId}&class=${blockProps.className || ''}&context=block-preview`;
+
+    if (lastPath === newPath) {
+        return;
+    }
+
+    if (previewController) {
+        previewController.abort();
+    }
+
+    previewController = new AbortController();
+    lastPath = newPath;
+
+    fetch(newPath, {signal: previewController.signal})
+        .then(response => response.text())
+        .then(data => {
+            if (placeholder) {
+                placeholder.innerHTML = data;
+            }
+        })
+        .catch(() => {}); // suppress error from abortion.
+}
+

From e0c782b977826350f1a6ba3ff40f9a8f51e33aec Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 21:28:10 -0500
Subject: [PATCH 345/423] Remove webpack to use defaults instead

---
 webpack.config.js | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 webpack.config.js

diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index f556a0dc..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const path = require('path');
-
-module.exports = {
-    entry: './blocks/inv-list/index.js',
-    output: {
-        path: path.resolve(__dirname, 'build/blocks/inv-list'),
-        filename: 'inv-list/index.min.js',
-    },
-    module: {
-        rules: [
-            {
-                test: /\.js$/,
-                exclude: /node_modules/,
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        presets: ['@babel/preset-env', '@babel/preset-react'],
-                    },
-                },
-            },
-            {
-                test: /\.css$/,
-                use: ['style-loader', 'css-loader'],
-            },
-        ],
-    },
-    mode: 'production',
-};

From ccc9099e3abd9f83eb6695bd52ffecf180e1a503 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 12 Nov 2025 21:56:59 -0500
Subject: [PATCH 346/423] Adding style attributes.

---
 blocks/inv-list/block.json    | 3 ++-
 blocks/people-list/block.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/blocks/inv-list/block.json b/blocks/inv-list/block.json
index d956eed4..527443ba 100644
--- a/blocks/inv-list/block.json
+++ b/blocks/inv-list/block.json
@@ -13,5 +13,6 @@
     "reusable": false
   },
   "textdomain": "TouchPoint-WP",
-  "editorScript": "file:./index.js"
+  "editorScript": "file:./index.js",
+  "editorStyle": "file:./index.css"
 }
\ No newline at end of file
diff --git a/blocks/people-list/block.json b/blocks/people-list/block.json
index a09e669d..89a07a7e 100644
--- a/blocks/people-list/block.json
+++ b/blocks/people-list/block.json
@@ -13,5 +13,6 @@
     "reusable": false
   },
   "textdomain": "TouchPoint-WP",
-  "editorScript": "file:./index.js"
+  "editorScript": "file:./index.js",
+  "editorStyle": "file:./index.css"
 }
\ No newline at end of file

From 78ee124db6f8db5542d4030cbd5c21cdd2424563 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 26 Mar 2026 13:27:58 -0400
Subject: [PATCH 347/423] inspection comment that Imagick is not required. Docs
 update.

---
 docs                                             | 2 +-
 src/TouchPoint-WP/Utilities/ImageConversions.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs b/docs
index 3346e39a..29be1973 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 3346e39a85f9a7db0426c55790d6bfe11bc9b19e
+Subproject commit 29be1973968a5d37ad6b36b194680ee98e96a27f
diff --git a/src/TouchPoint-WP/Utilities/ImageConversions.php b/src/TouchPoint-WP/Utilities/ImageConversions.php
index eab13ade..f7dbe377 100644
--- a/src/TouchPoint-WP/Utilities/ImageConversions.php
+++ b/src/TouchPoint-WP/Utilities/ImageConversions.php
@@ -17,6 +17,7 @@ abstract class ImageConversions
 	 * @throws \ImagickException
 	 * @throws TouchPointWP_Exception
 	 * @noinspection PhpFullyQualifiedNameUsageInspection - Imagick is helpful but not required.
+	 * @noinspection PhpComposerExtensionStubsInspection - Imagick is helpful but not required.
 	 */
 	public static function svgToPng($svgContent, ?string $backgroundColor = null): string
 	{

From 9bba10d27ed761ced00a6dce77273d3d128ff9af Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 19:33:33 -0400
Subject: [PATCH 348/423] Adjusting get() to throw an exception rather than
 returning a wp_error

---
 src/TouchPoint-WP/Api.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 45a7f675..1eb99ac3 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -323,10 +323,10 @@ protected function prepareRequest(string $command, mixed &$headers, ?int $onBeha
 	 * @param int    $timeout Amount of time in sec to wait before timing out.
 	 * @param float  $timeTaken The time taken to complete the request.
 	 *
-	 * @return array|WP_Error The response from the Http request call.
+	 * @return array The response from the Http request call.
 	 * @throws TouchPointWP_Exception  If anything went wrong.
 	 */
-	public function get(string $command, array $parameters = [], array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error
+	public function get(string $command, array $parameters = [], array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array
 	{
 		$tik = microtime(true);
 		for ($attempt = 0; $attempt < 2; $attempt++) {
@@ -347,7 +347,7 @@ public function get(string $command, array $parameters = [], array $headers = []
 			);
 
 			if ($r instanceof WP_Error) {
-				return $r;
+				throw new TouchPointWP_WPError($r);
 			}
 
 			if ($r['response']['code'] === Http::UNAUTHORIZED) {

From c2ccbb54f98b4aff0ceef0f63d320bdae9988fa3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 19:35:37 -0400
Subject: [PATCH 349/423] API adjustments for new people-list filter concepts

---
 blocks/people-list/block.json               |  2 +-
 src/TouchPoint-WP/Lookup.php                | 42 ++++++++++++++
 src/TouchPoint-WP/TouchPointWP.php          | 63 +++++++++++++++++++--
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php | 16 +++++-
 src/python/WebApi.py                        | 12 +++-
 touchpoint-wp.php                           |  2 +
 6 files changed, 126 insertions(+), 11 deletions(-)
 create mode 100644 src/TouchPoint-WP/Lookup.php

diff --git a/blocks/people-list/block.json b/blocks/people-list/block.json
index 89a07a7e..e6abae87 100644
--- a/blocks/people-list/block.json
+++ b/blocks/people-list/block.json
@@ -6,7 +6,7 @@
   "title": "People List",
   "category": "widgets",
   "icon": "groups",
-  "description": "A collection of People from TouchPoint",
+  "description": "A list of People from a TouchPoint Involvement",
   "supports": {
     "html": false,
     "ariaLabel": true,
diff --git a/src/TouchPoint-WP/Lookup.php b/src/TouchPoint-WP/Lookup.php
new file mode 100644
index 00000000..9640ae73
--- /dev/null
+++ b/src/TouchPoint-WP/Lookup.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package TouchPointWP
+ */
+
+namespace tp\TouchPointWP;
+
+use tp\TouchPointWP\Interfaces\api;
+
+if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
+	require_once "Interfaces/api.php";
+}
+
+if ( ! defined('ABSPATH')) {
+	exit;
+}
+
+/**
+ * Admin API class.
+ */
+class Lookup implements api
+{
+
+	/**
+	 * Handle API requests
+	 *
+	 * @param array $uri The request URI already parsed by parse_url()
+	 *
+	 * @return bool False if endpoint is not found.  Should print the result.
+	 */
+	public static function api(array $uri): bool
+	{
+		try {
+			$d = TouchPointWP::instance()->api->get('/api/v1/Lookup/' . $uri['path'][2]);
+			header('Content-Type: application/json');
+			echo $d['body']; // already JSON-encoded by the API
+			exit;
+		} catch (TouchPointWP_Exception) {
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index dd56529e..79cc9223 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -22,11 +22,6 @@
 	exit;
 }
 
-if ( ! TOUCHPOINT_COMPOSER_ENABLED) {
-	require_once "Utilities.php";
-	require_once "Stats.php";
-}
-
 
 /**
  * Main plugin class.
@@ -55,6 +50,7 @@ class TouchPointWP
 	public const API_ENDPOINT_ADMIN = "admin";
 	public const API_ENDPOINT_STATS = "stats";
 	public const API_ENDPOINT_AUTH = "auth";
+	public const API_ENDPOINT_LOOKUP = "lookup";
 	public const API_ENDPOINT_REPORT = "report";
 	public const API_ENDPOINT_ADMIN_SCRIPTZIP = "admin/scriptzip";
 	public const API_ENDPOINT_CLEANUP = "cleanup";
@@ -502,6 +498,13 @@ public function parseRequest($continue, $wp, $extraVars): bool
 				}
 			}
 
+			// Lookup endpoints
+			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_LOOKUP) {
+				if ( ! Lookup::api($reqUri)) {
+					return $continue;
+				}
+			}
+
 			// Admin endpoints
 			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_ADMIN) {
 				self::admin(); // initialize the instance.
@@ -629,7 +632,7 @@ public static function userHasEditingPermissions(?int $userId = null): bool
 	 */
 	public function printDynamicFooterScripts(): void
 	{
-		if (self::isApi()) {
+		if (self::isApi() || !self::$hasRenderedBaseInlineScript) {
 			return;
 		}
 
@@ -940,7 +943,9 @@ public static function init(): void
 	public static function renderBaseInlineScript(): void
 	{
 		include_once self::instance()->assets_dir . '/js/base-inline.php';
+		self::$hasRenderedBaseInlineScript = true;
 	}
+	protected static $hasRenderedBaseInlineScript = false;
 
 	public function registerScriptsAndStyles(): void
 	{
@@ -1643,6 +1648,34 @@ public function host(): ?string
 		return "https://" . $host;
 	}
 
+	/**
+	 * Get the member types currently in use for the given involvements.
+	 *
+	 * @param string[] $involvements
+	 *
+	 * @return array
+	 */
+	public function getMemberTypesForInvolvements(array $involvements = []): array
+	{
+		// sort involvements
+		sort($involvements);
+
+		$cacheKey = "tp_memTypesForInv_" . implode(",", $involvements);
+
+		// check transients for cache.
+		$cached = get_transient($cacheKey);
+		if ($cached !== false) {
+			return $cached;
+		}
+
+		// if not in cache, get from API and cache.  If API fails, return empty array (probably better than nothing).
+		$mts = $this->getMemberTypesForInvolvements_fromApi($involvements);
+
+		// Cache for 1 hour.
+		set_transient($cacheKey, $mts, HOUR_IN_SECONDS);
+		return $mts;
+	}
+
 	/**
 	 * Get the member types currently in use for the named divisions.
 	 *
@@ -1788,6 +1821,24 @@ private function getMemberTypesForDivisions_fromApi($divisions): object|bool
 		];
 	}
 
+	/**
+	 * Get new MemberTypes for a list of Involvements.  Does not cache them.
+	 *
+	 * @param array $involvements
+	 *
+	 * @return stdClass[] An array of member types.  Empty array on failure.
+	 */
+	private function getMemberTypesForInvolvements_fromApi(array $involvements): array
+	{
+		try {
+			$return = $this->api->pyGet('MemTypes', ['invs' => implode(",", $involvements)]);
+		} catch (TouchPointWP_Exception) {
+			return [];
+		}
+
+		return $return->memTypes ?? [];
+	}
+
 
 	/**
 	 * Returns an array of objects that correspond to resident codes.  Each ResCode has a name, a code, and an id.
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index dee67aa1..15342c68 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -45,9 +45,19 @@ public static function api(array $uri): bool
 		switch (strtolower($uri['path'][2])) {
 			case "memtypes":
 				header('Content-Type: application/json');
-				$divs = explode(",", $_GET['divs']);
-				$mt   = TouchPointWP::instance()->getMemberTypesForDivisions($divs);
-				echo json_encode($mt);
+				if (isset($_GET['divs']) && trim($_GET['divs']) !== '') {
+					$divs = explode(",", $_GET['divs']);
+					$mt   = TouchPointWP::instance()->getMemberTypesForDivisions($divs);
+					echo json_encode($mt);
+					exit;
+				}
+				if (isset($_GET['inv']) && trim($_GET['inv']) !== '') {
+					$inv = explode(",", $_GET['inv']);
+					$mt  = TouchPointWP::instance()->getMemberTypesForInvolvements($inv);
+					echo json_encode($mt);
+					exit;
+				}
+				echo json_encode([]);
 				exit;
 
 			case "divisions":
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index b3e429ac..25a57a13 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -529,17 +529,27 @@ def get_person_info_for_sync(person_obj):
     apiCalled = True
 
     divs = Data.divs or ""
+    invs = Data.invs or ""
 
     regex = re.compile('[^0-9,]')
     divs = regex.sub('', divs)
+    invs = regex.sub('', invs)
 
     # noinspection SqlResolve
     memTypeSql = '''SELECT DISTINCT om.[MemberTypeId] as id, mt.[Code] as code, mt.[Description] as description
                     FROM OrganizationMembers om
                     JOIN DivOrg do ON om.OrganizationId = do.OrgId
                     JOIN lookup.MemberType mt ON om.[MemberTypeId] = mt.[Id]'''
+    where = " WHERE 1=0"
+    order = ""
+
     if divs != "":
-        memTypeSql += " WHERE do.DivId IN ({})".format(divs)
+        where += " OR do.DivId IN ({})".format(divs)
+
+    if invs != "":
+        where += " OR om.OrganizationId IN ({})".format(invs)
+
+    memTypeSql += where
     memTypeSql += " ORDER BY description ASC"
 
     Data.memTypes = model.SqlListDynamicData(memTypeSql)
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index fc321ebc..6d49e310 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -46,6 +46,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/TouchPointWP.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Settings.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Api.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Lookup.php";
 
 	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/api.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/module.php";
@@ -62,6 +63,7 @@
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateFormats.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/DateTimeExtended.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Utilities/Http.php";
+	require_once __DIR__ . "/src/TouchPoint-WP/Stats.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Taxonomies.php";
 	require_once __DIR__ . "/src/TouchPoint-WP/Interfaces/hasGeo.php";
 

From acb6c93c02835179ecb1538a190f1f2bf2beee02 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 19:36:01 -0400
Subject: [PATCH 350/423] Updating packages

---
 package.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 386a90df..036992e1 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,11 @@
   },
   "homepage": "https://github.com/TenthPres/TouchPoint-WP#readme",
   "devDependencies": {
-    "@wordpress/block-editor": "^14.17.0",
-    "@wordpress/blocks": "^14.11.0",
-    "@wordpress/env": "^10.22.0",
-    "@wordpress/i18n": "^5.22.0",
+    "@wordpress/block-editor": "^14",
+    "@wordpress/blocks": "^14",
+    "@wordpress/env": "^10",
+    "@wordpress/i18n": "^5",
     "@wordpress/scripts": "^30.18.0",
-    "glob": "^11.0.2",
     "style-loader": "^4.0.0",
     "uglify-js": "^3.17.4"
   },

From f909c5816e2915a694bd060412063df08e7d2a57 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 19:36:23 -0400
Subject: [PATCH 351/423] Updating packages

---
 .idea/libraries/Generated_files.xml | 2 ++
 .idea/misc.xml                      | 2 +-
 docs                                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.idea/libraries/Generated_files.xml b/.idea/libraries/Generated_files.xml
index 885dc173..c2507ea0 100644
--- a/.idea/libraries/Generated_files.xml
+++ b/.idea/libraries/Generated_files.xml
@@ -8,6 +8,7 @@
         <item url="file://$PROJECT_DIR$/build/blocks/common.js" />
         <item url="file://$PROJECT_DIR$/build/blocks/inv-list/index.js" />
         <item url="file://$PROJECT_DIR$/build/blocks/people-list/index.js" />
+        <item url="file://$PROJECT_DIR$/build/buildPipeline/versionUpdate.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
         <item url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
@@ -20,6 +21,7 @@
       <root url="file://$PROJECT_DIR$/build/blocks/common.js" />
       <root url="file://$PROJECT_DIR$/build/blocks/inv-list/index.js" />
       <root url="file://$PROJECT_DIR$/build/blocks/people-list/index.js" />
+      <root url="file://$PROJECT_DIR$/build/buildPipeline/versionUpdate.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-map-inline.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/involvement-nearby-inline.js" />
       <root url="file://$PROJECT_DIR$/build/src/js-partials/partner-map-inline.js" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f50e5ab3..03f6d1db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,5 +10,5 @@
   <component name="PhpEntryPointsManager">
     <suppressed_annotations>@noinspection</suppressed_annotations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="Python 3.10 (TouchPointScripts)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="Python 3.14 (TouchPointScripts)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/docs b/docs
index 68151bdb..29be1973 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 68151bdb813cb88298470a1d3e2effd8af98120b
+Subproject commit 29be1973968a5d37ad6b36b194680ee98e96a27f

From 2ddfe8f9e90a4b5606ca07d2516caac415ebacad Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 20:00:38 -0400
Subject: [PATCH 352/423] Changing cache denominations to make more sense

---
 src/TouchPoint-WP/TouchPointWP.php      | 25 +++++++++++++------------
 src/TouchPoint-WP/Utilities/Cleanup.php |  4 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 79cc9223..92acc369 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -81,9 +81,10 @@ class TouchPointWP
 	public const TABLE_STATS = self::TABLE_PREFIX . "stats";
 
 	/**
-	 * Typical amount of time in hours for metadata to last (e.g. genders and resCodes).
+	 * Typical amount of time in seconds for metadata to last (e.g. genders and resCodes).
 	 */
-	public const CACHE_TTL = 8;
+	public const CACHE_TTL = 8 * 3600;
+	public const CACHE_TTL_SHORT = 120;
 
 	public const TTL_IP_GEO = 5;  // years until deleted
 	public const TTU_IP_GEO = 180; // days until updated
@@ -1671,8 +1672,8 @@ public function getMemberTypesForInvolvements(array $involvements = []): array
 		// if not in cache, get from API and cache.  If API fails, return empty array (probably better than nothing).
 		$mts = $this->getMemberTypesForInvolvements_fromApi($involvements);
 
-		// Cache for 1 hour.
-		set_transient($cacheKey, $mts, HOUR_IN_SECONDS);
+		// Cache for a very short period.
+		set_transient($cacheKey, $mts, self::CACHE_TTL_SHORT);
 		return $mts;
 	}
 
@@ -1699,7 +1700,7 @@ public function getMemberTypesForDivisions(array $divisions = []): array
 			$mtObj = json_decode($mtObj);
 			if ( ! isset($mtObj->$divKey)) {
 				$needsUpdate = true;
-			} else if (strtotime($mtObj->$divKey->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($mtObj->$divKey->memTypes)) {
+			} else if (strtotime($mtObj->$divKey->_updated) < time() - self::CACHE_TTL || ! is_array($mtObj->$divKey->memTypes)) {
 				$needsUpdate = true;
 			}
 		}
@@ -1763,7 +1764,7 @@ public function getDivisions(): array
 			$needsUpdate = true;
 		} else {
 			$divsObj = json_decode($divsObj);
-			if (strtotime($divsObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($divsObj->divs)) {
+			if (strtotime($divsObj->_updated) < time() - self::CACHE_TTL || ! is_array($divsObj->divs)) {
 				$needsUpdate = true;
 			}
 		}
@@ -1854,7 +1855,7 @@ public function getResCodes(): array
 			$needsUpdate = true;
 		} else {
 			$rcObj = json_decode($rcObj);
-			if (strtotime($rcObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($rcObj->resCodes)) {
+			if (strtotime($rcObj->_updated) < time() - self::CACHE_TTL || ! is_array($rcObj->resCodes)) {
 				$needsUpdate = true;
 			}
 		}
@@ -1889,7 +1890,7 @@ public function getCampuses(): array
 			$needsUpdate = true;
 		} else {
 			$cObj = json_decode($cObj);
-			if (strtotime($cObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($cObj->campuses)) {
+			if (strtotime($cObj->_updated) < time() - self::CACHE_TTL || ! is_array($cObj->campuses)) {
 				$needsUpdate = true;
 			}
 		}
@@ -1976,7 +1977,7 @@ public function getGenders(): array
 			$needsUpdate = true;
 		} else {
 			$gObj = json_decode($gObj);
-			if (strtotime($gObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($gObj->genders)) {
+			if (strtotime($gObj->_updated) < time() - self::CACHE_TTL || ! is_array($gObj->genders)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2036,7 +2037,7 @@ public function getKeywords(): array
 			$needsUpdate = true;
 		} else {
 			$kObj = json_decode($kObj);
-			if (strtotime($kObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($kObj->keywords)) {
+			if (strtotime($kObj->_updated) < time() - self::CACHE_TTL || ! is_array($kObj->keywords)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2084,7 +2085,7 @@ public function getPersonEvFields(?array $matches = null): array
 			$needsUpdate = true;
 		} else {
 			$pevObj = json_decode($pevObj);
-			if (strtotime($pevObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($pevObj->personEvFields)) {
+			if (strtotime($pevObj->_updated) < time() - self::CACHE_TTL || ! is_array($pevObj->personEvFields)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2145,7 +2146,7 @@ public function getFamilyEvFields(?array $matches = null): array
 			$needsUpdate = true;
 		} else {
 			$fevObj = json_decode($fevObj);
-			if (strtotime($fevObj->_updated) < time() - 3600 * self::CACHE_TTL || ! is_array($fevObj->familyEvFields)) {
+			if (strtotime($fevObj->_updated) < time() - self::CACHE_TTL || ! is_array($fevObj->familyEvFields)) {
 				$needsUpdate = true;
 			}
 		}
diff --git a/src/TouchPoint-WP/Utilities/Cleanup.php b/src/TouchPoint-WP/Utilities/Cleanup.php
index 2d522887..940ee651 100644
--- a/src/TouchPoint-WP/Utilities/Cleanup.php
+++ b/src/TouchPoint-WP/Utilities/Cleanup.php
@@ -24,7 +24,7 @@
 abstract class Cleanup implements api
 {
 	public const CRON_HOOK = TouchPointWP::HOOK_PREFIX . "cleanup_cron_hook";
-	private const CACHE_TTL = 24 * 7; // How long things should live before they're cleaned up.  Hours.
+	private const CACHE_TTL = 3600 * 24 * 7; // How long things should live before they're cleaned up.  Seconds.
 
 	/**
 	 * Called by the cron task. (and also by ::api() )
@@ -93,7 +93,7 @@ protected static function cleanMemberTypes(): ?bool
 		} else {
 			$mtObj = (array)json_decode($mtObj);
 			foreach ($mtObj as $key => $val) {
-				if (strtotime($val->_updated) < time() - 3600 * self::CACHE_TTL) {
+				if (strtotime($val->_updated) < time() - self::CACHE_TTL) {
 					$needsUpdate = true;
 					unset($mtObj[$key]);
 				}

From 53eb848a8b481b5d7e9e9824b0f8520e0ce62c51 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 21:09:09 -0400
Subject: [PATCH 353/423] works, mostly

---
 blocks/people-list/index.js | 256 ++++++++++++++++++++++++++++++------
 package.json                |   1 +
 2 files changed, 220 insertions(+), 37 deletions(-)

diff --git a/blocks/people-list/index.js b/blocks/people-list/index.js
index 2230c803..a623996d 100644
--- a/blocks/people-list/index.js
+++ b/blocks/people-list/index.js
@@ -16,6 +16,11 @@ import metadata from './block.json';
 import {__} from '@wordpress/i18n';
 import {generateUniqueId} from '../common.js';
 
+// Module-level controllers used as fallbacks when per-instance refs are not provided
+let invOptionsController = null;
+let lastPath = null;
+let previewController = null;
+
 /**
  * Every block starts by registering a new block type definition.
  *
@@ -32,16 +37,35 @@ wp.blocks.registerBlockType(metadata.name, {
             type: 'integer',
             default: 0,
         },
+        memTypes: {
+            type: 'array',
+            default: [],
+        },
+        genders: {
+            type: 'array',
+            default: [],
+        }
     },
     edit: function (props) {
         const {attributes, setAttributes} = props;
         const {invId} = attributes;
         const blockProps = wp.blockEditor.useBlockProps();
-        const placeholderId = `tp-people-list-${generateUniqueId()}`;
-        const [filteredOptions, setFilteredOptions] = wp.element.useState([]);
+        // Use a ref so we generate the id once and it remains stable across renders.
+        const placeholderIdRef = wp.element.useRef(generateUniqueId());
+        const placeholderId = `tp-people-list-${placeholderIdRef.current}`;
+        // Direct ref to the placeholder div so we can reliably update its content
+        const placeholderRef = wp.element.useRef(null);
+        // Per-instance refs for preview controller and lastPath so multiple blocks don't share state
+        const previewControllerRef = wp.element.useRef(null);
+        const lastPathRef = wp.element.useRef(null);
+        const [filteredInvOptions, setFilteredInvOptions] = wp.element.useState([]);
+        const [memTypeOptions, setMemTypeOptions] = wp.element.useState([]);
+        const [genderOptions, setGenderOptions] = wp.element.useState([]);
         const [isLoading, setIsLoading] = wp.element.useState(true);
+        // State to hold preview HTML so React renders it (avoids mutating DOM nodes React may replace).
+        const [previewHtml, setPreviewHtml] = wp.element.useState('');
 
-        const getOptionsFromApi = async (searchQ) => {
+        const getInvOptionsFromApi = async (searchQ) => {
             if (invOptionsController) {
                 invOptionsController.abort(); // Abort previous API call
             }
@@ -58,7 +82,7 @@ wp.blocks.registerBlockType(metadata.name, {
                         value: Number(inv.organizationId),
                     }));
 
-                setFilteredOptions(formattedOptions);
+                setFilteredInvOptions(formattedOptions);
                 setIsLoading(false);
             } catch (error) {
                 if (error.name !== 'AbortError') {
@@ -68,15 +92,89 @@ wp.blocks.registerBlockType(metadata.name, {
             }
         }
 
+        const getMemTypeOptionsFromApi = async () => {
+            try {
+                const response = await fetch(`/touchpoint-api/admin/memtypes?inv=${invId}`);
+                const data = await response.json();
+                const formattedOptions = data
+                    .map((type) => ({
+                        label: type.description,
+                        value: type.id,
+                    }));
+
+                // Add an option for "All Leaders" with value of -1
+                formattedOptions.unshift({
+                    label: __('All Leaders', 'TouchPoint-WP'),
+                    value: -1,
+                });
+
+                // add an option for "All Members" with value of []
+                formattedOptions.unshift({
+                    label: __('All Members', 'TouchPoint-WP'),
+                    value: 0,
+                });
+
+                setMemTypeOptions(formattedOptions);
+            } catch (error) {
+                console.error('Error fetching member types:', error);
+            }
+        }
+
+        const getGenderOptionsFromApi = async () => {
+            try {
+                const response = await fetch(`/touchpoint-api/lookup/genders`);
+                const data = await response.json();
+
+                // format options for SelectControl, with an "Any" option at the beginning
+                const formattedOptions = data
+                    .map((gender) => ({
+                        label: gender.description,
+                        value: gender.id,
+                    }));
+
+                formattedOptions.unshift({
+                    label: __('Any', 'TouchPoint-WP'),
+                    value: 0,
+                })
+
+                setGenderOptions(formattedOptions);
+
+            } catch (error) {
+                console.error('Error fetching genders:', error);
+            }
+        }
+
+        wp.element.useEffect(() => {
+            getGenderOptionsFromApi();
+        }, []);
+
         // get involvement options from API on initial load
         wp.element.useEffect(() => {
-            getOptionsFromApi(invId);
+            getInvOptionsFromApi(invId);
+        }, [invId]);
+
+        wp.element.useEffect(() => {
+            getMemTypeOptionsFromApi(invId);
         }, [invId]);
 
         // Update preview
         wp.element.useEffect(() => {
-            updateListContent(invId, blockProps, placeholderId);
-        }, [invId, blockProps.className, placeholderId]);
+            // Some editor render timing can cause the ref to be null on first effect run.
+            // Retry a few times with a small delay to ensure the DOM node exists before updating.
+            const tryUpdate = (retries = 5) => {
+                const el = placeholderRef.current || document.getElementById(placeholderId);
+                if (el) {
+                    updateListContent(invId, attributes, blockProps, placeholderId, el, previewControllerRef, lastPathRef, setPreviewHtml);
+                } else if (retries > 0) {
+                    setTimeout(() => tryUpdate(retries - 1), 100);
+                } else {
+                    // final attempt with whatever we have
+                    updateListContent(invId, attributes, blockProps, placeholderId, placeholderRef.current, previewControllerRef, lastPathRef, setPreviewHtml);
+                }
+            };
+
+            tryUpdate();
+        }, [invId, attributes, blockProps.className]);
 
         return (
             <div {...blockProps}>
@@ -85,62 +183,146 @@ wp.blocks.registerBlockType(metadata.name, {
                         <wp.components.ComboboxControl
                             label={__("Involvement", "TouchPoint-WP")}
                             value={invId}
-                            onChange={(v) => setAttributes({invId: Number(v)})}
+                            onChange={(v) => {
+                                const numeric = Number(v);
+                                setAttributes({invId: numeric});
+                                // pass the newly selected value to the search so suggestions update immediately
+                                getInvOptionsFromApi(v);
+                            }}
                             isLoading={isLoading}
-                            options={filteredOptions}
-                            onFilterValueChange={getOptionsFromApi}
+                            options={filteredInvOptions}
+                            onFilterValueChange={getInvOptionsFromApi}
                             __next40pxDefaultSize={true}
                             __nextHasNoMarginBottom={true}
                         />
                     </wp.components.PanelBody>
                 </wp.blockEditor.InspectorControls>
-                <div id={placeholderId} className="tp-preview-block" data-preview-message={__('Preview Only', 'TouchPoint-WP')}></div>
+                <wp.blockEditor.InspectorAdvancedControls>
+                    <wp.components.SelectControl
+                        multiple
+                        label={__("Filter by Member Types", "TouchPoint-WP")}
+                        value={attributes.memTypes}
+                        options={memTypeOptions}
+                        onChange={(selected) => {
+                            // selected may be an array of strings (from the UI) or numbers.
+                            const arr = Array.isArray(selected) ? selected.map(s => Number(s)) : [Number(selected)];
+
+                            // if "All Leaders" is selected, set memTypes to [-1]
+                            if (arr.includes(-1)) {
+                                setAttributes({memTypes: [-1]});
+                                return;
+                            }
+
+                            // if "All Members" is selected, set memTypes to []
+                            if (arr.includes(0)) {
+                                setAttributes({memTypes: []});
+                                return;
+                            }
+
+                            setAttributes({memTypes: arr});
+                        }}
+                        __next40pxDefaultSize={true}
+                        __nextHasNoMarginBottom={true}
+                    />
+                    <wp.components.SelectControl
+                        label={__("Filter by Genders", "TouchPoint-WP")}
+                        value={attributes.genders}
+                        options={genderOptions}
+                        onChange={(selected) => {
+                            // normalize to an array of numbers
+                            const arr = Array.isArray(selected) ? selected.map(s => Number(s)) : [Number(selected)];
+                            // if "Any" (value 0) selected, store empty array to mean no filter
+                            if (arr.includes(0)) {
+                                setAttributes({genders: [0]});
+                                return;
+                            }
+                            setAttributes({genders: arr});
+                        }}
+                        __next40pxDefaultSize={true}
+                        __nextHasNoMarginBottom={true}
+                    />
+                </wp.blockEditor.InspectorAdvancedControls>
+                <div id={placeholderId} ref={placeholderRef} className="tp-preview-block person-list" data-preview-message={__('Preview Only', 'TouchPoint-WP')} data-preview-length={previewHtml ? previewHtml.length : 0} dangerouslySetInnerHTML={{__html: previewHtml}}></div>
             </div>
-        );
+         );
     },
     save: function (props) {
         const {attributes} = props;
         const {invId} = attributes;
         const blockProps = wp.blockEditor.useBlockProps.save();
-        const additionalClasses = blockProps.className || '';
+        let additionalClasses = blockProps.className || '';
+
+        // remove is-selected from additionalClasses if present.  Replace any double-spaces with singles.
+        additionalClasses = additionalClasses.replace('is-selected', '').replace(/\s+/g, ' ').trim();
 
         return `[TP-People class="${additionalClasses}" invId="${invId}"]`;
     },
 });
 
-let invOptionsController = null;
-let lastPath = null;
-let previewController = null;
+function updateListContent(invId, attributes, blockProps, placeholderId, placeholderEl, previewControllerRef, lastPathRef, setPreviewHtml) {
 
-function updateListContent(invId, blockProps, placeholderId) {
-    const placeholder = document.getElementById(placeholderId);
-    if (!invId || invId <= 0) {
-        if (placeholder) {
-            placeholder.innerHTML = '<div class="tp-preview-block-error">' + __('Please select an Involvement to display.', 'TouchPoint-WP') + '</div>';
-        }
-        return;
-    }
+     // Prefer the provided placeholder element (ref). Fallback to document lookup when not provided.
+     const placeholder = placeholderEl || document.getElementById(placeholderId);
+     if (!invId || invId <= 0) {
+         const msg = '<div class="tp-preview-block-error">' + __('Please select an Involvement to display.', 'TouchPoint-WP') + '</div>';
+         if (setPreviewHtml) {
+             setPreviewHtml(msg);
+         } else if (placeholder) {
+             placeholder.innerHTML = msg;
+         }
+         return;
+     }
+
+    const memTypesParam = attributes.memTypes ? attributes.memTypes.join(',') : '';
+    const gendersParam = attributes.genders ? attributes.genders.join(',') : '';
+    // encode className to avoid invalid URL characters
+    const cls = encodeURIComponent(blockProps.className || '');
+    const newPath = `/touchpoint-api/person/list?invId=${encodeURIComponent(invId)}&memType=${encodeURIComponent(memTypesParam)}&gender=${encodeURIComponent(gendersParam)}&class=${cls}&context=block-preview`;
 
-    const newPath = `/touchpoint-api/person/list?invId=${invId}&class=${blockProps.className || ''}&context=block-preview`;
+     // Use per-instance refs when provided, otherwise fall back to module-level vars.
+     const lastPathHolder = lastPathRef && typeof lastPathRef === 'object' ? lastPathRef : {current: lastPath};
+     const previewControllerHolder = previewControllerRef && typeof previewControllerRef === 'object' ? previewControllerRef : {current: previewController};
 
-    if (lastPath === newPath) {
+    if (lastPathHolder.current === newPath) {
         return;
     }
 
-    if (previewController) {
-        previewController.abort();
+    if (previewControllerHolder.current) {
+        try { previewControllerHolder.current.abort(); } catch (e) { /* ignore */ }
     }
 
-    previewController = new AbortController();
-    lastPath = newPath;
+    previewControllerHolder.current = new AbortController();
+    lastPathHolder.current = newPath;
 
-    fetch(newPath, {signal: previewController.signal})
-        .then(response => response.text())
+    // If using module-level fallback, keep module vars in sync
+    if (!previewControllerRef) previewController = previewControllerHolder.current;
+    if (!lastPathRef) lastPath = lastPathHolder.current;
+
+    fetch(newPath, {signal: previewControllerHolder.current.signal})
+        .then(response => {
+            if (!response.ok) throw new Error('Network response was not ok');
+            return response.text();
+        })
         .then(data => {
-            if (placeholder) {
-                placeholder.innerHTML = data;
+            if (setPreviewHtml) {
+                try { setPreviewHtml(data); } catch (e) { console.error('setPreviewHtml error', e); }
+            }
+            // Also attempt to write directly into the placeholder DOM node in case React render does not take effect
+            if (placeholder && placeholder.innerHTML !== data) {
+                try { placeholder.innerHTML = data; } catch (e) { console.error('Direct placeholder.innerHTML error', e); }
             }
         })
-        .catch(() => {}); // suppress error from abortion.
-}
-
+        .catch((err) => {
+            // If the fetch was aborted we don't need to log an error.
+            if (err.name !== 'AbortError') {
+                console.error('Error fetching preview:', err);
+                const msg = '<div class="tp-preview-block-error">' + __('Unable to load preview.', 'TouchPoint-WP') + '</div>';
+                if (setPreviewHtml) {
+                    try { setPreviewHtml(msg); } catch (e) { console.error('setPreviewHtml error', e); }
+                }
+                if (placeholder) {
+                    try { placeholder.innerHTML = msg; } catch (e) { console.error('Direct placeholder.innerHTML error', e); }
+                }
+             }
+         });
+ }
diff --git a/package.json b/package.json
index 036992e1..0675ff44 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "@wordpress/env": "^10",
     "@wordpress/i18n": "^5",
     "@wordpress/scripts": "^30.18.0",
+    "baseline-browser-mapping": "^2.10.12",
     "style-loader": "^4.0.0",
     "uglify-js": "^3.17.4"
   },

From 89581e8c9c655674eb7e2e7f74a607dbf3fd779e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 30 Mar 2026 22:56:07 -0400
Subject: [PATCH 354/423] Add filter for CSS partials

---
 src/TouchPoint-WP/TouchPointWP.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 92acc369..135e762a 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -2586,8 +2586,24 @@ public function flushRewriteRules(bool $force = true): void
 	 * This function enqueues the stylesheet for the default templates, to avoid registering the style on sites where
 	 * custom templates exist.
 	 */
-	public static function enqueuePartialsStyle(): void
+	public static function enqueuePartialsStyle(?string $context = null): void
 	{
+		$usePartials = true;
+
+		/** @noinspection PhpConditionAlreadyCheckedInspection */
+		/**
+		 * Allows theme and plugin developers to prevent CSS partials from being enqueued.
+		 *
+		 * @since 0.0.96 Added
+		 *
+		 * @param ?string $context A string provided to indicate where the request is coming from.
+		 * @param bool $usePartials Whether to enqueue the partials CSS.  Default true = enqueue.
+		 */
+		$usePartials = apply_filters("tp_use_partials_template_style", $context, $usePartials);
+		if (!$usePartials) {
+			return;
+		}
+
 		wp_enqueue_style(
 			TouchPointWP::SHORTCODE_PREFIX . 'partials-template-style',
 			self::instance()->assets_url . 'template/partials-template-style.css',

From ff4e1d1677b188d36e87fcd026a3d6c099873818 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 12:00:38 -0400
Subject: [PATCH 355/423] memberType filter success.

---
 blocks/inv-list/block.json            |   3 +-
 blocks/inv-list/index.js              | 174 +++++++++++++++-----------
 blocks/people-list/block.json         |   3 +-
 blocks/people-list/index.js           |  58 ++++-----
 src/TouchPoint-WP/Involvement.php     |   2 +-
 src/TouchPoint-WP/Partner.php         |   2 +-
 src/TouchPoint-WP/Person.php          |  41 +++++-
 src/TouchPoint-WP/Taxonomies.php      |  36 ++++++
 src/TouchPoint-WP/TouchPointWP.php    |  16 +--
 src/templates/involvement-archive.php |   2 +-
 src/templates/involvement-single.php  |   6 +-
 src/templates/meeting-archive.php     |   2 +-
 src/templates/partner-archive.php     |   2 +-
 src/templates/partner-single.php      |   2 +-
 14 files changed, 221 insertions(+), 128 deletions(-)

diff --git a/blocks/inv-list/block.json b/blocks/inv-list/block.json
index 527443ba..d956eed4 100644
--- a/blocks/inv-list/block.json
+++ b/blocks/inv-list/block.json
@@ -13,6 +13,5 @@
     "reusable": false
   },
   "textdomain": "TouchPoint-WP",
-  "editorScript": "file:./index.js",
-  "editorStyle": "file:./index.css"
+  "editorScript": "file:./index.js"
 }
\ No newline at end of file
diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index fa00de44..f23df5e2 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -1,14 +1,3 @@
-/**
- * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
- * All files containing `style` keyword are bundled together. The code used
- * gets applied both to the front of your site and to the editor.
- *
- * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
- */
-import "../../assets/template/partials-template-style.css";
-import "../../assets/template/actions-style.css";
-import "../../assets/template/block-preview-style.css"
-
 /**
  * Internal dependencies
  */
@@ -43,6 +32,12 @@ wp.blocks.registerBlockType( metadata.name, {
 		const blockProps = wp.blockEditor.useBlockProps();
 		const placeholderId = `tp-inv-list-${generateUniqueId()}`;
 
+		// Per-instance refs for controller/lastPath to avoid cross-block collisions like People List
+		const previewControllerRef = wp.element.useRef(null);
+		const lastPathRef = wp.element.useRef(null);
+		const placeholderRef = wp.element.useRef(null);
+		const [previewHtml, setPreviewHtml] = wp.element.useState(__("Loading Preview...", "TouchPoint-WP"));
+
 		const [postTypeOptions, setPostTypeOptions] = wp.element.useState([]);
 		const [divisionChildren, setDivisionChildren] = wp.element.useState(null);
 
@@ -95,49 +90,66 @@ wp.blocks.registerBlockType( metadata.name, {
 			})();
 		}, []);
 
-		// preview
+		// preview - ensure initial render with retries like People List block so editor shows preview when block loads
 		wp.element.useEffect(() => {
-			updateListContent(postType, division, blockProps, placeholderId);
+			const tryUpdate = (retries = 5) => {
+				const el = placeholderRef.current || document.getElementById(placeholderId);
+				if (el) {
+					updateListContent(postType, division, blockProps, placeholderId, el, previewControllerRef, lastPathRef, setPreviewHtml);
+				} else if (retries > 0) {
+					setTimeout(() => tryUpdate(retries - 1), 100);
+				} else {
+					updateListContent(postType, division, blockProps, placeholderId, placeholderRef.current, previewControllerRef, lastPathRef, setPreviewHtml);
+				}
+			};
+
+			tryUpdate();
 		}, [postType, division, blockProps.className, placeholderId]);
 
-		return (
-			<div {...blockProps} >
-				<wp.blockEditor.InspectorControls>
-					<wp.components.PanelBody title={__("Settings", "TouchPoint-WP")}>
-						{postTypeOptions.length === 0 ? (
-							<div style={{ padding: '1em', color: 'red' }}>
-								{__("To use this block, import Involvements in the TouchPoint-WP settings.", "TouchPoint-WP")}
-							</div>
-						) : (
-							<>
-								<wp.components.SelectControl
-									label={__("Post Type", "TouchPoint-WP")}
-									help={__("These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings.", "TouchPoint-WP")}
-									value={postType}
-									options={postTypeOptions}
-									onChange={(value) => setAttributes({ postType: value })}
-									__next40pxDefaultSize={true}
-									__nextHasNoMarginBottom={true}
-								/>
-								<wp.components.SelectControl
-									label={__("Division", "TouchPoint-WP")}
-									help={__("This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings.", "TouchPoint-WP")}
-									value={division}
-									children={divisionChildren}
-									onChange={(value) => setAttributes({ division: Number(value) })}
-									__next40pxDefaultSize={true}
-									__nextHasNoMarginBottom={true}
-								/>
-							</>
-						)}
-					</wp.components.PanelBody>
-				</wp.blockEditor.InspectorControls>
-				<div id={placeholderId} className="tp-preview-block" data-preview-message={__('Preview Only', 'TouchPoint-WP')}></div>
-			</div>
-		);
-	},
-	save: function(props) {
-		const { attributes } = props;
+        return (
+                <div {...blockProps} >
+                    <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/block-preview-style.css?ver=0.0.96" />
+                    <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/actions-style.css?ver=0.0.96" />
+                    <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/partials-template-style.css?ver=0.0.96" />
+                <wp.blockEditor.InspectorControls>
+                    <wp.components.PanelBody title={__("Settings", "TouchPoint-WP")}>
+                        {postTypeOptions.length === 0 ? (
+                            <div style={{padding: '1em', color: 'red'}}>
+                                {__("To use this block, import Involvements in the TouchPoint-WP settings.", "TouchPoint-WP")}
+                            </div>
+                        ) : (
+                            <>
+                                <wp.components.SelectControl
+                                    label={__("Post Type", "TouchPoint-WP")}
+                                    help={__("These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings.", "TouchPoint-WP")}
+                                    value={postType}
+                                    options={postTypeOptions}
+                                    onChange={(value) => setAttributes({postType: value})}
+                                    __next40pxDefaultSize={true}
+                                    __nextHasNoMarginBottom={true}
+                                />
+                                <wp.components.SelectControl
+                                    label={__("Division", "TouchPoint-WP")}
+                                    help={__("This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings.", "TouchPoint-WP")}
+                                    value={division}
+                                    children={divisionChildren}
+                                    onChange={(value) => setAttributes({division: Number(value)})}
+                                    __next40pxDefaultSize={true}
+                                    __nextHasNoMarginBottom={true}
+                                />
+                            </>
+                        )}
+                    </wp.components.PanelBody>
+                </wp.blockEditor.InspectorControls>
+				<div id={placeholderId} ref={placeholderRef} className="tp-preview-block"
+					 data-preview-message={__('Preview Only', 'TouchPoint-WP')} data-preview-length={previewHtml ? previewHtml.length : 0}>
+					<wp.element.RawHTML>{previewHtml}</wp.element.RawHTML>
+				</div>
+            </div>
+        );
+    },
+    save: function (props) {
+        const { attributes } = props;
 		const { postType, division } = attributes;
 		const blockProps = wp.blockEditor.useBlockProps.save();
 		const additionalClasses = blockProps.className || '';
@@ -152,26 +164,42 @@ wp.blocks.registerBlockType( metadata.name, {
 let lastPath = null;
 let controller = null;
 
-function updateListContent(postType, division, blockProps, placeholderId) {
-    const newPath = `/touchpoint-api/inv/list?type=${postType}&div=${division}&class=${blockProps.className || ''}`;
-    if (lastPath === newPath) {
-        return;
-    }
-
-    if (controller) {
-        controller.abort();
-    }
-
-    controller = new AbortController();
-    lastPath = newPath;
-
-    fetch(newPath, { signal: controller.signal })
-        .then(response => response.text())
-        .then(data => {
-            const placeholder = document.getElementById(placeholderId);
-            if (placeholder) {
-                placeholder.innerHTML = data;
-            }
-        })
-        .catch(() => {}); // suppress error from abortion.
+function updateListContent(postType, division, blockProps, placeholderId, placeholderEl, previewControllerRef, lastPathRef, setPreviewHtml) {
+	const placeholder = placeholderEl || document.getElementById(placeholderId);
+	const newPath = `/touchpoint-api/inv/list?type=${postType}&div=${division}&class=${encodeURIComponent(blockProps.className || '')}`;
+
+	// Use per-instance refs when provided, otherwise fall back to module-level vars.
+	const lastPathHolder = lastPathRef && typeof lastPathRef === 'object' ? lastPathRef : {current: lastPath};
+	const controllerHolder = previewControllerRef && typeof previewControllerRef === 'object' ? previewControllerRef : {current: controller};
+
+	if (lastPathHolder.current === newPath) {
+		return;
+	}
+
+	if (controllerHolder.current) {
+		try { controllerHolder.current.abort(); } catch (e) { /* ignore */ }
+	}
+
+	controllerHolder.current = new AbortController();
+	lastPathHolder.current = newPath;
+
+	// If using module-level fallback, keep module vars in sync
+	if (!previewControllerRef) controller = controllerHolder.current;
+	if (!lastPathRef) lastPath = lastPathHolder.current;
+
+	fetch(newPath, { signal: controllerHolder.current.signal })
+		.then(response => {
+			if (!response.ok) throw new Error('Network response was not ok');
+			return response.text();
+		})
+		.then(data => {
+			if (setPreviewHtml) {
+				try { setPreviewHtml(data); } catch (e) { console.error('setPreviewHtml error', e); }
+			}
+			// Also attempt to write directly into the placeholder DOM node in case React render does not take effect
+			if (placeholder && placeholder.innerHTML !== data) {
+				try { placeholder.innerHTML = data; } catch (e) { console.error('Direct placeholder.innerHTML error', e); }
+			}
+		})
+		.catch(() => {}); // suppress error from abortion.
 }
diff --git a/blocks/people-list/block.json b/blocks/people-list/block.json
index e6abae87..88790232 100644
--- a/blocks/people-list/block.json
+++ b/blocks/people-list/block.json
@@ -13,6 +13,5 @@
     "reusable": false
   },
   "textdomain": "TouchPoint-WP",
-  "editorScript": "file:./index.js",
-  "editorStyle": "file:./index.css"
+  "editorScript": "file:./index.js"
 }
\ No newline at end of file
diff --git a/blocks/people-list/index.js b/blocks/people-list/index.js
index a623996d..94624755 100644
--- a/blocks/people-list/index.js
+++ b/blocks/people-list/index.js
@@ -1,14 +1,3 @@
-/**
- * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
- * All files containing `style` keyword are bundled together. The code used
- * gets applied both to the front of your site and to the editor.
- *
- * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
- */
-import "../../assets/template/partials-template-style.css";
-import "../../assets/template/actions-style.css";
-import "../../assets/template/block-preview-style.css";
-
 /**
  * Internal dependencies
  */
@@ -42,8 +31,8 @@ wp.blocks.registerBlockType(metadata.name, {
             default: [],
         },
         genders: {
-            type: 'array',
-            default: [],
+            type: 'integer',
+            default: 0,
         }
     },
     edit: function (props) {
@@ -63,7 +52,7 @@ wp.blocks.registerBlockType(metadata.name, {
         const [genderOptions, setGenderOptions] = wp.element.useState([]);
         const [isLoading, setIsLoading] = wp.element.useState(true);
         // State to hold preview HTML so React renders it (avoids mutating DOM nodes React may replace).
-        const [previewHtml, setPreviewHtml] = wp.element.useState('');
+        const [previewHtml, setPreviewHtml] = wp.element.useState(__("Loading Preview...", "TouchPoint-WP"));
 
         const getInvOptionsFromApi = async (searchQ) => {
             if (invOptionsController) {
@@ -178,6 +167,10 @@ wp.blocks.registerBlockType(metadata.name, {
 
         return (
             <div {...blockProps}>
+                {/* Ensure preview styles are available inside the editor canvas/preview. */}
+                <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/block-preview-style.css?ver=0.0.96" />
+                <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/actions-style.css?ver=0.0.96" />
+                <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/partials-template-style.css?ver=0.0.96" />
                 <wp.blockEditor.InspectorControls>
                     <wp.components.PanelBody title={__('Settings', 'TouchPoint-WP')}>
                         <wp.components.ComboboxControl
@@ -201,6 +194,7 @@ wp.blocks.registerBlockType(metadata.name, {
                     <wp.components.SelectControl
                         multiple
                         label={__("Filter by Member Types", "TouchPoint-WP")}
+                        help={__("This option allows you to filter the people that are shown based on their member type in the selected involvement. By default, all members (not prospect or pending) are shown.", "TouchPoint-WP")}
                         value={attributes.memTypes}
                         options={memTypeOptions}
                         onChange={(selected) => {
@@ -210,52 +204,58 @@ wp.blocks.registerBlockType(metadata.name, {
                             // if "All Leaders" is selected, set memTypes to [-1]
                             if (arr.includes(-1)) {
                                 setAttributes({memTypes: [-1]});
-                                return;
                             }
-
-                            // if "All Members" is selected, set memTypes to []
-                            if (arr.includes(0)) {
-                                setAttributes({memTypes: []});
-                                return;
+                            // if "All Members" is selected, set memTypes to [0]
+                            else if (arr.includes(0)) {
+                                setAttributes({memTypes: [0]});
+                            }
+                            else {
+                                setAttributes({memTypes: arr});
                             }
-
-                            setAttributes({memTypes: arr});
                         }}
                         __next40pxDefaultSize={true}
                         __nextHasNoMarginBottom={true}
                     />
                     <wp.components.SelectControl
-                        label={__("Filter by Genders", "TouchPoint-WP")}
+                        label={__("Filter by Gender", "TouchPoint-WP")}
+                        help={__("This option allows you to filter the people that are shown based on gender. By default, gender filters are not applied.", "TouchPoint-WP")}
                         value={attributes.genders}
+                        multiple={false}
                         options={genderOptions}
                         onChange={(selected) => {
                             // normalize to an array of numbers
                             const arr = Array.isArray(selected) ? selected.map(s => Number(s)) : [Number(selected)];
                             // if "Any" (value 0) selected, store empty array to mean no filter
                             if (arr.includes(0)) {
-                                setAttributes({genders: [0]});
-                                return;
+                                setAttributes({genders: 0});
+                            } else {
+                                setAttributes({genders: arr});
                             }
-                            setAttributes({genders: arr});
                         }}
                         __next40pxDefaultSize={true}
                         __nextHasNoMarginBottom={true}
                     />
                 </wp.blockEditor.InspectorAdvancedControls>
-                <div id={placeholderId} ref={placeholderRef} className="tp-preview-block person-list" data-preview-message={__('Preview Only', 'TouchPoint-WP')} data-preview-length={previewHtml ? previewHtml.length : 0} dangerouslySetInnerHTML={{__html: previewHtml}}></div>
+                <div id={placeholderId} ref={placeholderRef} className="tp-preview-block person-list" data-preview-message={__('Preview Only', 'TouchPoint-WP')} data-preview-length={previewHtml ? previewHtml.length : 0}>
+                    <wp.element.RawHTML>{previewHtml}</wp.element.RawHTML>
+                </div>
             </div>
          );
     },
     save: function (props) {
         const {attributes} = props;
-        const {invId} = attributes;
+        const {invId, genders, memTypes} = attributes;
+
         const blockProps = wp.blockEditor.useBlockProps.save();
         let additionalClasses = blockProps.className || '';
 
         // remove is-selected from additionalClasses if present.  Replace any double-spaces with singles.
         additionalClasses = additionalClasses.replace('is-selected', '').replace(/\s+/g, ' ').trim();
 
-        return `[TP-People class="${additionalClasses}" invId="${invId}"]`;
+        const genderClause = genders === 0 ? "" : ` genders=${genders}`
+        const memTypesClause = memTypes !== [0] && memTypes.length > 0 ? ` memTypes=${memTypes.join(',')}` : "";
+
+        return `[TP-People class="${additionalClasses}" invId="${invId}"${genderClause}${memTypesClause}]`;
     },
 });
 
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index cecb6e0a..c6e84a2e 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1539,7 +1539,7 @@ public static function doInvolvementList(WP_Query $q, $params = []): void
 			if ($q->post_count > 0) {
 				/** @noinspection SpellCheckingInspection */
 				if ($params['includecss']) {
-					TouchPointWP::enqueuePartialsStyle();
+					TouchPointWP::enqueuePartialsStyle("inv-list attribute");
 				}
 
 				echo "<div class=\"$containerClass\">";
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index c59217a1..6d0b78ac 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -747,7 +747,7 @@ public static function listShortcode($params = [], string $content = ""): string
 		$params['includecss'] = $params['includecss'] === true || $params['includecss'] === 'true';
 
 		if ($params['includecss']) {
-			TouchPointWP::enqueuePartialsStyle();
+			TouchPointWP::enqueuePartialsStyle("partner-list attribute");
 		}
 
 		ob_start();
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 9813cac4..05499fca 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -461,10 +461,41 @@ public static function peopleListShortcode($params = [], string $content = ""):
 			return "<!-- Error: Can't create Involvement Actions because there is no clear involvement.  Define the InvId and make sure it's imported. -->";
 		}
 
-		$WP_User_queryParams['meta_query'][] = [
-			'key'     => self::META_INV_MEMBER_PREFIX . $iid,
-			'compare' => "EXISTS"
-		];
+		// Member Type filtering
+
+		/** @noinspection SpellCheckingInspection */
+		$memTypes = $params['memtype'] ?? [];
+		if (trim($memTypes) === "") {
+			$memTypes = [];
+		}
+		if (!is_array($memTypes)) {
+			$memTypes = explode(',', trim($memTypes));
+		}
+		if (count($memTypes) === 0 || in_array("0", $memTypes)) {
+			// Leaders, Volunteers, Members: at10, at20, or at30.
+			$WP_User_queryParams['meta_query'][] = [
+				'key' => self::META_INV_ATTEND_PREFIX . $iid,
+				'value' => ['at10', 'at20', 'at30'],
+			];
+		} else if (in_array("-1", $memTypes)) {
+			// Leaders: at10
+			$WP_User_queryParams['meta_query'][] = [
+				'key' => self::META_INV_ATTEND_PREFIX . $iid,
+				'value' => 'at10'
+			];
+		} else {
+			// format types to append mt to front of each value
+			$types = [];
+			foreach ($memTypes as $type) {
+				$types[] = "mt$type";
+			}
+			$WP_User_queryParams['meta_query'][] = [
+				'key' => self::META_INV_MEMBER_PREFIX . $iid,
+				'value' => $types
+			];
+		}
+
+		// Gender Filtering
 
 		// TODO DIR filter by involvement member type
 
@@ -483,7 +514,7 @@ public static function peopleListShortcode($params = [], string $content = ""):
 
 		$loadedPart = get_template_part('person-list', 'person-list');
 		if ($loadedPart === false) {
-			TouchPointWP::enqueuePartialsStyle();
+			TouchPointWP::enqueuePartialsStyle("person-list attribute");
 			ob_start();
 			require TouchPointWP::$dir . "/src/templates/parts/person-list.php";
 			$out .= ob_get_clean();
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 388bc9e8..6fe6e212 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -663,6 +663,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -692,6 +696,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -725,6 +733,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => true
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -751,6 +763,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -781,6 +797,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -811,6 +831,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -840,6 +864,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -872,6 +900,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 						'with_front'   => false,
 						'hierarchical' => false
 					],
+					'capabilities' => [
+						'manage_terms' => 'do_not_allow',
+						'edit_terms' => 'do_not_allow',
+					]
 				]
 			);
 			// Terms inserted via insertTerms method
@@ -905,6 +937,10 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 							'with_front'   => false,
 							'hierarchical' => false
 						],
+						'capabilities' => [
+							'manage_terms' => 'do_not_allow',
+							'edit_terms' => 'do_not_allow',
+						]
 					]
 				);
 				// Terms are inserted on sync.
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 135e762a..81c4fb3d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -2588,19 +2588,19 @@ public function flushRewriteRules(bool $force = true): void
 	 */
 	public static function enqueuePartialsStyle(?string $context = null): void
 	{
-		$usePartials = true;
+		$includePartialsStyle = true;
 
-		/** @noinspection PhpConditionAlreadyCheckedInspection */
 		/**
-		 * Allows theme and plugin developers to prevent CSS partials from being enqueued.
+		 * Filter to determine if the stylesheet that provides default styling for overrideable theme elements should
+		 * be included.
 		 *
-		 * @since 0.0.96 Added
+		 * @params bool $includePartialsStyle Whether to include the styles.  Default true = include.
+		 * @params ?string $context a string that may be provided to clarify where the style is being called from.
 		 *
-		 * @param ?string $context A string provided to indicate where the request is coming from.
-		 * @param bool $usePartials Whether to enqueue the partials CSS.  Default true = enqueue.
+		 * @noinspection PhpConditionAlreadyCheckedInspection
 		 */
-		$usePartials = apply_filters("tp_use_partials_template_style", $context, $usePartials);
-		if (!$usePartials) {
+		$includePartialsStyle = !!apply_filters("tp_include_actions_style", $includePartialsStyle, $context);
+		if (!$includePartialsStyle) {
 			return;
 		}
 
diff --git a/src/templates/involvement-archive.php b/src/templates/involvement-archive.php
index 553c00f3..02cfc59c 100644
--- a/src/templates/involvement-archive.php
+++ b/src/templates/involvement-archive.php
@@ -31,7 +31,7 @@
 if (have_posts()) {
     global $wp_query;
 
-    TouchPointWP::enqueuePartialsStyle();
+    TouchPointWP::enqueuePartialsStyle("involvement-archive");
     ?>
     <header class="archive-header has-text-align-center header-footer-group">
         <div class="archive-header-inner section-inner medium">
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index ef466613..fe61b5e4 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -16,7 +16,7 @@
 $tps = TouchPointWP::instance()->settings;
 $obj = PostTypeCapable::fromPost($p);
 
-TouchPointWP::enqueuePartialsStyle();
+TouchPointWP::enqueuePartialsStyle("involvement-single");
 
 ?>
 
@@ -115,7 +115,7 @@
 		/** @var WP_Post $post */
 		$loadedPart = get_template_part('list-item', 'involvement-list-item');
 		if ($loadedPart === false) {
-			TouchPointWP::enqueuePartialsStyle();
+			TouchPointWP::enqueuePartialsStyle("involvement-single child-item");
 			require TouchPointWP::$dir . "/src/templates/parts/involvement-list-item.php";
 		}
 	}
@@ -148,7 +148,7 @@
 		/** @var WP_Post $post */
 		$loadedPart = get_template_part('list-item', 'event-list-item');
 		if ($loadedPart === false) {
-			TouchPointWP::enqueuePartialsStyle();
+			TouchPointWP::enqueuePartialsStyle("involvement-single event-item");
 			require TouchPointWP::$dir . "/src/templates/parts/meeting-list-item.php";
 		}
 	}
diff --git a/src/templates/meeting-archive.php b/src/templates/meeting-archive.php
index 3d1b4073..d7a24f09 100644
--- a/src/templates/meeting-archive.php
+++ b/src/templates/meeting-archive.php
@@ -20,7 +20,7 @@
 if (have_posts()) {
     global $wp_query;
 
-    TouchPointWP::enqueuePartialsStyle();
+    TouchPointWP::enqueuePartialsStyle("meeting-archive");
     ?>
     <header class="archive-header has-text-align-center header-footer-group">
         <div class="archive-header-inner section-inner medium">
diff --git a/src/templates/partner-archive.php b/src/templates/partner-archive.php
index 3571d493..0ea07548 100644
--- a/src/templates/partner-archive.php
+++ b/src/templates/partner-archive.php
@@ -30,7 +30,7 @@
     $wp_the_query->get_posts();
     $wp_the_query->rewind_posts();
 
-    TouchPointWP::enqueuePartialsStyle();
+    TouchPointWP::enqueuePartialsStyle("partner-archive");
     ?>
     <header class="archive-header has-text-align-center header-footer-group">
         <div class="archive-header-inner section-inner medium">
diff --git a/src/templates/partner-single.php b/src/templates/partner-single.php
index 17a68477..bffc5ec5 100644
--- a/src/templates/partner-single.php
+++ b/src/templates/partner-single.php
@@ -11,7 +11,7 @@
 $pst   = get_post();
 $prtnr = Partner::fromPost($pst);
 
-TouchPointWP::enqueuePartialsStyle();
+TouchPointWP::enqueuePartialsStyle("partner-single");
 
 ?>
 

From e94c62c53da520ee19ef1dc01a47eae237b82ad4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 12:04:52 -0400
Subject: [PATCH 356/423] Remove unused enqueuing call

---
 src/TouchPoint-WP/Blocks/BlocksController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index f2e732ce..b32149c6 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -24,7 +24,6 @@ public static function init(): void
 
 		// Hook the enqueue function
 		add_action('enqueue_block_editor_assets', [BlocksController::class, 'enqueueBlockAssets']);
-		add_action('wp_enqueue_scripts', [BlocksController::class, 'enqueueBlockAssets']);
 
 		/**
 		 * Registers the block(s) metadata from the `blocks-manifest.php` and registers the block type(s)

From 872b87e2492f35da84e69b1f6d7406259c849b15 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 12:22:31 -0400
Subject: [PATCH 357/423] Caching lookup calls

---
 src/TouchPoint-WP/Lookup.php | 38 +++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Lookup.php b/src/TouchPoint-WP/Lookup.php
index 9640ae73..d0382d95 100644
--- a/src/TouchPoint-WP/Lookup.php
+++ b/src/TouchPoint-WP/Lookup.php
@@ -18,9 +18,11 @@
 /**
  * Admin API class.
  */
-class Lookup implements api
+abstract class Lookup implements api
 {
 
+	const TTL = HOUR_IN_SECONDS;
+
 	/**
 	 * Handle API requests
 	 *
@@ -31,12 +33,42 @@ class Lookup implements api
 	public static function api(array $uri): bool
 	{
 		try {
-			$d = TouchPointWP::instance()->api->get('/api/v1/Lookup/' . $uri['path'][2]);
 			header('Content-Type: application/json');
-			echo $d['body']; // already JSON-encoded by the API
+			echo json_encode(self::getLookup($uri['path'][2]));
 			exit;
 		} catch (TouchPointWP_Exception) {
 			return false;
 		}
 	}
+
+	/**
+	 * @param string $path
+	 * @param bool   $noCache
+	 *
+	 * @return mixed
+	 * @throws TouchPointWP_Exception
+	 */
+	public static function getLookup(string $path, bool $noCache = false): mixed
+	{
+		$cacheKey = TouchPointWP::SETTINGS_PREFIX . "lookup_$path";
+
+		if (!$noCache) {
+			// check transients
+			$v = get_transient($cacheKey);
+			if ($v !== false) {
+				return json_decode($v);
+			}
+		}
+
+		$v = TouchPointWP::instance()->api->get("/api/v1/Lookup/$path");
+
+		if (isset($v['body'])) {
+			// assume body is already json
+			set_transient($cacheKey, $v['body'], self::TTL);
+
+			return json_decode($v['body']);
+		}
+
+		throw new TouchPointWP_Exception("Unexpected response from API: " . json_encode($v));
+	}
 }
\ No newline at end of file

From efd3947f0a3092c854751653c93d2a09220655b3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 12:26:16 -0400
Subject: [PATCH 358/423] correct alignment

---
 assets/template/partials-template-style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index 9a548abb..a85264f9 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -72,6 +72,7 @@ article.inv-list-item h2 a {
     right: 0;
     margin: 1.5em 1em;
     opacity: 0;
+    text-align: center;
 }
 
 .person-list-item.has-actions:hover .person-actions {

From 0ee5f0bf95d33e856163482de19c6a258e3de9e1 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 12:48:19 -0400
Subject: [PATCH 359/423] changing ttl

---
 src/TouchPoint-WP/Utilities/Cleanup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities/Cleanup.php b/src/TouchPoint-WP/Utilities/Cleanup.php
index 940ee651..5f1d14af 100644
--- a/src/TouchPoint-WP/Utilities/Cleanup.php
+++ b/src/TouchPoint-WP/Utilities/Cleanup.php
@@ -24,7 +24,7 @@
 abstract class Cleanup implements api
 {
 	public const CRON_HOOK = TouchPointWP::HOOK_PREFIX . "cleanup_cron_hook";
-	private const CACHE_TTL = 3600 * 24 * 7; // How long things should live before they're cleaned up.  Seconds.
+	private const CACHE_TTL = WEEK_IN_SECONDS; // How long things should live before they're cleaned up.  Seconds.
 
 	/**
 	 * Called by the cron task. (and also by ::api() )

From 2e45773896ca5b82ea9d37f10137b7607d448849 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 14:59:06 -0400
Subject: [PATCH 360/423] API adjustments

---
 src/TouchPoint-WP/Api.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 1eb99ac3..82f095e5 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -316,7 +316,7 @@ protected function prepareRequest(string $command, mixed &$headers, ?int $onBeha
 	/**
 	 * Do a GET to the standard API using a PAT.
 	 *
-	 * @param string $command The API endpoint to call
+	 * @param string $command The API endpoint to call (after /api/)
 	 * @param array  $parameters URL parameters to be added.
 	 * @param array  $headers Headers to send with the request.
 	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
@@ -330,7 +330,7 @@ public function get(string $command, array $parameters = [], array $headers = []
 	{
 		$tik = microtime(true);
 		for ($attempt = 0; $attempt < 2; $attempt++) {
-			$url = $this->prepareRequest($command, $headers, $onBehalfPid);
+			$url = $this->prepareRequest("/api/" . $command, $headers, $onBehalfPid);
 
 			// build query string
 			if (!empty($parameters)) {
@@ -370,7 +370,7 @@ public function get(string $command, array $parameters = [], array $headers = []
 	/**
 	 * Do a POST to the standard API using a PAT.
 	 *
-	 * @param string $command The API endpoint to call
+	 * @param string $command The API endpoint to call (after /api/)
 	 * @param ?mixed $data Data to post
 	 * @param array  $headers Headers to send with the request.
 	 * @param ?int   $onBehalfPid The PID of the user to act on behalf of.
@@ -385,7 +385,7 @@ public function post(string $command, mixed $data = null, array $headers = [], ?
 		$tik = microtime(true);
 
 		for ($attempt = 0; $attempt < 2; $attempt++) {
-			$url = $this->prepareRequest($command, $headers, $onBehalfPid);
+			$url = $this->prepareRequest("/api/" . $command, $headers, $onBehalfPid);
 			$r   = $this->getHttpClient()->request(
 				$url,
 				[

From f21037ef041d2c9a7f660247390ee187d4a4f0da Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 15:01:10 -0400
Subject: [PATCH 361/423] API adjustments

---
 src/TouchPoint-WP/Auth.php                  | 2 +-
 src/TouchPoint-WP/Lookup.php                | 3 ++-
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 498ff472..cc4c6906 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -390,7 +390,7 @@ public static function authenticate(WP_Error|WP_User|null $user, mixed $username
 			$api = TouchPointWP::instance()->api;
 
 			try {
-				$r = $api->post("/api/v1/Account/ValidateOneTimeLogin", data: $_GET[self::LOGIN_PARAMETER]);
+				$r = $api->post("v1/Account/ValidateOneTimeLogin", data: $_GET[self::LOGIN_PARAMETER]);
 			} catch (TouchPointWP_Exception $e) {
 				return $e->toWpError();
 			}
diff --git a/src/TouchPoint-WP/Lookup.php b/src/TouchPoint-WP/Lookup.php
index d0382d95..442ee9fd 100644
--- a/src/TouchPoint-WP/Lookup.php
+++ b/src/TouchPoint-WP/Lookup.php
@@ -34,6 +34,7 @@ public static function api(array $uri): bool
 	{
 		try {
 			header('Content-Type: application/json');
+			header('Cache-Control: public, max-age=60'); // 1 minute, to allow duplicates to be cached easily.
 			echo json_encode(self::getLookup($uri['path'][2]));
 			exit;
 		} catch (TouchPointWP_Exception) {
@@ -60,7 +61,7 @@ public static function getLookup(string $path, bool $noCache = false): mixed
 			}
 		}
 
-		$v = TouchPointWP::instance()->api->get("/api/v1/Lookup/$path");
+		$v = TouchPointWP::instance()->api->get("v1/Lookup/$path");
 
 		if (isset($v['body'])) {
 			// assume body is already json
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index 15342c68..607f877a 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -69,13 +69,14 @@ public static function api(array $uri): bool
 			case "involvementsearch":
 				header('Content-Type: application/json');
 				if ( ! isset($_GET['s']) || trim($_GET['s']) === '') {
+					header('Cache-Control: public, max-age=' . YEAR_IN_SECONDS); // practically perpetual
 					echo json_encode([]);
 					exit;
 				}
-
 				$result = TouchPointWP::instance()->api->uGet('v1/Involvements', [
 					'terms' => $_GET['s']
 				]);
+				header('Cache-Control: public, max-age=60'); // 1 minute, to allow duplicates to be cached easily.
 				echo $result['body'];
 				exit;
 

From 33b46c46a1517b7dce986a0471c6fbc217293ea6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 15:05:39 -0400
Subject: [PATCH 362/423] people list filtering by gender

---
 blocks/people-list/index.js  | 86 ++++++++++++++++--------------------
 src/TouchPoint-WP/Person.php | 29 +++++++++---
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/blocks/people-list/index.js b/blocks/people-list/index.js
index 94624755..280519b0 100644
--- a/blocks/people-list/index.js
+++ b/blocks/people-list/index.js
@@ -5,11 +5,6 @@ import metadata from './block.json';
 import {__} from '@wordpress/i18n';
 import {generateUniqueId} from '../common.js';
 
-// Module-level controllers used as fallbacks when per-instance refs are not provided
-let invOptionsController = null;
-let lastPath = null;
-let previewController = null;
-
 /**
  * Every block starts by registering a new block type definition.
  *
@@ -30,14 +25,14 @@ wp.blocks.registerBlockType(metadata.name, {
             type: 'array',
             default: [],
         },
-        genders: {
+        gender: {
             type: 'integer',
             default: 0,
         }
     },
     edit: function (props) {
         const {attributes, setAttributes} = props;
-        const {invId} = attributes;
+        const {invId, gender, memTypes} = attributes;
         const blockProps = wp.blockEditor.useBlockProps();
         // Use a ref so we generate the id once and it remains stable across renders.
         const placeholderIdRef = wp.element.useRef(generateUniqueId());
@@ -50,17 +45,19 @@ wp.blocks.registerBlockType(metadata.name, {
         const [filteredInvOptions, setFilteredInvOptions] = wp.element.useState([]);
         const [memTypeOptions, setMemTypeOptions] = wp.element.useState([]);
         const [genderOptions, setGenderOptions] = wp.element.useState([]);
-        const [isLoading, setIsLoading] = wp.element.useState(true);
+        const [invOptionsAreLoading, setInvOptionsAreLoading] = wp.element.useState(true);
         // State to hold preview HTML so React renders it (avoids mutating DOM nodes React may replace).
         const [previewHtml, setPreviewHtml] = wp.element.useState(__("Loading Preview...", "TouchPoint-WP"));
 
+        let invOptionsController = null;
+
         const getInvOptionsFromApi = async (searchQ) => {
             if (invOptionsController) {
                 invOptionsController.abort(); // Abort previous API call
             }
 
-            invOptionsController = new AbortController(); // Create a new AbortController
-            setIsLoading(true);
+            invOptionsController = new AbortController();
+            setInvOptionsAreLoading(true);
             try {
                 const response = await fetch(`/touchpoint-api/admin/involvementsearch?s=${searchQ}`, {signal: invOptionsController.signal});
                 const data = await response.json();
@@ -72,11 +69,11 @@ wp.blocks.registerBlockType(metadata.name, {
                     }));
 
                 setFilteredInvOptions(formattedOptions);
-                setIsLoading(false);
+                setInvOptionsAreLoading(false);
             } catch (error) {
                 if (error.name !== 'AbortError') {
                     console.error('Error fetching post types:', error);
-                    setIsLoading(false);
+                    setInvOptionsAreLoading(false);
                 }
             }
         }
@@ -115,12 +112,17 @@ wp.blocks.registerBlockType(metadata.name, {
                 const data = await response.json();
 
                 // format options for SelectControl, with an "Any" option at the beginning
-                const formattedOptions = data
-                    .map((gender) => ({
-                        label: gender.description,
-                        value: gender.id,
+                const formattedOptions = data.map((g) => ({
+                        label: g.description,
+                        value: g.id,
                     }));
 
+                // remove "unknown" gender because it shares id with "any"
+                const unknownIndex = formattedOptions.findIndex(opt => opt.value === 0);
+                if (unknownIndex !== -1) {
+                    formattedOptions.splice(unknownIndex, 1);
+                }
+
                 formattedOptions.unshift({
                     label: __('Any', 'TouchPoint-WP'),
                     value: 0,
@@ -182,7 +184,7 @@ wp.blocks.registerBlockType(metadata.name, {
                                 // pass the newly selected value to the search so suggestions update immediately
                                 getInvOptionsFromApi(v);
                             }}
-                            isLoading={isLoading}
+                            isLoading={invOptionsAreLoading}
                             options={filteredInvOptions}
                             onFilterValueChange={getInvOptionsFromApi}
                             __next40pxDefaultSize={true}
@@ -194,8 +196,8 @@ wp.blocks.registerBlockType(metadata.name, {
                     <wp.components.SelectControl
                         multiple
                         label={__("Filter by Member Types", "TouchPoint-WP")}
-                        help={__("This option allows you to filter the people that are shown based on their member type in the selected involvement. By default, all members (not prospect or pending) are shown.", "TouchPoint-WP")}
-                        value={attributes.memTypes}
+                        help={__("This option allows you to filter the people that are shown based on their member type in the selected involvement. The default value, \"All Members\", includes all leaders, volunteers, and members. Other types like Inactive, Prospect, and Pending are not shown unless explicitly selected.", "TouchPoint-WP")}
+                        value={memTypes}
                         options={memTypeOptions}
                         onChange={(selected) => {
                             // selected may be an array of strings (from the UI) or numbers.
@@ -219,18 +221,11 @@ wp.blocks.registerBlockType(metadata.name, {
                     <wp.components.SelectControl
                         label={__("Filter by Gender", "TouchPoint-WP")}
                         help={__("This option allows you to filter the people that are shown based on gender. By default, gender filters are not applied.", "TouchPoint-WP")}
-                        value={attributes.genders}
+                        value={gender}
                         multiple={false}
                         options={genderOptions}
                         onChange={(selected) => {
-                            // normalize to an array of numbers
-                            const arr = Array.isArray(selected) ? selected.map(s => Number(s)) : [Number(selected)];
-                            // if "Any" (value 0) selected, store empty array to mean no filter
-                            if (arr.includes(0)) {
-                                setAttributes({genders: 0});
-                            } else {
-                                setAttributes({genders: arr});
-                            }
+                            setAttributes({gender: parseInt(selected)});
                         }}
                         __next40pxDefaultSize={true}
                         __nextHasNoMarginBottom={true}
@@ -244,7 +239,7 @@ wp.blocks.registerBlockType(metadata.name, {
     },
     save: function (props) {
         const {attributes} = props;
-        const {invId, genders, memTypes} = attributes;
+        const {invId, gender, memTypes} = attributes;
 
         const blockProps = wp.blockEditor.useBlockProps.save();
         let additionalClasses = blockProps.className || '';
@@ -252,8 +247,8 @@ wp.blocks.registerBlockType(metadata.name, {
         // remove is-selected from additionalClasses if present.  Replace any double-spaces with singles.
         additionalClasses = additionalClasses.replace('is-selected', '').replace(/\s+/g, ' ').trim();
 
-        const genderClause = genders === 0 ? "" : ` genders=${genders}`
-        const memTypesClause = memTypes !== [0] && memTypes.length > 0 ? ` memTypes=${memTypes.join(',')}` : "";
+        const genderClause = gender === 0 ? "" : ` gender="${gender}"`
+        const memTypesClause = memTypes !== [0] && memTypes.length > 0 ? ` memTypes="${memTypes.join(',')}"` : "";
 
         return `[TP-People class="${additionalClasses}" invId="${invId}"${genderClause}${memTypesClause}]`;
     },
@@ -274,31 +269,28 @@ function updateListContent(invId, attributes, blockProps, placeholderId, placeho
      }
 
     const memTypesParam = attributes.memTypes ? attributes.memTypes.join(',') : '';
-    const gendersParam = attributes.genders ? attributes.genders.join(',') : '';
+    const gendersParam = attributes.gender !== 0 ? attributes.gender : '' // only 1 is supported.
+
+    // remove is-selected from additionalClasses if present.  Replace any double-spaces with singles.
+    let cls = blockProps.className || '';
+    cls = cls.replace('is-selected', '').replace(/\s+/g, ' ').trim();
+    
     // encode className to avoid invalid URL characters
-    const cls = encodeURIComponent(blockProps.className || '');
+    cls = encodeURIComponent(cls);
     const newPath = `/touchpoint-api/person/list?invId=${encodeURIComponent(invId)}&memType=${encodeURIComponent(memTypesParam)}&gender=${encodeURIComponent(gendersParam)}&class=${cls}&context=block-preview`;
 
-     // Use per-instance refs when provided, otherwise fall back to module-level vars.
-     const lastPathHolder = lastPathRef && typeof lastPathRef === 'object' ? lastPathRef : {current: lastPath};
-     const previewControllerHolder = previewControllerRef && typeof previewControllerRef === 'object' ? previewControllerRef : {current: previewController};
-
-    if (lastPathHolder.current === newPath) {
+    if (lastPathRef.current === newPath) {
         return;
     }
 
-    if (previewControllerHolder.current) {
-        try { previewControllerHolder.current.abort(); } catch (e) { /* ignore */ }
+    if (previewControllerRef.current) {
+        try { previewControllerRef.current.abort(); } catch (e) { /* ignore */ }
     }
 
-    previewControllerHolder.current = new AbortController();
-    lastPathHolder.current = newPath;
-
-    // If using module-level fallback, keep module vars in sync
-    if (!previewControllerRef) previewController = previewControllerHolder.current;
-    if (!lastPathRef) lastPath = lastPathHolder.current;
+    previewControllerRef.current = new AbortController();
+    lastPathRef.current = newPath;
 
-    fetch(newPath, {signal: previewControllerHolder.current.signal})
+    fetch(newPath, {signal: previewControllerRef.current.signal})
         .then(response => {
             if (!response.ok) throw new Error('Network response was not ok');
             return response.text();
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 05499fca..3e0c8056 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -44,6 +44,7 @@
  * @property ?int          campus_term_id    The Campus term ID
  * @property-read ?WP_Term resCode  The ResCode taxonomy, if present
  * @property ?int          rescode_term_id   The ResCode term ID
+ * @property ?int          genderId   The Gender ID (from TouchPoint)
  */
 class Person extends WP_User implements api, JsonSerializable, module, updatesViaCron, actionButtons
 {
@@ -56,6 +57,7 @@ class Person extends WP_User implements api, JsonSerializable, module, updatesVi
 
 	public const META_PEOPLEID = TouchPointWP::SETTINGS_PREFIX . 'peopleId';
 	public const META_FAMILYID = TouchPointWP::SETTINGS_PREFIX . 'familyId';
+	public const META_GENDERID = TouchPointWP::SETTINGS_PREFIX . 'genderId';
 	public const META_CUSTOM_PREFIX = 'c_'; // setters and getters also insert standard setting prefix
 	public const META_INV_MEMBER_PREFIX = TouchPointWP::SETTINGS_PREFIX . "inv_mem_";
 	public const META_INV_ATTEND_PREFIX = TouchPointWP::SETTINGS_PREFIX . "inv_att_";
@@ -114,7 +116,8 @@ class Person extends WP_User implements api, JsonSerializable, module, updatesVi
 		'picture',
 		'familyId',
 		'campus_term_id',
-		'rescode_term_id'
+		'rescode_term_id',
+		'genderId'
 	];
 
 
@@ -398,14 +401,16 @@ public static function peopleListShortcode($params = [], string $content = ""):
 				'invid'         => null,
 				'withsubgroups' => false,
 				'btnclass'      => 'btn button',
-				'context'       => ''
+				'context'       => '',
+				'memtype'       => '',
+				'gender'        => ''
 			],
 			$params,
 			self::SHORTCODE_PEOPLE_LIST
 		);
 
 		/** @noinspection SpellCheckingInspection */
-		$params['withsubgroups'] = ! ! $params['withsubgroups'];
+		$params['withsubgroups'] = !!$params['withsubgroups'];
 
 		/** @noinspection SpellCheckingInspection */
 		$iid = intval($params['invid']);
@@ -465,12 +470,12 @@ public static function peopleListShortcode($params = [], string $content = ""):
 
 		/** @noinspection SpellCheckingInspection */
 		$memTypes = $params['memtype'] ?? [];
-		if (trim($memTypes) === "") {
-			$memTypes = [];
-		}
 		if (!is_array($memTypes)) {
 			$memTypes = explode(',', trim($memTypes));
 		}
+		if (in_array("", $memTypes)) { // remove "" if exists
+			$memTypes = array_diff($memTypes, [""]);
+		}
 		if (count($memTypes) === 0 || in_array("0", $memTypes)) {
 			// Leaders, Volunteers, Members: at10, at20, or at30.
 			$WP_User_queryParams['meta_query'][] = [
@@ -497,7 +502,16 @@ public static function peopleListShortcode($params = [], string $content = ""):
 
 		// Gender Filtering
 
-		// TODO DIR filter by involvement member type
+		$gender = $params['gender'] ?? null;
+		if ($gender === '' || $gender === 0) {
+			$gender = null;
+		}
+		if ($gender !== null) {
+			$WP_User_queryParams['meta_query'][] = [
+				'key' => self::META_GENDERID,
+				'value' => intval($gender)
+			];
+		}
 
 		// TODO DIR make sure involvement members have synced recently
 
@@ -994,6 +1008,7 @@ public static function updatePersonFromApiData($pData, bool $allowCreation, bool
 		$person->first_name   = $pData->GoesBy;
 		$person->last_name    = $pData->LastName;
 		$person->display_name = $pData->DisplayName;
+		$person->genderId     = $pData->GenderId;
 		if (count($pData->Emails) > 0) {
 			$person->user_email = $pData->Emails[0];
 		} else {

From 20aaefd3c41c3e7de3914c611683894327244833 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 15:26:20 -0400
Subject: [PATCH 363/423] Migrating gender lookup to use new API.

---
 src/TouchPoint-WP/TouchPointWP.php | 61 ++++--------------------------
 1 file changed, 7 insertions(+), 54 deletions(-)

diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 81c4fb3d..196b2f77 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1612,8 +1612,7 @@ public static function orderHierarchicalTerms(array $terms, bool $noChildlessPar
 		// Remove parents that have no children
 		if ($noChildlessParents) {
 			foreach ($lineage[0] as $i => $term) {
-				if ( ! isset($lineage[$term->term_id])) {
-					/** @noinspection PhpIllegalArrayKeyTypeInspection -- there isn't an error here. */
+				if (!isset($lineage[$term->term_id])) {
 					unset($lineage[0][$i]);
 				}
 			}
@@ -1969,58 +1968,12 @@ private function updateResCodes()
 	 * @returns object[]
 	 */
 	public function getGenders(): array
-	{
-		$gObj = $this->settings->get('meta_genders');
-
-		$needsUpdate = false;
-		if ($gObj === false || $gObj === null) {
-			$needsUpdate = true;
-		} else {
-			$gObj = json_decode($gObj);
-			if (strtotime($gObj->_updated) < time() - self::CACHE_TTL || ! is_array($gObj->genders)) {
-				$needsUpdate = true;
-			}
-		}
-
-		// Get update if needed.
-		if ($needsUpdate) {
-			$update = $this->updateGenders();
-			if ($update !== false) {
-				$gObj = $update;
-			}
-		}
-
-		if ($gObj === false) {
-			return [];
-		}
-
-		return $gObj->genders;
-	}
-
-
-	/**
-	 * @return false|object Update the genders if they're stale.
-	 */
-	private function updateGenders()
 	{
 		try {
-			$data = $this->api->pyGet('Genders');
+			return Lookup::getLookup('Genders');
 		} catch (TouchPointWP_Exception) {
-			return false;
-		}
-
-		if ( ! is_array($data->genders)) {
-			return false;
+			return [];
 		}
-
-		$obj = (object)[
-			'_updated' => date('c'),
-			'genders'  => $data->genders
-		];
-
-		$this->settings->set("meta_genders", json_encode($obj));
-
-		return $obj;
 	}
 
 	/**
@@ -2446,7 +2399,7 @@ public function extGet(string $url, ?array $parameters = null): array
 			$parameters = (array)$parameters;
 		}
 
-		$r = $this->getHttpClient()->request(
+		$r = $this->getExtHttpClient()->request(
 			$url . "?" . http_build_query($parameters),
 			[
 				'method' => 'GET'
@@ -2515,11 +2468,11 @@ public function doPersonQuery(array $q, bool $verbose = false, int $timeout = 5)
 	}
 
 	/**
-	 * @deprecated 0.0.95 Use Api version instead.
+	 * Gets a WP_HTTP object intended for external/third-party API access.
 	 *
-	 * @return WP_Http|null
+	 * @return WP_Http
 	 */
-	private function getHttpClient(): ?WP_Http
+	private function getExtHttpClient(): WP_Http
 	{
 		if ($this->httpClient === null) {
 			$this->httpClient = new WP_Http();

From b01b327fb85753ddc7c5e90e99c833ea0620206f Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 15:30:29 -0400
Subject: [PATCH 364/423] Migrating gender lookup to use new API.

---
 src/TouchPoint-WP/Involvement.php  | 2 +-
 src/TouchPoint-WP/Lookup.php       | 4 ++--
 src/TouchPoint-WP/TouchPointWP.php | 6 ++++++
 src/python/WebApi.py               | 7 -------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index c6e84a2e..bf098349 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1854,7 +1854,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po
 					continue;
 				}
 
-				$name    = $g->name;
+				$name    = $g->description;
 				$id      = $g->id;
 				$content .= "<option value=\"$id\">$name</option>";
 			}
diff --git a/src/TouchPoint-WP/Lookup.php b/src/TouchPoint-WP/Lookup.php
index 442ee9fd..bdd8ee13 100644
--- a/src/TouchPoint-WP/Lookup.php
+++ b/src/TouchPoint-WP/Lookup.php
@@ -56,14 +56,14 @@ public static function getLookup(string $path, bool $noCache = false): mixed
 		if (!$noCache) {
 			// check transients
 			$v = get_transient($cacheKey);
-			if ($v !== false) {
+			if ($v !== false && $v !== "") {
 				return json_decode($v);
 			}
 		}
 
 		$v = TouchPointWP::instance()->api->get("v1/Lookup/$path");
 
-		if (isset($v['body'])) {
+		if (isset($v['body']) && $v['body'] !== '') {
 			// assume body is already json
 			set_transient($cacheKey, $v['body'], self::TTL);
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 196b2f77..4ff2ec9c 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -1573,6 +1573,9 @@ public static function useTribeCalendarPro(): bool
 	 */
 	public static function useTribeCalendar(): bool
 	{
+		if ( ! function_exists('is_plugin_active')) {
+			require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+		}
 		return self::useTribeCalendarPro() || is_plugin_active('the-events-calendar/the-events-calendar.php');
 	}
 
@@ -1965,6 +1968,9 @@ private function updateResCodes()
 	/**
 	 * Returns an array of objects that correspond to the genders.  Each Gender has a name and an id.
 	 *
+	 * @since 0.0.0 Added
+	 * @since 0.0.96 'Description' is now the human-readable version of the gender name.
+	 *
 	 * @returns object[]
 	 */
 	public function getGenders(): array
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 25a57a13..7ae00712 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -117,13 +117,6 @@ def get_person_info_for_sync(person_obj):
     Data.Title = "All Campuses"
     Data.campuses = q.QuerySql(rcSql, {})
 
-if "Genders" in Data.a:
-    apiCalled = True
-    # noinspection SqlResolve
-    rcSql = '''SELECT Id, Code, Description as Name FROM lookup.Gender'''
-    Data.Title = "All Genders"
-    Data.genders = q.QuerySql(rcSql, {})
-
 if "Keywords" in Data.a:
     apiCalled = True
     # noinspection SqlResolve

From 775921ec8779edc2edcbf4574a5180f7364e34dc Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 17:56:18 -0400
Subject: [PATCH 365/423] Resolving an issue where CSS would sometimes be
 included when it shouldn't be.  Version bump. i18n and docs.

---
 blocks/inv-list/block.json                    |   2 +-
 blocks/inv-list/index.js                      |   6 +-
 blocks/people-list/block.json                 |   2 +-
 blocks/people-list/index.js                   |   9 +-
 composer.json                                 |   2 +-
 docs                                          |   2 +-
 i18n/TouchPoint-WP-es_ES.po                   | 458 +++++++++++-------
 i18n/TouchPoint-WP.pot                        | 458 +++++++++++-------
 package.json                                  |   2 +-
 src/TouchPoint-WP/Blocks/BlocksController.php |  41 +-
 src/TouchPoint-WP/Person.php                  |  39 +-
 src/TouchPoint-WP/TouchPointWP.php            |  77 ++-
 src/python/WebApi.py                          |  23 +-
 touchpoint-wp.php                             |   2 +-
 14 files changed, 699 insertions(+), 424 deletions(-)

diff --git a/blocks/inv-list/block.json b/blocks/inv-list/block.json
index d956eed4..f4b087be 100644
--- a/blocks/inv-list/block.json
+++ b/blocks/inv-list/block.json
@@ -2,7 +2,7 @@
   "$schema": "https://schemas.wp.org/trunk/block.json",
   "apiVersion": 3,
   "name": "touchpoint-wp/inv-list",
-  "version": "0.0.96",
+  "version": "0.0.97",
   "title": "Involvement List",
   "category": "widgets",
   "icon": "grid-view",
diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index f23df5e2..8c65be51 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -107,10 +107,8 @@ wp.blocks.registerBlockType( metadata.name, {
 		}, [postType, division, blockProps.className, placeholderId]);
 
         return (
-                <div {...blockProps} >
-                    <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/block-preview-style.css?ver=0.0.96" />
-                    <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/actions-style.css?ver=0.0.96" />
-                    <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/partials-template-style.css?ver=0.0.96" />
+            <div {...blockProps} >
+                <link rel={"stylesheet"} href={"/touchpoint-api/blocks/block-editor-style"} />
                 <wp.blockEditor.InspectorControls>
                     <wp.components.PanelBody title={__("Settings", "TouchPoint-WP")}>
                         {postTypeOptions.length === 0 ? (
diff --git a/blocks/people-list/block.json b/blocks/people-list/block.json
index 88790232..14c6c22a 100644
--- a/blocks/people-list/block.json
+++ b/blocks/people-list/block.json
@@ -2,7 +2,7 @@
   "$schema": "https://schemas.wp.org/trunk/block.json",
   "apiVersion": 3,
   "name": "touchpoint-wp/people-list",
-  "version": "0.0.96",
+  "version": "0.0.97",
   "title": "People List",
   "category": "widgets",
   "icon": "groups",
diff --git a/blocks/people-list/index.js b/blocks/people-list/index.js
index 280519b0..10c18c6f 100644
--- a/blocks/people-list/index.js
+++ b/blocks/people-list/index.js
@@ -169,10 +169,7 @@ wp.blocks.registerBlockType(metadata.name, {
 
         return (
             <div {...blockProps}>
-                {/* Ensure preview styles are available inside the editor canvas/preview. */}
-                <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/block-preview-style.css?ver=0.0.96" />
-                <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/actions-style.css?ver=0.0.96" />
-                <link rel="stylesheet" href="/wp-content/plugins/touchpoint-wp/assets/template/partials-template-style.css?ver=0.0.96" />
+                <link rel={"stylesheet"} href={"/touchpoint-api/blocks/block-editor-style"} />
                 <wp.blockEditor.InspectorControls>
                     <wp.components.PanelBody title={__('Settings', 'TouchPoint-WP')}>
                         <wp.components.ComboboxControl
@@ -196,7 +193,7 @@ wp.blocks.registerBlockType(metadata.name, {
                     <wp.components.SelectControl
                         multiple
                         label={__("Filter by Member Types", "TouchPoint-WP")}
-                        help={__("This option allows you to filter the people that are shown based on their member type in the selected involvement. The default value, \"All Members\", includes all leaders, volunteers, and members. Other types like Inactive, Prospect, and Pending are not shown unless explicitly selected.", "TouchPoint-WP")}
+                        help={__("This option allows you to filter the people that are shown based on their Member Type in the selected involvement. The default value, \"All Members\", includes all leaders, volunteers, and members. Other types like Inactive, Prospect, and Pending are not shown unless explicitly selected.", "TouchPoint-WP")}
                         value={memTypes}
                         options={memTypeOptions}
                         onChange={(selected) => {
@@ -277,7 +274,7 @@ function updateListContent(invId, attributes, blockProps, placeholderId, placeho
     
     // encode className to avoid invalid URL characters
     cls = encodeURIComponent(cls);
-    const newPath = `/touchpoint-api/person/list?invId=${encodeURIComponent(invId)}&memType=${encodeURIComponent(memTypesParam)}&gender=${encodeURIComponent(gendersParam)}&class=${cls}&context=block-preview`;
+    const newPath = `/touchpoint-api/person/list?invId=${encodeURIComponent(invId)}&memTypes=${encodeURIComponent(memTypesParam)}&gender=${encodeURIComponent(gendersParam)}&class=${cls}&context=block-preview`;
 
     if (lastPathRef.current === newPath) {
         return;
diff --git a/composer.json b/composer.json
index b0b86438..98c5a460 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "license": "AGPL-3.0-or-later",
   "type": "wordpress-plugin",
-  "version": "0.0.96",
+  "version": "0.0.97",
   "keywords": [
     "wordpress",
     "wp",
diff --git a/docs b/docs
index 29be1973..b4ad7e6b 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 29be1973968a5d37ad6b36b194680ee98e96a27f
+Subproject commit b4ad7e6b6fe8891dd6f62de7aa86c69c60185139
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index bd5698e2..fcc29fea 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -59,122 +59,122 @@ msgstr "Slug"
 msgid "Divisions to Import"
 msgstr "Divisiones a Importar"
 
-#: src/templates/admin/invKoForm.php:84
+#: src/templates/admin/invKoForm.php:86
 msgid "Import Hierarchically (Parent-Child Relationships)"
 msgstr "Importar jerárquicamente (relaciones padre-hijo)"
 
-#: src/templates/admin/invKoForm.php:123
+#: src/templates/admin/invKoForm.php:125
 msgid "Use Geographic Location"
 msgstr "Usar ubicación geográfica"
 
-#: src/templates/admin/invKoForm.php:129
+#: src/templates/admin/invKoForm.php:131
 msgid "Exclude Involvements if"
 msgstr "Excluir participaciones si"
 
-#: src/templates/admin/invKoForm.php:133
+#: src/templates/admin/invKoForm.php:135
 msgid "Involvement is Closed"
 msgstr "La participación está cerrada"
 
-#: src/templates/admin/invKoForm.php:137
+#: src/templates/admin/invKoForm.php:139
 msgid "Involvement is a Child Involvement"
 msgstr "La participación es una participación infantil"
 
-#: src/templates/admin/invKoForm.php:159
+#: src/templates/admin/invKoForm.php:161
 msgid "Leader Member Types"
 msgstr "Tipos de miembros de líder"
 
-#: src/templates/admin/invKoForm.php:63
-#: src/templates/admin/invKoForm.php:162
-#: src/templates/admin/invKoForm.php:178
-#: src/templates/admin/invKoForm.php:332
+#: src/templates/admin/invKoForm.php:65
+#: src/templates/admin/invKoForm.php:164
+#: src/templates/admin/invKoForm.php:180
+#: src/templates/admin/invKoForm.php:334
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:803
+#: src/TouchPoint-WP/Meeting.php:800
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:195
 #: assets/js/base-defer.js:1113
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/templates/admin/invKoForm.php:174
+#: src/templates/admin/invKoForm.php:176
 msgid "Host Member Types"
 msgstr "Tipos de miembros anfitriones"
 
-#: src/templates/admin/invKoForm.php:190
+#: src/templates/admin/invKoForm.php:192
 msgid "Default Grouping"
 msgstr "Agrupación Predeterminada"
 
-#: src/templates/admin/invKoForm.php:194
+#: src/templates/admin/invKoForm.php:196
 msgid "No Grouping"
 msgstr "Sin agrupar"
 
-#: src/templates/admin/invKoForm.php:195
+#: src/templates/admin/invKoForm.php:197
 msgid "Upcoming / Current"
 msgstr "Próximo / Actual"
 
-#: src/templates/admin/invKoForm.php:196
+#: src/templates/admin/invKoForm.php:198
 msgid "Current / Upcoming"
 msgstr "Actual / Próximo"
 
-#: src/templates/admin/invKoForm.php:204
+#: src/templates/admin/invKoForm.php:206
 msgid "Default Filters"
 msgstr "Filtros predeterminados"
 
-#: src/templates/admin/invKoForm.php:236
+#: src/templates/admin/invKoForm.php:238
 msgid "Gender"
 msgstr "Género"
 
-#: src/templates/admin/invKoForm.php:250
-#: src/TouchPoint-WP/Involvement.php:1914
-#: src/TouchPoint-WP/Taxonomies.php:743
+#: src/templates/admin/invKoForm.php:252
+#: src/TouchPoint-WP/Involvement.php:1917
+#: src/TouchPoint-WP/Taxonomies.php:755
 msgid "Weekday"
 msgstr "Día laborable"
 
-#: src/templates/admin/invKoForm.php:254
-#: src/TouchPoint-WP/Involvement.php:1940
-#: src/TouchPoint-WP/Taxonomies.php:801
+#: src/templates/admin/invKoForm.php:256
+#: src/TouchPoint-WP/Involvement.php:1943
+#: src/TouchPoint-WP/Taxonomies.php:821
 msgid "Time of Day"
 msgstr "Hora del día"
 
-#: src/templates/admin/invKoForm.php:258
+#: src/templates/admin/invKoForm.php:260
 msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
-#: src/templates/admin/invKoForm.php:262
-#: src/TouchPoint-WP/Taxonomies.php:830
+#: src/templates/admin/invKoForm.php:264
+#: src/TouchPoint-WP/Taxonomies.php:854
 msgid "Age Group"
 msgstr "Grupo de edad"
 
-#: src/templates/admin/invKoForm.php:267
+#: src/templates/admin/invKoForm.php:269
 msgid "Task Owner"
 msgstr "Propietario de la tarea"
 
-#: src/templates/admin/invKoForm.php:274
+#: src/templates/admin/invKoForm.php:276
 msgid "Contact Leader Task Keywords"
 msgstr "Palabras clave de la tarea del líder de contacto"
 
-#: src/templates/admin/invKoForm.php:285
+#: src/templates/admin/invKoForm.php:287
 msgid "Join Task Keywords"
 msgstr "Unirse a las palabras clave de la tarea"
 
-#: src/templates/admin/invKoForm.php:301
+#: src/templates/admin/invKoForm.php:303
 msgid "Add Involvement Post Type"
 msgstr "Agregar tipo de publicación de participación"
 
-#: src/templates/admin/invKoForm.php:308
+#: src/templates/admin/invKoForm.php:310
 msgid "Small Group"
 msgstr "Grupo Pequeño"
 
-#: src/templates/admin/invKoForm.php:309
+#: src/templates/admin/invKoForm.php:311
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:456
+#: src/templates/admin/invKoForm.php:458
 msgid "Select..."
 msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2203
+#: src/TouchPoint-WP/Involvement.php:2206
 #, php-format
 msgid "No %s Found."
 msgstr "No se encontraron %s"
@@ -185,8 +185,8 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#: src/TouchPoint-WP/Auth.php:398
-#: src/TouchPoint-WP/Auth.php:406
+#: src/TouchPoint-WP/Auth.php:399
+#: src/TouchPoint-WP/Auth.php:407
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
@@ -195,151 +195,153 @@ msgid "Recurring"
 msgstr "Periódico"
 
 #: src/TouchPoint-WP/EventsCalendar.php:80
-#: src/TouchPoint-WP/EventsCalendar.php:297
+#: src/TouchPoint-WP/EventsCalendar.php:305
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:515
+#: src/TouchPoint-WP/Involvement.php:512
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:520
+#: src/TouchPoint-WP/Involvement.php:517
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:527
+#: src/TouchPoint-WP/Involvement.php:524
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:533
+#: src/TouchPoint-WP/Involvement.php:530
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1789
-#: src/TouchPoint-WP/Partner.php:842
+#: src/TouchPoint-WP/Involvement.php:1792
+#: src/TouchPoint-WP/Partner.php:840
+#: blocks/people-list/index.js:127
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1997
-#: src/TouchPoint-WP/Partner.php:866
+#: src/TouchPoint-WP/Involvement.php:2000
+#: src/TouchPoint-WP/Partner.php:864
 #, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3847
+#: src/TouchPoint-WP/Involvement.php:3854
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3850
+#: src/TouchPoint-WP/Involvement.php:3857
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3929
+#: src/TouchPoint-WP/Involvement.php:3936
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:3999
-#: src/TouchPoint-WP/Involvement.php:4058
+#: src/TouchPoint-WP/Involvement.php:4006
+#: src/TouchPoint-WP/Involvement.php:4065
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:4005
+#: src/TouchPoint-WP/Involvement.php:4012
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:4009
+#: src/TouchPoint-WP/Involvement.php:4016
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:4014
+#: src/TouchPoint-WP/Involvement.php:4021
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:4017
+#: src/TouchPoint-WP/Involvement.php:4024
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:4020
+#: src/TouchPoint-WP/Involvement.php:4027
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:4023
+#: src/TouchPoint-WP/Involvement.php:4030
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:4049
+#: src/TouchPoint-WP/Involvement.php:4056
 #: assets/js/base-defer.js:1004
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3946
-#: src/TouchPoint-WP/Partner.php:1353
+#: src/TouchPoint-WP/Involvement.php:3953
+#: src/TouchPoint-WP/Partner.php:1351
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:873
+#: src/TouchPoint-WP/Partner.php:871
 #, php-format
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1292
+#: src/TouchPoint-WP/Partner.php:1290
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
-#: src/TouchPoint-WP/Person.php:148
+#: src/TouchPoint-WP/Person.php:151
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr "No se proporcionó una identificación de usuario de WordPress para inicializar un objeto de persona."
 
-#: src/TouchPoint-WP/Person.php:640
+#: src/TouchPoint-WP/Person.php:707
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1196
+#: src/TouchPoint-WP/Person.php:1264
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:802
-#: src/TouchPoint-WP/Meeting.php:823
+#: src/TouchPoint-WP/Meeting.php:799
+#: src/TouchPoint-WP/Meeting.php:820
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2146
+#: src/TouchPoint-WP/TouchPointWP.php:2189
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2203
+#: src/TouchPoint-WP/TouchPointWP.php:2246
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2206
+#: src/TouchPoint-WP/TouchPointWP.php:2249
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2209
+#: src/TouchPoint-WP/TouchPointWP.php:2252
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2214
-#: src/TouchPoint-WP/TouchPointWP.php:2215
+#: src/TouchPoint-WP/TouchPointWP.php:2257
+#: src/TouchPoint-WP/TouchPointWP.php:2258
 msgid "Current Value"
 msgstr "Valor actual"
 
-#: src/TouchPoint-WP/Api.php:98
-#: src/TouchPoint-WP/Api.php:353
-#: src/TouchPoint-WP/Api.php:486
+#: src/TouchPoint-WP/Api.php:107
+#: src/TouchPoint-WP/Api.php:188
+#: src/TouchPoint-WP/Api.php:450
+#: src/TouchPoint-WP/Api.php:584
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/Api.php:112
-#: src/TouchPoint-WP/Api.php:160
-#: src/TouchPoint-WP/Api.php:429
+#: src/TouchPoint-WP/Api.php:204
+#: src/TouchPoint-WP/Api.php:251
+#: src/TouchPoint-WP/Api.php:526
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2429
+#: src/TouchPoint-WP/TouchPointWP.php:2472
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -783,7 +785,8 @@ msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
 #: src/TouchPoint-WP/Settings.php:1451
-#: blocks/inv-list/index.js:127
+#: blocks/inv-list/index.js:113
+#: blocks/people-list/index.js:174
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -799,7 +802,7 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1490
+#: src/TouchPoint-WP/Person.php:1558
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:20
 msgid "and"
@@ -963,7 +966,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/Api.php:550
+#: src/TouchPoint-WP/Api.php:656
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1023,16 +1026,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1962
-#: src/TouchPoint-WP/Taxonomies.php:862
+#: src/TouchPoint-WP/Involvement.php:1965
+#: src/TouchPoint-WP/Taxonomies.php:890
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1975
+#: src/TouchPoint-WP/Involvement.php:1978
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1846
+#: src/TouchPoint-WP/Involvement.php:1849
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1106,15 +1109,15 @@ msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/templates/admin/invKoForm.php:141
+#: src/templates/admin/invKoForm.php:143
 msgid "Based on Involvement setting in TouchPoint"
 msgstr "Basado en la configuración de participación en TouchPoint"
 
-#: src/templates/admin/invKoForm.php:141
+#: src/templates/admin/invKoForm.php:143
 msgid "Involvement does not meet weekly"
 msgstr "La participación no se reúne semanalmente"
 
-#: src/templates/admin/invKoForm.php:145
+#: src/templates/admin/invKoForm.php:147
 msgid "Involvement does not have a Schedule"
 msgstr "La participación no tiene horario"
 
@@ -1194,34 +1197,34 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1963
+#: src/TouchPoint-WP/Involvement.php:1966
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1964
+#: src/TouchPoint-WP/Involvement.php:1967
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:2005
-#: src/TouchPoint-WP/Partner.php:882
+#: src/TouchPoint-WP/Involvement.php:2008
+#: src/TouchPoint-WP/Partner.php:880
 #, php-format
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:2008
-#: src/TouchPoint-WP/Partner.php:885
+#: src/TouchPoint-WP/Involvement.php:2011
+#: src/TouchPoint-WP/Partner.php:883
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1015
-#: src/TouchPoint-WP/Involvement.php:1047
-#: src/TouchPoint-WP/Involvement.php:1140
-#: src/TouchPoint-WP/Involvement.php:1164
+#: src/TouchPoint-WP/Involvement.php:1018
+#: src/TouchPoint-WP/Involvement.php:1050
+#: src/TouchPoint-WP/Involvement.php:1143
+#: src/TouchPoint-WP/Involvement.php:1167
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -1230,44 +1233,44 @@ msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1056
+#: src/TouchPoint-WP/Involvement.php:1059
 #, php-format
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1065
+#: src/TouchPoint-WP/Involvement.php:1068
 #, php-format
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1074
+#: src/TouchPoint-WP/Involvement.php:1077
 #, php-format
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1082
+#: src/TouchPoint-WP/Involvement.php:1085
 #, php-format
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1090
+#: src/TouchPoint-WP/Involvement.php:1093
 #, php-format
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1098
+#: src/TouchPoint-WP/Involvement.php:1101
 #, php-format
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3868
+#: src/TouchPoint-WP/Involvement.php:3875
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -1277,43 +1280,43 @@ msgstr "%2.1fmi"
 msgid "The username of a user account in TouchPoint with API permissions.  It is strongly recommended that you create a separate person/user for this purpose, rather than using a staff member's account."
 msgstr "El nombre de usuario de una cuenta de usuario en TouchPoint con permisos API. Se recomienda encarecidamente que cree una persona/usuario independiente para este fin, en lugar de utilizar la cuenta de un miembro del personal."
 
-#: src/templates/admin/invKoForm.php:149
+#: src/templates/admin/invKoForm.php:151
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr "La participación tiene un tipo de registro de \"No Online Registration\""
 
-#: src/templates/admin/invKoForm.php:153
+#: src/templates/admin/invKoForm.php:155
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2144
+#: src/TouchPoint-WP/Involvement.php:2147
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2154
+#: src/TouchPoint-WP/Involvement.php:2157
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2173
+#: src/TouchPoint-WP/Involvement.php:2176
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:729
-#: src/TouchPoint-WP/TouchPointWP.php:1115
+#: src/TouchPoint-WP/Meeting.php:726
+#: src/TouchPoint-WP/TouchPointWP.php:1153
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:757
-#: src/TouchPoint-WP/TouchPointWP.php:374
+#: src/TouchPoint-WP/Meeting.php:754
+#: src/TouchPoint-WP/TouchPointWP.php:373
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:767
-#: src/TouchPoint-WP/TouchPointWP.php:383
+#: src/TouchPoint-WP/Meeting.php:764
+#: src/TouchPoint-WP/TouchPointWP.php:382
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:4166
-#: src/TouchPoint-WP/Involvement.php:4271
+#: src/TouchPoint-WP/Involvement.php:4187
+#: src/TouchPoint-WP/Involvement.php:4292
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1325,61 +1328,61 @@ msgstr "Habilitar Campus"
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/Taxonomies.php:680
+#: src/TouchPoint-WP/Taxonomies.php:684
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:711
+#: src/TouchPoint-WP/Taxonomies.php:719
 #, php-format
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/Taxonomies.php:742
+#: src/TouchPoint-WP/Taxonomies.php:754
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:743
+#: src/TouchPoint-WP/Taxonomies.php:755
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/Taxonomies.php:769
+#: src/TouchPoint-WP/Taxonomies.php:785
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/Taxonomies.php:773
+#: src/TouchPoint-WP/Taxonomies.php:789
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/Taxonomies.php:773
+#: src/TouchPoint-WP/Taxonomies.php:789
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/Taxonomies.php:796
+#: src/TouchPoint-WP/Taxonomies.php:816
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:802
+#: src/TouchPoint-WP/Taxonomies.php:822
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/Taxonomies.php:828
+#: src/TouchPoint-WP/Taxonomies.php:852
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/Taxonomies.php:831
+#: src/TouchPoint-WP/Taxonomies.php:855
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/Taxonomies.php:857
+#: src/TouchPoint-WP/Taxonomies.php:885
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/Taxonomies.php:863
+#: src/TouchPoint-WP/Taxonomies.php:891
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:896
+#: src/TouchPoint-WP/Taxonomies.php:928
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1437,23 +1440,23 @@ msgstr "Informe de TouchPoint"
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:278
+#: src/TouchPoint-WP/TouchPointWP.php:277
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1889
+#: src/TouchPoint-WP/Involvement.php:1892
 msgid "Language"
 msgstr "Idioma"
 
-#: src/templates/admin/invKoForm.php:91
+#: src/templates/admin/invKoForm.php:93
 msgid "Import Images from TouchPoint"
 msgstr "Importar imágenes desde TouchPoint"
 
-#: src/templates/admin/invKoForm.php:95
+#: src/templates/admin/invKoForm.php:97
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1497
+#: src/TouchPoint-WP/Person.php:1565
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1466,7 +1469,7 @@ msgstr "Calendarios de Reuniones"
 msgid "Import Meetings from TouchPoint to a calendar on your website."
 msgstr "Importe reuniones desde TouchPoint a un calendario en su sitio web."
 
-#: src/templates/admin/invKoForm.php:102
+#: src/templates/admin/invKoForm.php:104
 msgid "Import All Meetings to Calendar"
 msgstr "Importe reuniones a los calendarios"
 
@@ -1478,8 +1481,8 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4258
-#: src/TouchPoint-WP/Person.php:1879
+#: src/TouchPoint-WP/Involvement.php:4279
+#: src/TouchPoint-WP/Person.php:1951
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1499,26 +1502,26 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1734
+#: src/TouchPoint-WP/Person.php:1802
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4248
-#: src/TouchPoint-WP/Person.php:1896
+#: src/TouchPoint-WP/Involvement.php:4269
+#: src/TouchPoint-WP/Person.php:1968
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1636
+#: src/TouchPoint-WP/Person.php:1704
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:292
+#: src/TouchPoint-WP/Meeting.php:289
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr "Eventos"
 
-#: src/TouchPoint-WP/Meeting.php:293
+#: src/TouchPoint-WP/Meeting.php:290
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr "Evento"
@@ -1575,7 +1578,7 @@ msgstr "hoy"
 msgid "Tomorrow"
 msgstr "mañana"
 
-#: src/templates/admin/invKoForm.php:419
+#: src/templates/admin/invKoForm.php:421
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
@@ -1583,11 +1586,11 @@ msgstr "(persona nombrada)"
 msgid "Expand"
 msgstr "Ampliar"
 
-#: src/TouchPoint-WP/Meeting.php:606
+#: src/TouchPoint-WP/Meeting.php:603
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:607
+#: src/TouchPoint-WP/Meeting.php:604
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1626,23 +1629,23 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3958
+#: src/TouchPoint-WP/Involvement.php:3965
 #, php-format
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
 
-#: src/TouchPoint-WP/Meeting.php:467
+#: src/TouchPoint-WP/Meeting.php:464
 msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:541
+#: src/TouchPoint-WP/Meeting.php:538
 #, php-format
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1209
+#: src/TouchPoint-WP/Person.php:1277
 #, php-format
 msgid "Person in %s"
 msgstr "Persona en %s"
@@ -1703,23 +1706,23 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:608
+#: src/TouchPoint-WP/Meeting.php:605
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
 
-#: src/TouchPoint-WP/Involvement.php:143
+#: src/TouchPoint-WP/Involvement.php:140
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1018
-#: src/TouchPoint-WP/Involvement.php:1041
+#: src/TouchPoint-WP/Involvement.php:1021
+#: src/TouchPoint-WP/Involvement.php:1044
 #, php-format
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
 
-#: src/TouchPoint-WP/Meeting.php:107
+#: src/TouchPoint-WP/Meeting.php:104
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
@@ -1823,25 +1826,25 @@ msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Mod
 msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/templates/involvement-single.php:49
+#: src/templates/involvement-single.php:50
 #, php-format
 msgid "This %s has been Cancelled."
 msgstr "Este %s ha sido Cancelado."
 
-#: src/templates/admin/invKoForm.php:210
-#: blocks/inv-list/index.js:143
+#: src/templates/admin/invKoForm.php:212
+#: blocks/inv-list/index.js:130
 msgid "Division"
 msgstr "Division"
 
-#: src/templates/admin/invKoForm.php:217
+#: src/templates/admin/invKoForm.php:219
 msgid "Resident Code"
 msgstr "Código de Residente"
 
-#: src/templates/admin/invKoForm.php:224
+#: src/templates/admin/invKoForm.php:226
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1042
+#: src/TouchPoint-WP/Involvement.php:1045
 msgid "All Day"
 msgstr "todo el dia"
 
@@ -1858,15 +1861,11 @@ msgstr "Clave API de ipapi.co"
 msgid "Optional. Allows for geolocation of user IP addresses.  This generally will work without a key, but may be rate limited."
 msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
 
-#: src/templates/admin/invKoForm.php:60
-msgid "Import Campuses"
-msgstr "Importar Campus"
-
-#: src/templates/admin/invKoForm.php:67
+#: src/templates/admin/invKoForm.php:69
 msgid "All Campuses"
 msgstr "Todos los campus"
 
-#: src/templates/admin/invKoForm.php:71
+#: src/templates/admin/invKoForm.php:73
 msgid "(No Campus)"
 msgstr "(Sin campus)"
 
@@ -1905,7 +1904,7 @@ msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
-#: src/TouchPoint-WP/Auth.php:437
+#: src/TouchPoint-WP/Auth.php:438
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
@@ -1917,48 +1916,48 @@ msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2405
+#: src/TouchPoint-WP/TouchPointWP.php:2448
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
-#: src/templates/admin/invKoForm.php:109
+#: src/templates/admin/invKoForm.php:111
 #: src/TouchPoint-WP/Settings.php:979
 msgid "Collect Meetings for Larger Events"
 msgstr "Recopilar reuniones para eventos más grandes"
 
-#: src/templates/admin/invKoForm.php:113
+#: src/templates/admin/invKoForm.php:115
 #: src/TouchPoint-WP/Settings.php:983
 msgid "No Collecting"
 msgstr "sin recoger"
 
-#: src/templates/admin/invKoForm.php:114
+#: src/templates/admin/invKoForm.php:116
 #: src/TouchPoint-WP/Settings.php:984
 msgid "Collect Meetings only from Involvements without Schedules"
 msgstr "Recopilar reuniones solo de participaciones sin horarios"
 
-#: src/templates/admin/invKoForm.php:115
+#: src/templates/admin/invKoForm.php:117
 #: src/TouchPoint-WP/Settings.php:988
 msgid "Collect Meetings for all Involvements"
 msgstr "Recopilar reuniones solo de participaciones sin horarios"
 
-#: src/templates/admin/invKoForm.php:117
+#: src/templates/admin/invKoForm.php:119
 #: src/TouchPoint-WP/Settings.php:980
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
 
-#: blocks/inv-list/index.js:25
+#: blocks/inv-list/index.js:14
 msgid "Involvement List"
 msgstr "Lista de Participaciones"
 
-#: blocks/inv-list/index.js:27
+#: blocks/inv-list/index.js:16
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
-#: blocks/inv-list/index.js:81
+#: blocks/inv-list/index.js:75
 msgid "All"
 msgstr "Todos"
 
-#: blocks/inv-list/index.js:135
+#: blocks/inv-list/index.js:121
 msgid "Post Type"
 msgstr "tipo de publicación"
 
@@ -1972,14 +1971,101 @@ msgctxt "block description"
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
-#: src/TouchPoint-WP/Involvement.php:1680
+#: src/TouchPoint-WP/Involvement.php:1683
+#: src/TouchPoint-WP/Person.php:2001
 msgid "None right now."
 msgstr "Nada por ahora"
 
-#: blocks/inv-list/index.js:130
+#: blocks/inv-list/index.js:116
 msgid "To use this block, import Involvements in the TouchPoint-WP settings."
 msgstr "Para utilizar este bloque, importe Involvements en la configuración de TouchPoint-WP."
 
-#: blocks/inv-list/index.js:154
+#: blocks/inv-list/index.js:143
+#: blocks/people-list/index.js:231
 msgid "Preview Only"
 msgstr "Solo vista previa"
+
+#: src/templates/admin/invKoForm.php:50
+msgid "Only involvements from the selected divisions will be included."
+msgstr "Solo se incluirán las participaciones de las divisiones seleccionadas."
+
+#: src/templates/admin/invKoForm.php:61
+msgid "Campuses to Import"
+msgstr "Campus para importar"
+
+#: src/templates/admin/invKoForm.php:63
+msgid "Only involvements from the selected campuses will be included."
+msgstr "Solo se incluirán las participaciones de los campus seleccionados."
+
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
+#: src/templates/involvement-single.php:61
+#, php-format
+msgid "This %s has already happened."
+msgstr "Este %s ya ha sucedido."
+
+#: blocks/inv-list/index.js:122
+msgid "These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings."
+msgstr "Estas opciones se basan en los tipos de entrada de «Involvement» que usted o su administrador han elegido importar en la configuración de TouchPoint-WP."
+
+#: blocks/inv-list/index.js:131
+msgid "This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings."
+msgstr "Esta opción le permite filtrar las participaciones que se muestran en esta lista, como, por ejemplo, limitarlas a un ministerio en particular. Estas opciones son aquellas que usted o su administrador configuraron como Divisiones para importarlas como taxonomías en los ajustes de TouchPoint-WP."
+
+#: blocks/people-list/index.js:14
+msgid "People List"
+msgstr "Lista de personas"
+
+#: blocks/people-list/index.js:16
+msgid "A list of People from TouchPoint"
+msgstr "Una lista de personas de TouchPoint"
+
+#: blocks/people-list/index.js:176
+msgid "Involvement"
+msgstr "Participación"
+
+#: blocks/people-list/index.js:259
+msgid "Please select an Involvement to display."
+msgstr "Por favor, seleccione una participación para mostrar."
+
+#: blocks/people-list/block.json
+msgctxt "block title"
+msgid "People List"
+msgstr "Lista de personas"
+
+#: blocks/inv-list/index.js:39
+#: blocks/people-list/index.js:50
+msgid "Loading Preview..."
+msgstr "Cargando vista previa..."
+
+#: blocks/people-list/index.js:93
+msgid "All Leaders"
+msgstr "Todos los lideres"
+
+#: blocks/people-list/index.js:99
+msgid "All Members"
+msgstr "Todos los miembros"
+
+#: blocks/people-list/index.js:195
+msgid "Filter by Member Types"
+msgstr "Filtrar por Tipos de Miembros"
+
+#: blocks/people-list/index.js:219
+msgid "Filter by Gender"
+msgstr "Filtrar por Género"
+
+#: blocks/people-list/index.js:220
+msgid "This option allows you to filter the people that are shown based on gender. By default, gender filters are not applied."
+msgstr "Esta opción le permite filtrar las personas que se muestran según el género. Por defecto, los filtros de género no están aplicados."
+
+#: blocks/people-list/index.js:308
+msgid "Unable to load preview."
+msgstr "No se pudo cargar la vista previa."
+
+#: blocks/people-list/block.json
+msgctxt "block description"
+msgid "A list of People from a TouchPoint Involvement"
+msgstr "Una lista de personas en un participacion de TouchPoint"
+
+#: blocks/people-list/index.js:196
+msgid "This option allows you to filter the people that are shown based on their Member Type in the selected involvement. The default value, \"All Members\", includes all leaders, volunteers, and members. Other types like Inactive, Prospect, and Pending are not shown unless explicitly selected."
+msgstr "Esta opción le permite filtrar las personas que se muestran en función de su tipo de miembro en la participación seleccionada. El valor predeterminado, \"Todos los miembros\", incluye a todos los líderes, voluntarios y miembros. Otros tipos, como Inactivo, Candidato y Pendiente, no se muestran a menos que se seleccionen explícitamente."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index aa1fff7a..16292e16 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -1,15 +1,15 @@
-# Copyright (C) 2025 James K
+# Copyright (C) 2026 James K
 # This file is distributed under the AGPLv3+.
 msgid ""
 msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.96\n"
+"Project-Id-Version: TouchPoint WP 0.0.97\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-06-09T20:32:07+00:00\n"
+"POT-Creation-Date: 2026-03-31T21:47:44+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -62,202 +62,210 @@ msgstr ""
 msgid "Divisions to Import"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:60
-msgid "Import Campuses"
+#: src/templates/admin/invKoForm.php:50
+msgid "Only involvements from the selected divisions will be included."
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:61
+msgid "Campuses to Import"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:63
-#: src/templates/admin/invKoForm.php:162
-#: src/templates/admin/invKoForm.php:178
-#: src/templates/admin/invKoForm.php:332
+msgid "Only involvements from the selected campuses will be included."
+msgstr ""
+
+#: src/templates/admin/invKoForm.php:65
+#: src/templates/admin/invKoForm.php:164
+#: src/templates/admin/invKoForm.php:180
+#: src/templates/admin/invKoForm.php:334
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:803
+#: src/TouchPoint-WP/Meeting.php:800
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:195
 #: assets/js/base-defer.js:1113
 msgid "Loading..."
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:67
+#: src/templates/admin/invKoForm.php:69
 msgid "All Campuses"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:71
+#: src/templates/admin/invKoForm.php:73
 msgid "(No Campus)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:84
+#: src/templates/admin/invKoForm.php:86
 msgid "Import Hierarchically (Parent-Child Relationships)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:91
+#: src/templates/admin/invKoForm.php:93
 msgid "Import Images from TouchPoint"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:95
+#: src/templates/admin/invKoForm.php:97
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:102
+#: src/templates/admin/invKoForm.php:104
 msgid "Import All Meetings to Calendar"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:109
+#: src/templates/admin/invKoForm.php:111
 #: src/TouchPoint-WP/Settings.php:979
 msgid "Collect Meetings for Larger Events"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:113
+#: src/templates/admin/invKoForm.php:115
 #: src/TouchPoint-WP/Settings.php:983
 msgid "No Collecting"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:114
+#: src/templates/admin/invKoForm.php:116
 #: src/TouchPoint-WP/Settings.php:984
 msgid "Collect Meetings only from Involvements without Schedules"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:115
+#: src/templates/admin/invKoForm.php:117
 #: src/TouchPoint-WP/Settings.php:988
 msgid "Collect Meetings for all Involvements"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:117
+#: src/templates/admin/invKoForm.php:119
 #: src/TouchPoint-WP/Settings.php:980
 msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:123
+#: src/templates/admin/invKoForm.php:125
 msgid "Use Geographic Location"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:129
+#: src/templates/admin/invKoForm.php:131
 msgid "Exclude Involvements if"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:133
+#: src/templates/admin/invKoForm.php:135
 msgid "Involvement is Closed"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:137
+#: src/templates/admin/invKoForm.php:139
 msgid "Involvement is a Child Involvement"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:141
+#: src/templates/admin/invKoForm.php:143
 msgid "Based on Involvement setting in TouchPoint"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:141
+#: src/templates/admin/invKoForm.php:143
 msgid "Involvement does not meet weekly"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:145
+#: src/templates/admin/invKoForm.php:147
 msgid "Involvement does not have a Schedule"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:149
+#: src/templates/admin/invKoForm.php:151
 msgid "Involvement has a registration type of \"No Online Registration\""
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:153
+#: src/templates/admin/invKoForm.php:155
 msgid "Involvement registration has ended (end date is past)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:159
+#: src/templates/admin/invKoForm.php:161
 msgid "Leader Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:174
+#: src/templates/admin/invKoForm.php:176
 msgid "Host Member Types"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:190
+#: src/templates/admin/invKoForm.php:192
 msgid "Default Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:194
+#: src/templates/admin/invKoForm.php:196
 msgid "No Grouping"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:195
+#: src/templates/admin/invKoForm.php:197
 msgid "Upcoming / Current"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:196
+#: src/templates/admin/invKoForm.php:198
 msgid "Current / Upcoming"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:204
+#: src/templates/admin/invKoForm.php:206
 msgid "Default Filters"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:210
-#: blocks/inv-list/index.js:143
+#: src/templates/admin/invKoForm.php:212
+#: blocks/inv-list/index.js:130
 msgid "Division"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:217
+#: src/templates/admin/invKoForm.php:219
 msgid "Resident Code"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:224
+#: src/templates/admin/invKoForm.php:226
 msgid "Campus"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:236
+#: src/templates/admin/invKoForm.php:238
 msgid "Gender"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:250
-#: src/TouchPoint-WP/Involvement.php:1914
-#: src/TouchPoint-WP/Taxonomies.php:743
+#: src/templates/admin/invKoForm.php:252
+#: src/TouchPoint-WP/Involvement.php:1917
+#: src/TouchPoint-WP/Taxonomies.php:755
 msgid "Weekday"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:254
-#: src/TouchPoint-WP/Involvement.php:1940
-#: src/TouchPoint-WP/Taxonomies.php:801
+#: src/templates/admin/invKoForm.php:256
+#: src/TouchPoint-WP/Involvement.php:1943
+#: src/TouchPoint-WP/Taxonomies.php:821
 msgid "Time of Day"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:258
+#: src/templates/admin/invKoForm.php:260
 msgid "Prevailing Marital Status"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:262
-#: src/TouchPoint-WP/Taxonomies.php:830
+#: src/templates/admin/invKoForm.php:264
+#: src/TouchPoint-WP/Taxonomies.php:854
 msgid "Age Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:267
+#: src/templates/admin/invKoForm.php:269
 msgid "Task Owner"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:274
+#: src/templates/admin/invKoForm.php:276
 msgid "Contact Leader Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:285
+#: src/templates/admin/invKoForm.php:287
 msgid "Join Task Keywords"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:301
+#: src/templates/admin/invKoForm.php:303
 msgid "Add Involvement Post Type"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:308
+#: src/templates/admin/invKoForm.php:310
 msgid "Small Group"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:309
+#: src/templates/admin/invKoForm.php:311
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:419
+#: src/templates/admin/invKoForm.php:421
 msgid "(named person)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:456
+#: src/templates/admin/invKoForm.php:458
 msgid "Select..."
 msgstr ""
 
@@ -298,20 +306,26 @@ msgid "The Campus"
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
-#: src/templates/involvement-single.php:49
+#: src/templates/involvement-single.php:50
 #, php-format
 msgid "This %s has been Cancelled."
 msgstr ""
 
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
+#: src/templates/involvement-single.php:61
+#, php-format
+msgid "This %s has already happened."
+msgstr ""
+
 #: src/templates/meeting-archive.php:27
-#: src/TouchPoint-WP/Meeting.php:292
+#: src/TouchPoint-WP/Meeting.php:289
 msgctxt "What Meetings should be called, plural."
 msgid "Events"
 msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2203
+#: src/TouchPoint-WP/Involvement.php:2206
 #, php-format
 msgid "No %s Found."
 msgstr ""
@@ -324,25 +338,26 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3868
+#: src/TouchPoint-WP/Involvement.php:3875
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:98
-#: src/TouchPoint-WP/Api.php:353
-#: src/TouchPoint-WP/Api.php:486
+#: src/TouchPoint-WP/Api.php:107
+#: src/TouchPoint-WP/Api.php:188
+#: src/TouchPoint-WP/Api.php:450
+#: src/TouchPoint-WP/Api.php:584
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:112
-#: src/TouchPoint-WP/Api.php:160
-#: src/TouchPoint-WP/Api.php:429
+#: src/TouchPoint-WP/Api.php:204
+#: src/TouchPoint-WP/Api.php:251
+#: src/TouchPoint-WP/Api.php:526
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:550
+#: src/TouchPoint-WP/Api.php:656
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
@@ -352,12 +367,12 @@ msgstr ""
 msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:398
-#: src/TouchPoint-WP/Auth.php:406
+#: src/TouchPoint-WP/Auth.php:399
+#: src/TouchPoint-WP/Auth.php:407
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:437
+#: src/TouchPoint-WP/Auth.php:438
 msgid "No user account found."
 msgstr ""
 
@@ -378,35 +393,35 @@ msgid "Recurring"
 msgstr ""
 
 #: src/TouchPoint-WP/EventsCalendar.php:80
-#: src/TouchPoint-WP/EventsCalendar.php:297
+#: src/TouchPoint-WP/EventsCalendar.php:305
 msgid "Multi-Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:143
+#: src/TouchPoint-WP/Involvement.php:140
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:515
+#: src/TouchPoint-WP/Involvement.php:512
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:520
+#: src/TouchPoint-WP/Involvement.php:517
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:527
+#: src/TouchPoint-WP/Involvement.php:524
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:533
+#: src/TouchPoint-WP/Involvement.php:530
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1015
-#: src/TouchPoint-WP/Involvement.php:1047
-#: src/TouchPoint-WP/Involvement.php:1140
-#: src/TouchPoint-WP/Involvement.php:1164
+#: src/TouchPoint-WP/Involvement.php:1018
+#: src/TouchPoint-WP/Involvement.php:1050
+#: src/TouchPoint-WP/Involvement.php:1143
+#: src/TouchPoint-WP/Involvement.php:1167
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -415,289 +430,291 @@ msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1018
-#: src/TouchPoint-WP/Involvement.php:1041
+#: src/TouchPoint-WP/Involvement.php:1021
+#: src/TouchPoint-WP/Involvement.php:1044
 #, php-format
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1042
+#: src/TouchPoint-WP/Involvement.php:1045
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1056
+#: src/TouchPoint-WP/Involvement.php:1059
 #, php-format
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1065
+#: src/TouchPoint-WP/Involvement.php:1068
 #, php-format
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1074
+#: src/TouchPoint-WP/Involvement.php:1077
 #, php-format
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1082
+#: src/TouchPoint-WP/Involvement.php:1085
 #, php-format
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1090
+#: src/TouchPoint-WP/Involvement.php:1093
 #, php-format
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1098
+#: src/TouchPoint-WP/Involvement.php:1101
 #, php-format
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1680
+#: src/TouchPoint-WP/Involvement.php:1683
+#: src/TouchPoint-WP/Person.php:2001
 msgid "None right now."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1789
-#: src/TouchPoint-WP/Partner.php:842
+#: src/TouchPoint-WP/Involvement.php:1792
+#: src/TouchPoint-WP/Partner.php:840
+#: blocks/people-list/index.js:127
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1846
+#: src/TouchPoint-WP/Involvement.php:1849
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1889
+#: src/TouchPoint-WP/Involvement.php:1892
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1962
-#: src/TouchPoint-WP/Taxonomies.php:862
+#: src/TouchPoint-WP/Involvement.php:1965
+#: src/TouchPoint-WP/Taxonomies.php:890
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1963
+#: src/TouchPoint-WP/Involvement.php:1966
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1964
+#: src/TouchPoint-WP/Involvement.php:1967
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1975
+#: src/TouchPoint-WP/Involvement.php:1978
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:1997
-#: src/TouchPoint-WP/Partner.php:866
+#: src/TouchPoint-WP/Involvement.php:2000
+#: src/TouchPoint-WP/Partner.php:864
 #, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:2005
-#: src/TouchPoint-WP/Partner.php:882
+#: src/TouchPoint-WP/Involvement.php:2008
+#: src/TouchPoint-WP/Partner.php:880
 #, php-format
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2008
-#: src/TouchPoint-WP/Partner.php:885
+#: src/TouchPoint-WP/Involvement.php:2011
+#: src/TouchPoint-WP/Partner.php:883
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2144
+#: src/TouchPoint-WP/Involvement.php:2147
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2154
+#: src/TouchPoint-WP/Involvement.php:2157
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2173
+#: src/TouchPoint-WP/Involvement.php:2176
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3847
+#: src/TouchPoint-WP/Involvement.php:3854
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3850
+#: src/TouchPoint-WP/Involvement.php:3857
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3929
+#: src/TouchPoint-WP/Involvement.php:3936
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3946
-#: src/TouchPoint-WP/Partner.php:1353
+#: src/TouchPoint-WP/Involvement.php:3953
+#: src/TouchPoint-WP/Partner.php:1351
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3958
+#: src/TouchPoint-WP/Involvement.php:3965
 #, php-format
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3999
-#: src/TouchPoint-WP/Involvement.php:4058
+#: src/TouchPoint-WP/Involvement.php:4006
+#: src/TouchPoint-WP/Involvement.php:4065
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4005
+#: src/TouchPoint-WP/Involvement.php:4012
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4009
+#: src/TouchPoint-WP/Involvement.php:4016
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4014
+#: src/TouchPoint-WP/Involvement.php:4021
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4017
+#: src/TouchPoint-WP/Involvement.php:4024
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4020
+#: src/TouchPoint-WP/Involvement.php:4027
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4023
+#: src/TouchPoint-WP/Involvement.php:4030
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4049
+#: src/TouchPoint-WP/Involvement.php:4056
 #: assets/js/base-defer.js:1004
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4166
-#: src/TouchPoint-WP/Involvement.php:4271
+#: src/TouchPoint-WP/Involvement.php:4187
+#: src/TouchPoint-WP/Involvement.php:4292
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4248
-#: src/TouchPoint-WP/Person.php:1896
+#: src/TouchPoint-WP/Involvement.php:4269
+#: src/TouchPoint-WP/Person.php:1968
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4258
-#: src/TouchPoint-WP/Person.php:1879
+#: src/TouchPoint-WP/Involvement.php:4279
+#: src/TouchPoint-WP/Person.php:1951
 msgid "Contact Prohibited."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:107
+#: src/TouchPoint-WP/Meeting.php:104
 msgid "Creating a Meeting object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:293
+#: src/TouchPoint-WP/Meeting.php:290
 msgctxt "What Meetings should be called, singular."
 msgid "Event"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:467
+#: src/TouchPoint-WP/Meeting.php:464
 msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:541
+#: src/TouchPoint-WP/Meeting.php:538
 #, php-format
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:606
+#: src/TouchPoint-WP/Meeting.php:603
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:607
+#: src/TouchPoint-WP/Meeting.php:604
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:608
+#: src/TouchPoint-WP/Meeting.php:605
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:729
-#: src/TouchPoint-WP/TouchPointWP.php:1115
+#: src/TouchPoint-WP/Meeting.php:726
+#: src/TouchPoint-WP/TouchPointWP.php:1153
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:757
-#: src/TouchPoint-WP/TouchPointWP.php:374
+#: src/TouchPoint-WP/Meeting.php:754
+#: src/TouchPoint-WP/TouchPointWP.php:373
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:767
-#: src/TouchPoint-WP/TouchPointWP.php:383
+#: src/TouchPoint-WP/Meeting.php:764
+#: src/TouchPoint-WP/TouchPointWP.php:382
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:802
-#: src/TouchPoint-WP/Meeting.php:823
+#: src/TouchPoint-WP/Meeting.php:799
+#: src/TouchPoint-WP/Meeting.php:820
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr ""
 
 #. translators: %s is for the user-provided "Global Partner" and "Secure Partner" terms.
-#: src/TouchPoint-WP/Partner.php:873
+#: src/TouchPoint-WP/Partner.php:871
 #, php-format
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1292
+#: src/TouchPoint-WP/Partner.php:1290
 msgid "Not Shown on Map"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:148
+#: src/TouchPoint-WP/Person.php:151
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:640
+#: src/TouchPoint-WP/Person.php:707
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1196
+#: src/TouchPoint-WP/Person.php:1264
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1209
+#: src/TouchPoint-WP/Person.php:1277
 #, php-format
 msgid "Person in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1490
+#: src/TouchPoint-WP/Person.php:1558
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:20
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1497
+#: src/TouchPoint-WP/Person.php:1565
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1636
+#: src/TouchPoint-WP/Person.php:1704
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1734
+#: src/TouchPoint-WP/Person.php:1802
 msgid "You may need to sign in."
 msgstr ""
 
@@ -1333,7 +1350,8 @@ msgid "TouchPoint-WP"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:1451
-#: blocks/inv-list/index.js:127
+#: blocks/inv-list/index.js:113
+#: blocks/people-list/index.js:174
 msgid "Settings"
 msgstr ""
 
@@ -1401,94 +1419,94 @@ msgstr ""
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:680
+#: src/TouchPoint-WP/Taxonomies.php:684
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:711
+#: src/TouchPoint-WP/Taxonomies.php:719
 #, php-format
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:742
+#: src/TouchPoint-WP/Taxonomies.php:754
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:743
+#: src/TouchPoint-WP/Taxonomies.php:755
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:769
+#: src/TouchPoint-WP/Taxonomies.php:785
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:773
+#: src/TouchPoint-WP/Taxonomies.php:789
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:773
+#: src/TouchPoint-WP/Taxonomies.php:789
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:796
+#: src/TouchPoint-WP/Taxonomies.php:816
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:802
+#: src/TouchPoint-WP/Taxonomies.php:822
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:828
+#: src/TouchPoint-WP/Taxonomies.php:852
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:831
+#: src/TouchPoint-WP/Taxonomies.php:855
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:857
+#: src/TouchPoint-WP/Taxonomies.php:885
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:863
+#: src/TouchPoint-WP/Taxonomies.php:891
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:896
+#: src/TouchPoint-WP/Taxonomies.php:928
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:278
+#: src/TouchPoint-WP/TouchPointWP.php:277
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2146
+#: src/TouchPoint-WP/TouchPointWP.php:2189
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2203
+#: src/TouchPoint-WP/TouchPointWP.php:2246
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2206
+#: src/TouchPoint-WP/TouchPointWP.php:2249
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2209
+#: src/TouchPoint-WP/TouchPointWP.php:2252
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2214
-#: src/TouchPoint-WP/TouchPointWP.php:2215
+#: src/TouchPoint-WP/TouchPointWP.php:2257
+#: src/TouchPoint-WP/TouchPointWP.php:2258
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2405
+#: src/TouchPoint-WP/TouchPointWP.php:2448
 msgid "People Count Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2429
+#: src/TouchPoint-WP/TouchPointWP.php:2472
 msgid "People Query Failed"
 msgstr ""
 
@@ -1953,30 +1971,88 @@ msgstr ""
 msgid "Nothing to submit."
 msgstr ""
 
-#: blocks/inv-list/index.js:25
+#: blocks/inv-list/index.js:14
 msgid "Involvement List"
 msgstr ""
 
-#: blocks/inv-list/index.js:27
+#: blocks/inv-list/index.js:16
 msgid "A list of Involvements from TouchPoint"
 msgstr ""
 
-#: blocks/inv-list/index.js:81
+#: blocks/inv-list/index.js:39
+#: blocks/people-list/index.js:50
+msgid "Loading Preview..."
+msgstr ""
+
+#: blocks/inv-list/index.js:75
 msgid "All"
 msgstr ""
 
-#: blocks/inv-list/index.js:130
+#: blocks/inv-list/index.js:116
 msgid "To use this block, import Involvements in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:135
+#: blocks/inv-list/index.js:121
 msgid "Post Type"
 msgstr ""
 
-#: blocks/inv-list/index.js:154
+#: blocks/inv-list/index.js:122
+msgid "These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings."
+msgstr ""
+
+#: blocks/inv-list/index.js:131
+msgid "This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings."
+msgstr ""
+
+#: blocks/inv-list/index.js:143
+#: blocks/people-list/index.js:231
 msgid "Preview Only"
 msgstr ""
 
+#: blocks/people-list/index.js:14
+msgid "People List"
+msgstr ""
+
+#: blocks/people-list/index.js:16
+msgid "A list of People from TouchPoint"
+msgstr ""
+
+#: blocks/people-list/index.js:93
+msgid "All Leaders"
+msgstr ""
+
+#: blocks/people-list/index.js:99
+msgid "All Members"
+msgstr ""
+
+#: blocks/people-list/index.js:176
+msgid "Involvement"
+msgstr ""
+
+#: blocks/people-list/index.js:195
+msgid "Filter by Member Types"
+msgstr ""
+
+#: blocks/people-list/index.js:196
+msgid "This option allows you to filter the people that are shown based on their Member Type in the selected involvement. The default value, \"All Members\", includes all leaders, volunteers, and members. Other types like Inactive, Prospect, and Pending are not shown unless explicitly selected."
+msgstr ""
+
+#: blocks/people-list/index.js:219
+msgid "Filter by Gender"
+msgstr ""
+
+#: blocks/people-list/index.js:220
+msgid "This option allows you to filter the people that are shown based on gender. By default, gender filters are not applied."
+msgstr ""
+
+#: blocks/people-list/index.js:259
+msgid "Please select an Involvement to display."
+msgstr ""
+
+#: blocks/people-list/index.js:308
+msgid "Unable to load preview."
+msgstr ""
+
 #: blocks/inv-list/block.json
 msgctxt "block title"
 msgid "Involvement List"
@@ -1986,3 +2062,13 @@ msgstr ""
 msgctxt "block description"
 msgid "A list of Involvements from TouchPoint"
 msgstr ""
+
+#: blocks/people-list/block.json
+msgctxt "block title"
+msgid "People List"
+msgstr ""
+
+#: blocks/people-list/block.json
+msgctxt "block description"
+msgid "A list of People from a TouchPoint Involvement"
+msgstr ""
diff --git a/package.json b/package.json
index 0675ff44..bf6f80cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "touchpoint-wp",
-  "version": "0.0.96",
+  "version": "0.0.97",
   "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.",
   "directories": {
     "doc": "docs"
diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index b32149c6..213e92ca 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -5,9 +5,10 @@
  */
 namespace tp\TouchPointWP\Blocks;
 
+use tp\TouchPointWP\Interfaces\api;
 use tp\TouchPointWP\TouchPointWP;
 
-abstract class BlocksController
+abstract class BlocksController implements api
 {
 
 	/**
@@ -113,5 +114,43 @@ public static function enqueueBlockAssets(): void
 			}
 		}
 	}
+
+
+	/**
+	 * Handle API requests
+	 *
+	 * @param array $uri The request URI already parsed by parse_url()
+	 *
+	 * @return bool False if endpoint is not found.  Should print the result.
+	 *
+	 * @since 0.0.97 Added
+	 */
+	public static function api(array $uri): bool
+	{
+		if (count($uri['path']) < 3) {
+			return false;
+		}
+
+		switch (strtolower($uri['path'][2])) {
+			case "block-editor-style":
+				header('Content-Type: text/css');
+				header('Cache-Control: max-age=3600, public');
+
+				$dir = TouchPointWP::instance()->assets_dir;
+
+				// open files and print
+				echo file_get_contents($dir . '/template/block-preview-style.css') . "\n\n";
+				if (TouchPointWP::includeActionsStyle("block-preview")) {
+					echo file_get_contents($dir . '/template/actions-style.css') . "\n\n";
+				}
+				if (TouchPointWP::includePartialsStyle("block-preview")) {
+					echo file_get_contents($dir . '/template/partials-template-style.css') . "\n\n";
+				}
+
+				exit;
+		}
+
+		return false;
+	}
 }
 
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 3e0c8056..3136030c 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -402,7 +402,7 @@ public static function peopleListShortcode($params = [], string $content = ""):
 				'withsubgroups' => false,
 				'btnclass'      => 'btn button',
 				'context'       => '',
-				'memtype'       => '',
+				'memtypes'      => '',
 				'gender'        => ''
 			],
 			$params,
@@ -415,6 +415,19 @@ public static function peopleListShortcode($params = [], string $content = ""):
 		/** @noinspection SpellCheckingInspection */
 		$iid = intval($params['invid']);
 
+		/** @noinspection SpellCheckingInspection */
+		$memTypes = $params['memtypes'] ?? [];
+		if (!is_array($memTypes)) {
+			$memTypes = explode(',', trim($memTypes));
+		}
+		foreach ($memTypes as $i => $type) {
+			$memTypes[$i] = intval(trim($type));
+		}
+		if (in_array("", $memTypes)) { // remove "" if exists
+			$memTypes = array_diff($memTypes, [0]);
+		}
+		/** @var int[] $memTypes */
+
 		// If there's no invId, try to get one from the Post
 		if ($iid === 0) {
 			$post = get_post();
@@ -438,13 +451,23 @@ public static function peopleListShortcode($params = [], string $content = ""):
 				/** @noinspection SpellCheckingInspection */
 				self::$_indexingQueries['inv'][$iid] = [
 					'invId'          => $iid,
-					'memTypes'       => null,
+					'memTypes'       => [],
 //					'subGroups' => null,
 					'with_subGroups' => false // populated below
 				];
 			}
 
-			// Populating here so all info is imported if an involvement is embedded multiple times with different parameters.
+			// Handle memTypes, merging from any previously established.
+			if (count($memTypes) > 0) {
+				foreach ($memTypes as $type) {
+					self::$_indexingQueries['inv'][$iid]['memTypes'][] = intval($type);
+				}
+			} else { // not provided, which means we need the default behavior, which is a 0.
+				self::$_indexingQueries['inv'][$iid]['memTypes'][] = 0;
+			}
+			self::$_indexingQueries['inv'][$iid]['memTypes'] = array_unique(self::$_indexingQueries['inv'][$iid]['memTypes']);
+
+			// handle subgroups, merging from previously established.
 			/** @noinspection SpellCheckingInspection */
 			self::$_indexingQueries['inv'][$iid]['with_subGroups'] =
 				self::$_indexingQueries['inv'][$iid]['with_subGroups'] || $params['withsubgroups'];
@@ -468,15 +491,7 @@ public static function peopleListShortcode($params = [], string $content = ""):
 
 		// Member Type filtering
 
-		/** @noinspection SpellCheckingInspection */
-		$memTypes = $params['memtype'] ?? [];
-		if (!is_array($memTypes)) {
-			$memTypes = explode(',', trim($memTypes));
-		}
-		if (in_array("", $memTypes)) { // remove "" if exists
-			$memTypes = array_diff($memTypes, [""]);
-		}
-		if (count($memTypes) === 0 || in_array("0", $memTypes)) {
+		if (count($memTypes) === 0 || in_array(0, $memTypes)) {
 			// Leaders, Volunteers, Members: at10, at20, or at30.
 			$WP_User_queryParams['meta_query'][] = [
 				'key' => self::META_INV_ATTEND_PREFIX . $iid,
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 4ff2ec9c..0f571f38 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -6,6 +6,7 @@
 namespace tp\TouchPointWP;
 
 use JsonException;
+use PhpParser\Node\Stmt\Block;
 use stdClass;
 use tp\TouchPointWP\Blocks\BlocksController;
 use tp\TouchPointWP\Utilities\Cleanup;
@@ -31,7 +32,7 @@ class TouchPointWP
 	/**
 	 * Version number
 	 */
-	public const VERSION = "0.0.96";
+	public const VERSION = "0.0.97";
 
 	/**
 	 * The Token
@@ -54,6 +55,7 @@ class TouchPointWP
 	public const API_ENDPOINT_REPORT = "report";
 	public const API_ENDPOINT_ADMIN_SCRIPTZIP = "admin/scriptzip";
 	public const API_ENDPOINT_CLEANUP = "cleanup";
+	public const API_ENDPOINT_BLOCKS = "blocks";
 	public const API_ENDPOINT_GEOLOCATE = "geolocate";
 
 	/**
@@ -533,6 +535,13 @@ public function parseRequest($continue, $wp, $extraVars): bool
 				count($reqUri['path']) === 2) {
 				$this->ajaxGeolocate();
 			}
+
+			// Blocks
+			if ($reqUri['path'][1] === TouchPointWP::API_ENDPOINT_BLOCKS) {
+			    if ( ! BlocksController::api($reqUri)) {
+				    return $continue;
+			    }
+			}
 		}
 
 		self::$context = "";
@@ -2546,6 +2555,27 @@ public function flushRewriteRules(bool $force = true): void
 	 * custom templates exist.
 	 */
 	public static function enqueuePartialsStyle(?string $context = null): void
+	{
+		if (self::includePartialsStyle($context)) {
+			wp_enqueue_style(
+				TouchPointWP::SHORTCODE_PREFIX . 'partials-template-style',
+				self::instance()->assets_url . 'template/partials-template-style.css',
+				[],
+				TouchPointWP::VERSION
+			);
+		}
+	}
+
+	/**
+	 * Determines if the partials style should be rendered.
+	 * 
+	 * @param string|null $context
+	 *
+	 * @return bool
+	 *
+	 * @since 0.0.97 Added
+	 */
+	public static function includePartialsStyle(?string $context = null): bool
 	{
 		$includePartialsStyle = true;
 
@@ -2557,18 +2587,10 @@ public static function enqueuePartialsStyle(?string $context = null): void
 		 * @params ?string $context a string that may be provided to clarify where the style is being called from.
 		 *
 		 * @noinspection PhpConditionAlreadyCheckedInspection
+		 * @noinspection PhpUnnecessaryLocalVariableInspection
 		 */
-		$includePartialsStyle = !!apply_filters("tp_include_actions_style", $includePartialsStyle, $context);
-		if (!$includePartialsStyle) {
-			return;
-		}
-
-		wp_enqueue_style(
-			TouchPointWP::SHORTCODE_PREFIX . 'partials-template-style',
-			self::instance()->assets_url . 'template/partials-template-style.css',
-			[],
-			TouchPointWP::VERSION
-		);
+		$includePartialsStyle = !!apply_filters("tp_include_partials_style", $includePartialsStyle, $context);
+		return $includePartialsStyle;
 	}
 
 	/**
@@ -2578,6 +2600,27 @@ public static function enqueuePartialsStyle(?string $context = null): void
 	 * the filter can make an informed decision about whether to exclude the stylesheet.
 	 */
 	public static function enqueueActionsStyle(string $action): void
+	{
+		if (self::includeActionsStyle($action)) {
+			wp_enqueue_style(
+				TouchPointWP::SHORTCODE_PREFIX . 'actions-style',
+				self::instance()->assets_url . 'template/actions-style.css',
+				[],
+				TouchPointWP::VERSION
+			);
+		}
+	}
+
+	/**
+	 * Determines if the actions style should be rendered.
+	 *
+	 * @param string $action
+	 *
+	 * @return bool
+	 *
+	 * @since 0.0.97 Added
+	 */
+	public static function includeActionsStyle(string $action): bool
 	{
 		$includeActionsStyle = true;
 
@@ -2588,16 +2631,10 @@ public static function enqueueActionsStyle(string $action): void
 		 * @params string $action The action that is being performed.
 		 *
 		 * @noinspection PhpConditionAlreadyCheckedInspection
+		 * @noinspection PhpUnnecessaryLocalVariableInspection
 		 */
 		$includeActionsStyle = !!apply_filters("tp_include_actions_style", $includeActionsStyle, $action);
-		if ($includeActionsStyle) {
-			wp_enqueue_style(
-				TouchPointWP::SHORTCODE_PREFIX . 'actions-style',
-				self::instance()->assets_url . 'template/actions-style.css',
-				[],
-				TouchPointWP::VERSION
-			);
-		}
+		return $includeActionsStyle;
 	}
 
 	/**
diff --git a/src/python/WebApi.py b/src/python/WebApi.py
index 7ae00712..b2ed9d91 100644
--- a/src/python/WebApi.py
+++ b/src/python/WebApi.py
@@ -6,7 +6,7 @@
 import sys
 import urllib
 
-VERSION = "0.0.96"
+VERSION = "0.0.97"
 
 sgContactEvName = "Contact"
 
@@ -979,6 +979,9 @@ def get_person_info_for_sync(person_obj):
 
     Data.Title = 'People Query'
 
+    # noinspection SqlResolve
+    leaderMemberTypes = q.QuerySqlInts("SELECT Id FROM Lookup.MemberType WHERE AttendanceTypeId = 10")
+
     rules = []
     invsMembershipsToImport = []
     invsMemSubGroupsToImport = {}
@@ -1002,9 +1005,23 @@ def get_person_info_for_sync(person_obj):
     # Involvements
     if inData.has_key('inv'):
         for iid in inData['inv']:
-            if inData['inv'][iid]['memTypes'] is None:
+            # All members.  Includes leaders.
+            if inData['inv'][iid]['memTypes'] is None or 0 in inData['inv'][iid]['memTypes']:
                 rules.append("IsMemberOf( Org={} ) = 1".format(iid))
-            else:
+                inData['inv'][iid]['memTypes'].remove(0)
+                for lmt in leaderMemberTypes:  # leaders are implied
+                    if lmt in inData['inv'][iid]['memTypes']:
+                        inData['inv'][iid]['memTypes'].remove(lmt)
+
+            # All leaders, but other types may be needed.
+            elif -1 in inData['inv'][iid]['memTypes']:
+                #  remove -1 and add leaderMemberTypes values
+                inData['inv'][iid]['memTypes'].remove(-1)
+                for lmt in leaderMemberTypes:
+                    inData['inv'][iid]['memTypes'].append(lmt)
+            
+            # leaders and anyone else
+            if len(inData['inv'][iid]['memTypes']) > 0:
                 rules.append("MemberTypeCodes( Org={} ) IN ( {} )"
                              .format(iid, ', '.join(map(str, inData['inv'][iid]['memTypes'])))
                              )
diff --git a/touchpoint-wp.php b/touchpoint-wp.php
index 6d49e310..15acb288 100644
--- a/touchpoint-wp.php
+++ b/touchpoint-wp.php
@@ -14,7 +14,7 @@
 Plugin URI:         https://github.com/tenthpres/touchpoint-wp
 Update URI:         https://github.com/tenthpres/touchpoint-wp
 Description:        A WordPress Plugin for integrating with TouchPoint Church Management Software.
-Version:            0.0.96
+Version:            0.0.97
 Author:             James K
 Author URI:         https://github.com/jkrrv
 License:            AGPLv3+

From fcf901e9a706d80178ec9d108206234c7bd4fca8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 18:20:21 -0400
Subject: [PATCH 366/423] Minor improvements for caching

---
 src/TouchPoint-WP/Lookup.php   | 2 +-
 src/TouchPoint-WP/Settings.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Lookup.php b/src/TouchPoint-WP/Lookup.php
index bdd8ee13..6506ab56 100644
--- a/src/TouchPoint-WP/Lookup.php
+++ b/src/TouchPoint-WP/Lookup.php
@@ -51,7 +51,7 @@ public static function api(array $uri): bool
 	 */
 	public static function getLookup(string $path, bool $noCache = false): mixed
 	{
-		$cacheKey = TouchPointWP::SETTINGS_PREFIX . "lookup_$path";
+		$cacheKey = TouchPointWP::SETTINGS_PREFIX . strtolower("lookup_$path");
 
 		if (!$noCache) {
 			// check transients
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 1aa9ec83..65735960 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -1544,6 +1544,9 @@ public function migrate(): void
 			}
 		}
 
+		// 0.0.97 -- Remove the old Genders meta
+		delete_option(TouchPointWP::SETTINGS_PREFIX . 'meta_genders');
+
 		// 0.0.95 -- Make sure the TpWp user exists
 		try {
 			TouchPointWP::instance()->validateThatTpWpUserExists();

From ca31a5510c1cdd278b37fee37ffcb9234c78dfc4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 18:22:03 -0400
Subject: [PATCH 367/423] Merging

---
 docs                        | 2 +-
 i18n/TouchPoint-WP-es_ES.po | 6 +++---
 i18n/TouchPoint-WP.pot      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs b/docs
index b4ad7e6b..ddfe2b71 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit b4ad7e6b6fe8891dd6f62de7aa86c69c60185139
+Subproject commit ddfe2b7124d7dfcc72312160c90fc5bfbee54f4f
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index fcc29fea..39606db3 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -790,15 +790,15 @@ msgstr "TouchPoint-WP"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/TouchPoint-WP/Settings.php:1700
+#: src/TouchPoint-WP/Settings.php:1703
 msgid "Script Update Failed"
 msgstr "Actualización de secuencia de comandos fallida"
 
-#: src/TouchPoint-WP/Settings.php:1822
+#: src/TouchPoint-WP/Settings.php:1825
 msgid "TouchPoint-WP Settings"
 msgstr "Configuración de TouchPoint-WP"
 
-#: src/TouchPoint-WP/Settings.php:1873
+#: src/TouchPoint-WP/Settings.php:1876
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 16292e16..43968d77 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-03-31T21:47:44+00:00\n"
+"POT-Creation-Date: 2026-03-31T22:21:43+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -1355,15 +1355,15 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1700
+#: src/TouchPoint-WP/Settings.php:1703
 msgid "Script Update Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1822
+#: src/TouchPoint-WP/Settings.php:1825
 msgid "TouchPoint-WP Settings"
 msgstr ""
 
-#: src/TouchPoint-WP/Settings.php:1873
+#: src/TouchPoint-WP/Settings.php:1876
 msgid "Save Settings"
 msgstr ""
 

From 90b7e06827690626819a5e648badf24e4a5f4d2b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 18:52:16 -0400
Subject: [PATCH 368/423] Hotfix: sprintf needs to be explicitly included,
 apparently.

---
 src/TouchPoint-WP/Involvement.php               | 1 +
 src/templates/parts/involvement-nearby-list.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index bf098349..8a18a5a6 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1736,6 +1736,7 @@ public static function nearbyShortcode(array|string $params = [], string $conten
 		ob_start();
 		$loadedPart = get_template_part('list-item', 'involvement-nearby-list');
 		if ($loadedPart === false) {
+			TouchPointWP::requireScript("wp-i18n");
 			require TouchPointWP::$dir . "/src/templates/parts/involvement-nearby-list.php";
 		}
 		$content = ob_get_clean();
diff --git a/src/templates/parts/involvement-nearby-list.php b/src/templates/parts/involvement-nearby-list.php
index 9cfdb2ee..676182ba 100644
--- a/src/templates/parts/involvement-nearby-list.php
+++ b/src/templates/parts/involvement-nearby-list.php
@@ -7,7 +7,7 @@
                data-bind="text: name, attr: { href: path, 'data-inv-type': invType }"></a>
         </h3>
         <p><small>
-            <span data-bind="text: sprintf('<?php /* translators: number of miles */ _ex("%2.1fmi", "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'", 'TouchPoint-WP'); ?>', distance)"></span> &sdot;
+            <span data-bind="text: wp.i18n.sprintf('<?php /* translators: number of miles */ _ex("%2.1fmi", "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'", 'TouchPoint-WP'); ?>', distance)"></span> &sdot;
             <span data-bind="text: schedule"></span>
         </small></p>
     </div>

From 077a2329daf67601f7be69f769f1afc7f1fbdf7b Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 20:34:28 -0400
Subject: [PATCH 369/423] Hotfix: sprintf needs to be explicitly included,
 apparently.

---
 assets/js/meeting-defer.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/js/meeting-defer.js b/assets/js/meeting-defer.js
index c21c6489..4edf659d 100644
--- a/assets/js/meeting-defer.js
+++ b/assets/js/meeting-defer.js
@@ -225,6 +225,8 @@ class TP_Meeting {
     rsvpAction(forceAsk = false) {
         let meeting = this;
 
+        const {__, sprintf} = wp.i18n;
+
         tpvm._utils.ga('send', 'event', 'rsvp', 'rsvp btn click', meeting.mtgId);
 
         tpvm._utils.applyHashForAction("rsvp", this);

From 0a7e687f226b73df2880f56999bfbf0642c06ef4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 20:47:45 -0400
Subject: [PATCH 370/423] Hotfix: closure issue

---
 assets/js/meeting-defer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/meeting-defer.js b/assets/js/meeting-defer.js
index 4edf659d..514d0502 100644
--- a/assets/js/meeting-defer.js
+++ b/assets/js/meeting-defer.js
@@ -235,7 +235,7 @@ class TP_Meeting {
         let title = sprintf(__('RSVP for %s', 'TouchPoint-WP'),  (meeting.description ?? meeting.inv.name))
              + "<br /><small>" + this.dateTimeString() + "</small>";
 
-        TP_Person.DoInformalAuth(title, forceAsk).then(
+        tpvm.TP_Person.DoInformalAuth(title, forceAsk).then(
             (res) => rsvpUi(meeting, res).then(tpvm._utils.clearHash),
             () => tpvm._utils.clearHash()
         )
@@ -244,7 +244,7 @@ class TP_Meeting {
             tpvm._utils.ga('send', 'event', 'rsvp', 'rsvp userIdentified', meeting.mtgId);
 
             return Swal.fire({
-                html: `<p id="swal-tp-text">${__('Who is coming?', 'TouchPoint-WP')}</p><p class="small swal-tp-instruction">${__('Indicate who is or is not coming.  This will overwrite any existing RSVP.', 'TouchPoint-WP')}<br />${__('To avoid overwriting an existing RSVP, leave that person blank.', 'TouchPoint-WP')}<br />${__("To protect privacy, we won't show existing RSVPs here.", 'TouchPoint-WP')}</p></i>` + TP_Person.peopleArrayToRadio({Yes: __('Yes', 'TouchPoint-WP'), No: __('No', 'TouchPoint-WP')}, people, tpvm._secondaryUsers),
+                html: `<p id="swal-tp-text">${__('Who is coming?', 'TouchPoint-WP')}</p><p class="small swal-tp-instruction">${__('Indicate who is or is not coming.  This will overwrite any existing RSVP.', 'TouchPoint-WP')}<br />${__('To avoid overwriting an existing RSVP, leave that person blank.', 'TouchPoint-WP')}<br />${__("To protect privacy, we won't show existing RSVPs here.", 'TouchPoint-WP')}</p></i>` + tpvm.TP_Person.peopleArrayToRadio({Yes: __('Yes', 'TouchPoint-WP'), No: __('No', 'TouchPoint-WP')}, people, tpvm._secondaryUsers),
                 customClass: tpvm._utils.defaultSwalClasses(),
                 showConfirmButton: true,
                 showCancelButton: true,

From 378858d6e5227695e98a641164ee9e566d7d71f4 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 22:50:17 -0400
Subject: [PATCH 371/423] Mapping updates.  Removed FontAwesome.

---
 README.md                                     |  4 +---
 assets/icons/lock.svg                         |  3 +++
 assets/icons/map-marker.svg                   |  1 +
 .../touchpoint.svg}                           |  0
 assets/js/base-defer.js                       | 20 ++++++++--------
 assets/js/meeting-defer.js                    |  2 ++
 assets/js/partner-defer.js                    | 10 ++++++--
 assets/template/actions-style.css             | 21 +++++++++++++++--
 src/TouchPoint-WP/Involvement.php             | 11 ++++-----
 src/TouchPoint-WP/Meeting.php                 |  4 ++--
 src/TouchPoint-WP/Partner.php                 |  8 ++++++-
 src/TouchPoint-WP/Person.php                  |  3 +--
 src/TouchPoint-WP/TouchPointWP.php            | 23 -------------------
 13 files changed, 60 insertions(+), 50 deletions(-)
 create mode 100644 assets/icons/lock.svg
 create mode 100644 assets/icons/map-marker.svg
 rename assets/{branding/icon-curcolor.svg => icons/touchpoint.svg} (100%)

diff --git a/README.md b/README.md
index b13e3a64..4c9a9dcc 100644
--- a/README.md
+++ b/README.md
@@ -120,9 +120,7 @@ Several plugins have lended structure, code, or inspiration to this plugin:
 ### Other Software Used Within this Software
 - [SweetAlert2](https://sweetalert2.github.io/) (MIT)
 - [Knockout JS](https://knockoutjs.com/) (MIT)
-- [Google Maps Javascript API](https://developers.google.com/maps/documentation/javascript/overview) 
-  ([Proprietary](https://developers.google.com/terms))
-- [FontAwesome](https://fontawesome.com/) ([SIL OFL 1.1](http://scripts.sil.org/OFL))
+- [Google Maps Javascript API](https://developers.google.com/maps/documentation/javascript/overview) ([Proprietary](https://developers.google.com/terms))
 
 ### License
 This plugin is released under the AGPL, which is "very strong copy-left".  Therefore, if you change this code and use it
diff --git a/assets/icons/lock.svg b/assets/icons/lock.svg
new file mode 100644
index 00000000..e8150c2f
--- /dev/null
+++ b/assets/icons/lock.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="44px" height="55px"
+     viewBox="0 0 96.108 122.88" enable-background="new 0 0 96.108 122.88" xml:space="preserve"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M2.892,56.036h8.959v-1.075V37.117c0-10.205,4.177-19.484,10.898-26.207v-0.009 C29.473,4.177,38.754,0,48.966,0C59.17,0,68.449,4.177,75.173,10.901l0.01,0.009c6.721,6.723,10.898,16.002,10.898,26.207v17.844 v1.075h7.136c1.59,0,2.892,1.302,2.892,2.891v61.062c0,1.589-1.302,2.891-2.892,2.891H2.892c-1.59,0-2.892-1.302-2.892-2.891 V58.927C0,57.338,1.302,56.036,2.892,56.036L2.892,56.036z M26.271,56.036h45.387v-1.075V36.911c0-6.24-2.554-11.917-6.662-16.03 l-0.005,0.004c-4.111-4.114-9.787-6.669-16.025-6.669c-6.241,0-11.917,2.554-16.033,6.665c-4.109,4.113-6.662,9.79-6.662,16.03 v18.051V56.036L26.271,56.036z M49.149,89.448l4.581,21.139l-12.557,0.053l3.685-21.423c-3.431-1.1-5.918-4.315-5.918-8.111 c0-4.701,3.81-8.511,8.513-8.511c4.698,0,8.511,3.81,8.511,8.511C55.964,85.226,53.036,88.663,49.149,89.448L49.149,89.448z"/></g></svg>
\ No newline at end of file
diff --git a/assets/icons/map-marker.svg b/assets/icons/map-marker.svg
new file mode 100644
index 00000000..abfbec3d
--- /dev/null
+++ b/assets/icons/map-marker.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><svg width="44px" height="55px" viewBox="-3 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8.075 23.52c-6.811-9.878-8.075-10.891-8.075-14.52 0-4.971 4.029-9 9-9s9 4.029 9 9c0 3.629-1.264 4.64-8.075 14.516-.206.294-.543.484-.925.484s-.719-.19-.922-.48l-.002-.004z"/></svg>
\ No newline at end of file
diff --git a/assets/branding/icon-curcolor.svg b/assets/icons/touchpoint.svg
similarity index 100%
rename from assets/branding/icon-curcolor.svg
rename to assets/icons/touchpoint.svg
diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 68ab0f84..67f58ae7 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -345,16 +345,13 @@
             }
 
             if (!options.hasOwnProperty('content')) {
-                const label = document.createElement('div');
-                label.classList.add("map-marker-label");
-                const pin = new google.maps.marker.PinElement({
-                    glyph: label,
+                options.content = new google.maps.marker.PinElement({
+                    glyphText: "",
                     glyphColor: "#000",
                     background: this.color,
                     borderColor: "#000",
                     scale: .65,
                 });
-                options.content = pin.element;
             }
 
             this.gMkr = new google.maps.marker.AdvancedMarkerElement(options);
@@ -407,14 +404,14 @@
             // Update title
             this.gMkr.title = tpvm._utils.stringArrayToListString(this.visibleItems.map((i) => i.name));
 
-            this.gMkr.content.getElementsByTagName('div')[0].innerHTML = this.getLabelContent() || ""; // Set label content
+            [this.gMkr.content.glyphText, this.gMkr.content.glyphSrc] = this.getLabelContent() || ["", null]; // Set label content
         }
 
         getLabelContent() {
             if (this.visibleItems.length > 1) {
-                return this.visibleItems.length.toString();
+                return [this.visibleItems.length.toString(), null];
             } else if (this.useIcon !== false) { // icon for secure partners
-                return this.useIcon;
+                return [null, this.useIcon];
             }
             return null;
         }
@@ -651,7 +648,6 @@
         static updateFilterWarnings() {
             let elts = document.getElementsByClassName("TouchPointWP-map-warning-visibleOnly"),
                 includesBoth = TP_Mappable.mapIncludesVisibleItemsWhichAreBothInAndOutOfBounds;
-            elts[ei].style = undefined;
             for (const ei in elts) {
                 if (!elts.hasOwnProperty(ei))
                     continue;
@@ -1079,6 +1075,12 @@
         }
 
         static initMap(mapDivId) {
+            // if google.maps isn't defined yet, have this called again when it's ready.
+            if (typeof google === 'undefined' || typeof google.maps === 'undefined') {
+                setTimeout(() => this.initMap(mapDivId), 100);
+                return;
+            }
+
             let mapOptions = {
                 mapTypeId: google.maps.MapTypeId.ROADMAP,
                 mapId: "f0fb8ca5f6beff5288b80a8d",
diff --git a/assets/js/meeting-defer.js b/assets/js/meeting-defer.js
index 514d0502..270f5a9f 100644
--- a/assets/js/meeting-defer.js
+++ b/assets/js/meeting-defer.js
@@ -190,6 +190,8 @@ class TP_Meeting {
         let meeting = this;
         showConfirm = !!showConfirm;
 
+        const {__, _n} = wp.i18n;
+
         tpvm._utils.ga('send', 'event', 'rsvp', 'rsvp complete', meeting.mtgId);
 
         let res = await tpvm.postData('mtg/rsvp', {mtgId: meeting.mtgId, responses: data});
diff --git a/assets/js/partner-defer.js b/assets/js/partner-defer.js
index 90d55264..32eb053b 100644
--- a/assets/js/partner-defer.js
+++ b/assets/js/partner-defer.js
@@ -47,7 +47,7 @@
         // noinspection JSUnusedGlobalSymbols
         get useIcon() {
             if (this.post_id === 0) {
-                return "<i class=\"fa fa-solid fa-lock\" style=\"font-size:90%\"></i>";
+                return tpData.assetsUrl + "/icons/lock.svg";
             }
             return false;
         }
@@ -106,7 +106,7 @@
                     }
                     item.toggleVisibility(true)
                 }
-            TP_Mappable.updateFilterWarnings();
+            tpvm.TP_Mappable.updateFilterWarnings();
         }
 
         get visibility() {
@@ -118,6 +118,12 @@
         }
 
         static initMap(mapDivId) {
+            // if google.maps isn't defined yet, have this called again when it's ready.
+            if (typeof google === 'undefined' || typeof google.maps === 'undefined') {
+                setTimeout(() => this.initMap(mapDivId), 100);
+                return;
+            }
+
             let mapOptions = {
                 mapTypeId: google.maps.MapTypeId.HYBRID,
                 mapId: 'f0fb8ca5f6beff5237d51d79',
diff --git a/assets/template/actions-style.css b/assets/template/actions-style.css
index c01e516c..0124a10c 100644
--- a/assets/template/actions-style.css
+++ b/assets/template/actions-style.css
@@ -29,7 +29,24 @@ button[data-tp-action]:not([disabled]) {
     cursor: pointer;
 }
 
-.tp-TouchPoint-logo svg {
+i.tenth-icons {
+    margin: -2em 0;
+}
+i.tenth-icons::before {
+    content: " ";
+    width: 1em;
     height: 1.2em;
-    margin-bottom: -0.2em;
+    margin-top: -.25em;
+    margin-bottom: -0.24em;
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+    display: inline-block;
+    fill: currentColor;
+}
+i.tenth-icons.map-marker::before {
+    background-image: url("../icons/map-marker.svg")
+}
+i.tenth-icons.touchpoint-icon::before {
+    background-image: url("../icons/touchpoint.svg")
 }
\ No newline at end of file
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 8a18a5a6..727b7ea4 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3936,11 +3936,11 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if (self::allowContact($this->invType) && $this->leaders()->count() > 0) {
 			$text  = __("Contact Leaders", 'TouchPoint-WP');
 			if (!$absoluteLinks) {
-				$ret['contact_leader'] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button> ";
+				$ret['contact_leader'] = "<button type=\"button\" data-tp-involvement=\"$this->post_id\" data-tp-action=\"contact\" $btnClass>$text</button>";
 				TouchPointWP::enqueueActionsStyle('inv-contact');
 			} else {
 				$iid = $this->invId;
-				$ret['contact_leader'] = "<a href=\"$baseLink#tp-contact-i$iid\"$btnClass>$text</a> ";
+				$ret['contact_leader'] = "<a href=\"$baseLink#tp-contact-i$iid\"$btnClass>$text</a>";
 			}
 		}
 
@@ -3953,8 +3953,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if (self::$_hasArchiveMap && $this->geo !== null && !$absoluteLinks) {
 			$text = __("Show on Map", 'TouchPoint-WP');
 			if ($ret->count() > 1) {
-				TouchPointWP::requireScript("fontAwesome");
-				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"fa-solid fa-location-pin\"></i></button>", "map");
+				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"tenth-icons map-marker\"></i></button>", "map");
 			} else {
 				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>", "map");
 			}
@@ -3964,8 +3963,8 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 			$tpHost = TouchPointWP::instance()->host();
 			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
-			$logo = TouchPointWP::TouchPointIcon();
-			$ret['inv_tp']  = "<a href=\"$tpHost/Org/$this->invId\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
+			$url = "$tpHost/Org/$this->invId";
+			$ret['inv_tp']  = "<button type=\"button\" data-tp-action=\"inv-tp\" onclick=\"window.open('$url', '_blank', 'noopener');\" title=\"$title\" class=\"$classesOnly\"><i class=\"tenth-icons touchpoint-icon\"></i></button>";
 		}
 
 		/**
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index b6403453..1a65fc48 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -536,8 +536,8 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 			$tpHost = TouchPointWP::instance()->host();
 			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Meeting in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
-			$logo = TouchPointWP::TouchPointIcon();
-			$ret['mtg_tp']  = "<a href=\"$tpHost/Meeting/$this->mtgId\" title=\"$title\" class=\"tp-TouchPoint-logo $btnClass\">$logo</a>";
+			$url = "$tpHost/Meeting/$this->mtgId";
+			$ret['mtg_tp']  = "<button type=\"button\" data-tp-action=\"mtg-tp\" onclick=\"window.open('$url', '_blank', 'noopener');\" title=\"$title\" class=\"$btnClass\"><i class=\"tenth-icons touchpoint-icon\"></i></button>";
 		}
 
 		/**
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 6d0b78ac..7e330a94 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1112,6 +1112,13 @@ public static function registerScriptsAndStyles(): void
 			TouchPointWP::VERSION,
 			true
 		);
+		wp_localize_script(
+			TouchPointWP::SHORTCODE_PREFIX . 'partner-defer',
+			'tpData',
+			[
+				'assetsUrl' => $i->assets_url,
+			]
+		);
 	}
 
 	/**
@@ -1288,7 +1295,6 @@ public function notableAttributes(array|StringableArray $exclude = []): NotableA
 		// Not shown on map (only if there is a map, and the partner isn't on it because they lack geo.)
 		if (self::$_hasArchiveMap && $this->geo === null && ! $this->decoupleLocation) {
 			$attrs['hidden'] = __("Not Shown on Map", "TouchPoint-WP");
-			TouchPointWP::requireScript("fontAwesome");  // For map icons
 		}
 
 		$attrs = $this->processAttributeExclusions($attrs, $exclude);
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 3136030c..e4a3e3d3 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1275,8 +1275,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
 			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Person in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
-			$logo = TouchPointWP::TouchPointIcon();
-			$ret['inv_tp']  = "<a href=\"{$this->getProfileUrl()}\" title=\"$title\" class=\"tp-TouchPoint-logo $classesOnly\">$logo</a>";
+			$ret['person_tp']  = "<button type=\"button\" data-tp-action=\"person-tp\" onclick=\"window.open('{$this->getProfileUrl()}', '_blank', 'noopener');\" title=\"$title\" class=\"$classesOnly\"><i class=\"tenth-icons touchpoint-icon\"></i></button>";
 		}
 
 		/**
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 0f571f38..dd511333 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -6,7 +6,6 @@
 namespace tp\TouchPointWP;
 
 use JsonException;
-use PhpParser\Node\Stmt\Block;
 use stdClass;
 use tp\TouchPointWP\Blocks\BlocksController;
 use tp\TouchPointWP\Utilities\Cleanup;
@@ -388,20 +387,6 @@ public static function postHeadersAndFiltering(): string
 	}
 
 
-	/**
-	 * Get TouchPoint icon as an SVG that can printed inline.
-	 *
-	 * @return string
-	 */
-	public static function TouchPointIcon(): string
-	{
-		if (self::$_icon === null) {
-			self::$_icon = file_get_contents(TouchPointWP::$dir . "/assets/branding/icon-curcolor.svg");
-		}
-		return self::$_icon;
-	}
-	protected static ?string $_icon = null;
-
 	/**
 	 * @param bool         $continue Whether to parse the request
 	 * @param WP           $wp Current WordPress environment instance
@@ -1024,14 +1009,6 @@ public function registerScriptsAndStyles(): void
 			true
 		);
 
-		wp_register_script(
-			TouchPointWP::SHORTCODE_PREFIX . "fontAwesome",
-			"https://kit.fontawesome.com/2b5f44e07f.js",
-			[],
-			6, // When changing versions, some CSS references will need to be updated, too.
-			false
-		);
-
 		if ( ! ! $this->involvements) {
 			Involvement::registerScriptsAndStyles();
 		}

From 104ea9875f0c75f4f147fbbfd9e32037867bac08 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 23:20:21 -0400
Subject: [PATCH 372/423] Icon coloring

---
 assets/icons/lock.svg             |  7 +++++--
 assets/icons/map-marker.svg       |  5 ++++-
 assets/icons/touchpoint.svg       |  7 ++++++-
 assets/template/actions-style.css | 27 ++++++++++++++++++++-------
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/assets/icons/lock.svg b/assets/icons/lock.svg
index e8150c2f..80a096e0 100644
--- a/assets/icons/lock.svg
+++ b/assets/icons/lock.svg
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="44px" height="55px"
-     viewBox="0 0 96.108 122.88" enable-background="new 0 0 96.108 122.88" xml:space="preserve"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M2.892,56.036h8.959v-1.075V37.117c0-10.205,4.177-19.484,10.898-26.207v-0.009 C29.473,4.177,38.754,0,48.966,0C59.17,0,68.449,4.177,75.173,10.901l0.01,0.009c6.721,6.723,10.898,16.002,10.898,26.207v17.844 v1.075h7.136c1.59,0,2.892,1.302,2.892,2.891v61.062c0,1.589-1.302,2.891-2.892,2.891H2.892c-1.59,0-2.892-1.302-2.892-2.891 V58.927C0,57.338,1.302,56.036,2.892,56.036L2.892,56.036z M26.271,56.036h45.387v-1.075V36.911c0-6.24-2.554-11.917-6.662-16.03 l-0.005,0.004c-4.111-4.114-9.787-6.669-16.025-6.669c-6.241,0-11.917,2.554-16.033,6.665c-4.109,4.113-6.662,9.79-6.662,16.03 v18.051V56.036L26.271,56.036z M49.149,89.448l4.581,21.139l-12.557,0.053l3.685-21.423c-3.431-1.1-5.918-4.315-5.918-8.111 c0-4.701,3.81-8.511,8.513-8.511c4.698,0,8.511,3.81,8.511,8.511C55.964,85.226,53.036,88.663,49.149,89.448L49.149,89.448z"/></g></svg>
\ No newline at end of file
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.108 122.88" xml:space="preserve" role="img" aria-hidden="true">
+  <g>
+    <path fill="#000" fill-rule="evenodd" clip-rule="evenodd" d="M2.892,56.036h8.959v-1.075V37.117c0-10.205,4.177-19.484,10.898-26.207v-0.009 C29.473,4.177,38.754,0,48.966,0C59.17,0,68.449,4.177,75.173,10.901l0.01,0.009c6.721,6.723,10.898,16.002,10.898,26.207v17.844 v1.075h7.136c1.59,0,2.892,1.302,2.892,2.891v61.062c0,1.589-1.302,2.891-2.892,2.891H2.892c-1.59,0-2.892-1.302-2.892-2.891 V58.927C0,57.338,1.302,56.036,2.892,56.036L2.892,56.036z M26.271,56.036h45.387v-1.075V36.911c0-6.24-2.554-11.917-6.662-16.03 l-0.005,0.004c-4.111-4.114-9.787-6.669-16.025-6.669c-6.241,0-11.917,2.554-16.033,6.665c-4.109,4.113-6.662,9.79-6.662,16.03 v18.051V56.036L26.271,56.036z M49.149,89.448l4.581,21.139l-12.557,0.053l3.685-21.423c-3.431-1.1-5.918-4.315-5.918-8.111 c0-4.701,3.81-8.511,8.513-8.511c4.698,0,8.511,3.81,8.511,8.511C55.964,85.226,53.036,88.663,49.149,89.448L49.149,89.448z"/>
+  </g>
+</svg>
diff --git a/assets/icons/map-marker.svg b/assets/icons/map-marker.svg
index abfbec3d..3bcf8721 100644
--- a/assets/icons/map-marker.svg
+++ b/assets/icons/map-marker.svg
@@ -1 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><svg width="44px" height="55px" viewBox="-3 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8.075 23.52c-6.811-9.878-8.075-10.891-8.075-14.52 0-4.971 4.029-9 9-9s9 4.029 9 9c0 3.629-1.264 4.64-8.075 14.516-.206.294-.543.484-.925.484s-.719-.19-.922-.48l-.002-.004z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="-3 0 24 24" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true">
+  <path fill="#000" d="m8.075 23.52c-6.811-9.878-8.075-10.891-8.075-14.52 0-4.971 4.029-9 9-9s9 4.029 9 9c0 3.629-1.264 4.64-8.075 14.516-.206.294-.543.484-.925.484s-.719-.19-.922-.48l-.002-.004z"/>
+</svg>
diff --git a/assets/icons/touchpoint.svg b/assets/icons/touchpoint.svg
index 92713b4b..d36e963b 100644
--- a/assets/icons/touchpoint.svg
+++ b/assets/icons/touchpoint.svg
@@ -1 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41.39 55"><defs><style>.b{fill:currentcolor;stroke-width:0px;}</style></defs><path class="b" d="M.14,18.28c-.09.79-.14,1.59-.14,2.4,0,4.82,1.65,9.25,4.42,12.76l14.54,21.56V12.77c-6.38.28-12.73,2.11-18.82,5.5Z"/><path class="b" d="M20.69,0C11.43,0,3.59,6.08.95,14.46c12.78-6.8,26.7-6.8,39.48,0C37.79,6.08,29.95,0,20.69,0Z"/><path class="b" d="M41.25,18.28c-6.07-3.38-12.42-5.21-18.78-5.5v28.5c10.6-.9,18.92-9.78,18.92-20.6,0-.81-.05-1.62-.14-2.4h0Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41.39 55" role="img" aria-hidden="true">
+  <path fill="#000" d="M.14,18.28c-.09.79-.14,1.59-.14,2.4,0,4.82,1.65,9.25,4.42,12.76l14.54,21.56V12.77c-6.38.28-12.73,2.11-18.82,5.5Z"/>
+  <path fill="#000" d="M20.69,0C11.43,0,3.59,6.08.95,14.46c12.78-6.8,26.7-6.8,39.48,0C37.79,6.08,29.95,0,20.69,0Z"/>
+  <path fill="#000" d="M41.25,18.28c-6.07-3.38-12.42-5.21-18.78-5.5v28.5c10.6-.9,18.92-9.78,18.92-20.6,0-.81-.05-1.62-.14-2.4h0Z"/>
+</svg>
diff --git a/assets/template/actions-style.css b/assets/template/actions-style.css
index 0124a10c..98204581 100644
--- a/assets/template/actions-style.css
+++ b/assets/template/actions-style.css
@@ -32,21 +32,34 @@ button[data-tp-action]:not([disabled]) {
 i.tenth-icons {
     margin: -2em 0;
 }
+
+/* Use the SVG as a mask so the icon can be colored via `currentColor`.
+   background-color determines the visible color of the masked SVG. */
 i.tenth-icons::before {
-    content: " ";
+    content: '';
     width: 1em;
     height: 1.2em;
     margin-top: -.25em;
     margin-bottom: -0.24em;
-    background-size: contain;
-    background-position: center;
-    background-repeat: no-repeat;
     display: inline-block;
-    fill: currentColor;
+    vertical-align: middle;
+    background-color: currentColor;
+    -webkit-mask-size: contain;
+    mask-size: contain;
+    -webkit-mask-position: center;
+    mask-position: center;
+    -webkit-mask-repeat: no-repeat;
+    mask-repeat: no-repeat;
 }
+
 i.tenth-icons.map-marker::before {
-    background-image: url("../icons/map-marker.svg")
+    -webkit-mask-image: url("../icons/map-marker.svg");
+    mask-image: url("../icons/map-marker.svg");
+    /*background-image: url("../icons/map-marker.svg");*/
 }
+
 i.tenth-icons.touchpoint-icon::before {
-    background-image: url("../icons/touchpoint.svg")
+    -webkit-mask-image: url("../icons/touchpoint.svg");
+    mask-image: url("../icons/touchpoint.svg");
+    /*background-image: url("../icons/touchpoint.svg");*/
 }
\ No newline at end of file

From 2c6508adc977a0f818f31af981980f8f89e27681 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 31 Mar 2026 23:24:08 -0400
Subject: [PATCH 373/423] typo

---
 assets/template/actions-style.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/assets/template/actions-style.css b/assets/template/actions-style.css
index 98204581..9f3dce0b 100644
--- a/assets/template/actions-style.css
+++ b/assets/template/actions-style.css
@@ -33,8 +33,6 @@ i.tenth-icons {
     margin: -2em 0;
 }
 
-/* Use the SVG as a mask so the icon can be colored via `currentColor`.
-   background-color determines the visible color of the masked SVG. */
 i.tenth-icons::before {
     content: '';
     width: 1em;
@@ -62,4 +60,4 @@ i.tenth-icons.touchpoint-icon::before {
     -webkit-mask-image: url("../icons/touchpoint.svg");
     mask-image: url("../icons/touchpoint.svg");
     /*background-image: url("../icons/touchpoint.svg");*/
-}
\ No newline at end of file
+}

From bc7ba8322cffa30aa267f19d49359c7fe4c723d0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 01:10:36 -0400
Subject: [PATCH 374/423] standardizing action buttons

---
 assets/js/base-defer.js           | 2 +-
 src/TouchPoint-WP/Auth.php        | 4 ++++
 src/TouchPoint-WP/Involvement.php | 5 ++++-
 src/TouchPoint-WP/Meeting.php     | 2 +-
 src/TouchPoint-WP/Partner.php     | 2 +-
 src/TouchPoint-WP/Person.php      | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 67f58ae7..59ce3ca3 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -1076,7 +1076,7 @@
 
         static initMap(mapDivId) {
             // if google.maps isn't defined yet, have this called again when it's ready.
-            if (typeof google === 'undefined' || typeof google.maps === 'undefined') {
+            if (typeof google === 'undefined' || typeof google.maps === 'undefined' || typeof google.maps.MapTypeId === "undefined") {
                 setTimeout(() => this.initMap(mapDivId), 100);
                 return;
             }
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index cc4c6906..a69f6c10 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -128,8 +128,12 @@ public static function printLoginLink(): void
 	{
 		$html = '<p class="touchpoint-wp-auth-form">';
 		$url = self::getLoginUrl();
+
+		TouchPointWP::enqueueActionsStyle('login-button');
+
 		/** @noinspection HtmlUnknownTarget */
 		$html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
+		$html .= "<i class=\"tenth-icons touchpoint-icon\"></i>&nbsp;&nbsp;";
 		$html .= sprintf(
 			// translators: %s is "what you call TouchPoint at your church", which is a setting
 			__('Sign in with %s', 'TouchPoint-WP'),
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 727b7ea4..5d1b9e83 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -4049,8 +4049,10 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false,
 				$link  = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId;
 				if (!$absoluteLinks) {
 					TouchPointWP::enqueueActionsStyle('inv-register');
+					return "<button type=\"button\" data-tp-action=\"register\" $btnClass onclick=\"window.location = '$link';\">$text</button>";
 				}
-				return "<a href=\"$link\" $btnClass>$text</a>  ";
+				return "<a href=\"$link\" $btnClass>$text</a>";
+
 
 			case RegistrationType::JOIN:
 				$text = __('Join', 'TouchPoint-WP');
@@ -4066,6 +4068,7 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false,
 				$link = $this->getRegistrationUrl();
 				if (!$absoluteLinks) {
 					TouchPointWP::enqueueActionsStyle('inv-register');
+					return "<button type=\"button\" data-tp-action=\"register-ext\" $btnClass onclick=\"window.open('$link', '_blank', 'noopener');\">$text</button>";
 				}
 				return "<a href=\"$link\" $btnClass>$text</a>  ";
 
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 1a65fc48..c962e072 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -804,7 +804,7 @@ public function getRsvpButton(string $btnClass = ""): string
 			$btnClass = "class=\"$btnClass\"";
 		}
 
-		return "<a href=\"#\" onclick=\"return false;\" $btnClass disabled data-tp-action=\"rsvp\" data-tp-mtg=\"$this->mtgId\"><span class=\"rsvp-btn-content\" style=\"display:none\">$link</span><span class=\"rsvp-btn-preload\">$preloadMsg</span></a>";
+		return "<button type=\"button\" $btnClass disabled data-tp-action=\"rsvp\" data-tp-mtg=\"$this->mtgId\"><span class=\"rsvp-btn-content\" style=\"display:none\">$link</span><span class=\"rsvp-btn-preload\">$preloadMsg</span></button>";
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 7e330a94..1b9b2cf4 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1355,7 +1355,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		// Show on map button.  (Only works if map is called before this is.)
 		if (self::$_hasArchiveMap && ! $this->decoupleLocation && $this->geo !== null && !$absoluteLinks) {
 			$text = __("Show on Map", "TouchPoint-WP");
-			$ret['map'] = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>  ";
+			$ret['map'] = "<button type=\"button\" data-tp-action=\"showOnMap\" $btnClass>$text</button>";
 		}
 
 		// TouchPoint link is excluded for privacy, and because we don't really have People IDs readily available.
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index e4a3e3d3..315659ea 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1264,11 +1264,11 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 			$text = __("Contact", "TouchPoint-WP");
 			$pid = $this->peopleId;
 			if (!$absoluteLinks) {
-				$ret['contact'] = "<button type=\"button\" data-tp-person=\"$pid\" data-tp-action=\"contact\" $btnClass>$text</button> ";
+				$ret['contact'] = "<button type=\"button\" data-tp-person=\"$pid\" data-tp-action=\"contact\" $btnClass>$text</button>";
 				TouchPointWP::enqueueActionsStyle('person-contact');
 				self::enqueueUsersForJsInstantiation();
 			} else {
-				$ret['contact'] = "<a href=\"$baseLink#tp-contact-p$pid\"$btnClass>$text</a> ";
+				$ret['contact'] = "<a href=\"$baseLink#tp-contact-p$pid\"$btnClass>$text</a>";
 			}
 		}
 

From 64c87faf7bebce6ad34865cfaa647c92c8d9b907 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 10:17:22 -0400
Subject: [PATCH 375/423] docs update

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index ddfe2b71..322b4792 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit ddfe2b7124d7dfcc72312160c90fc5bfbee54f4f
+Subproject commit 322b4792e8f1c4d521bf8584975a825a856b1206

From 4472d6e2e7b260900d35ccf5119da1d7e78c9364 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 12:56:13 -0400
Subject: [PATCH 376/423] Merge cleanup

---
 i18n/TouchPoint-WP-es_ES.po        | 39 +++++++++++++++---------------
 i18n/TouchPoint-WP.pot             | 39 +++++++++++++++---------------
 src/TouchPoint-WP/TouchPointWP.php | 22 +++++++++++------
 3 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 4cd4c977..4aff00da 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -307,24 +307,24 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2245
+#: src/TouchPoint-WP/TouchPointWP.php:2251
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2302
+#: src/TouchPoint-WP/TouchPointWP.php:2308
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2305
+#: src/TouchPoint-WP/TouchPointWP.php:2311
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2308
+#: src/TouchPoint-WP/TouchPointWP.php:2314
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2313
-#: src/TouchPoint-WP/TouchPointWP.php:2314
+#: src/TouchPoint-WP/TouchPointWP.php:2319
+#: src/TouchPoint-WP/TouchPointWP.php:2320
 msgid "Current Value"
 msgstr "Valor actual"
 
@@ -341,7 +341,7 @@ msgstr "Configuración de API no válida o incompleta."
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2528
+#: src/TouchPoint-WP/TouchPointWP.php:2534
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -1301,17 +1301,17 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:726
-#: src/TouchPoint-WP/TouchPointWP.php:1201
+#: src/TouchPoint-WP/TouchPointWP.php:1203
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
 #: src/TouchPoint-WP/Meeting.php:754
-#: src/TouchPoint-WP/TouchPointWP.php:443
+#: src/TouchPoint-WP/TouchPointWP.php:445
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
 #: src/TouchPoint-WP/Meeting.php:764
-#: src/TouchPoint-WP/TouchPointWP.php:452
+#: src/TouchPoint-WP/TouchPointWP.php:454
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
@@ -1440,7 +1440,7 @@ msgstr "Informe de TouchPoint"
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
 
-#: src/TouchPoint-WP/TouchPointWP.php:282
+#: src/TouchPoint-WP/TouchPointWP.php:283
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
@@ -1515,32 +1515,33 @@ msgstr "Contacto bloqueado por spam."
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
-#: src/TouchPoint-WP/TouchPointWP.php:312
+#: src/TouchPoint-WP/TouchPointWP.php:313
 msgctxt "Explanation for the sandwich emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "Sandwiches (probably cheesesteaks)"
 msgstr "Sándwiches (probablemente cheesesteaks)"
 
-#: src/TouchPoint-WP/TouchPointWP.php:313
+#: src/TouchPoint-WP/TouchPointWP.php:314
 msgctxt "Explanation for the heart emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "love. obviously."
 msgstr "amar. obviamente."
 
-#: src/TouchPoint-WP/TouchPointWP.php:314
+#: src/TouchPoint-WP/TouchPointWP.php:315
 msgctxt "Explanation for the pretzel emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "Soft Pretzels"
 msgstr "pretzels suaves"
 
-#: src/TouchPoint-WP/TouchPointWP.php:315
+#: src/TouchPoint-WP/TouchPointWP.php:316
 msgctxt "Explanation for the Donut emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "Donuts (preferably Federal)"
 msgstr "Donuts (preferiblemente de Federal)"
 
-#: src/TouchPoint-WP/TouchPointWP.php:323
+#. translators: This placeholder is filled by a food emoji. The food varies.
+#: src/TouchPoint-WP/TouchPointWP.php:325
 #, php-format
 msgid "Made with %s in Philly by Tenth"
 msgstr "Hecho con %s en Filadelfia por Tenth"
 
-#: src/TouchPoint-WP/TouchPointWP.php:347
+#: src/TouchPoint-WP/TouchPointWP.php:349
 msgid "Documentation"
 msgstr "Documentación"
 
@@ -1941,7 +1942,7 @@ msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2504
+#: src/TouchPoint-WP/TouchPointWP.php:2510
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
@@ -2097,4 +2098,4 @@ msgstr "Esta opción le permite filtrar las personas que se muestran en función
 
 #: src/TouchPoint-WP/Utilities.php:513
 msgid "Expand"
-msgstr ""
+msgstr "Expandir"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index d14fac73..f761e587 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-01T14:47:19+00:00\n"
+"POT-Creation-Date: 2026-04-01T16:54:41+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -651,17 +651,17 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:726
-#: src/TouchPoint-WP/TouchPointWP.php:1201
+#: src/TouchPoint-WP/TouchPointWP.php:1203
 msgid "Only GET requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:754
-#: src/TouchPoint-WP/TouchPointWP.php:443
+#: src/TouchPoint-WP/TouchPointWP.php:445
 msgid "Only POST requests are allowed."
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:764
-#: src/TouchPoint-WP/TouchPointWP.php:452
+#: src/TouchPoint-WP/TouchPointWP.php:454
 msgid "Invalid data provided."
 msgstr ""
 
@@ -1477,65 +1477,66 @@ msgstr ""
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:282
+#: src/TouchPoint-WP/TouchPointWP.php:283
 msgid "Every 15 minutes"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:312
+#: src/TouchPoint-WP/TouchPointWP.php:313
 msgctxt "Explanation for the sandwich emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "Sandwiches (probably cheesesteaks)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:313
+#: src/TouchPoint-WP/TouchPointWP.php:314
 msgctxt "Explanation for the heart emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "love. obviously."
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:314
+#: src/TouchPoint-WP/TouchPointWP.php:315
 msgctxt "Explanation for the pretzel emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "Soft Pretzels"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:315
+#: src/TouchPoint-WP/TouchPointWP.php:316
 msgctxt "Explanation for the Donut emoji in \"Made with (emoji) in Philly by Tenth\""
 msgid "Donuts (preferably Federal)"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:323
+#. translators: This placeholder is filled by a food emoji. The food varies.
+#: src/TouchPoint-WP/TouchPointWP.php:325
 #, php-format
 msgid "Made with %s in Philly by Tenth"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:347
+#: src/TouchPoint-WP/TouchPointWP.php:349
 msgid "Documentation"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2245
+#: src/TouchPoint-WP/TouchPointWP.php:2251
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2302
+#: src/TouchPoint-WP/TouchPointWP.php:2308
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2305
+#: src/TouchPoint-WP/TouchPointWP.php:2311
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2308
+#: src/TouchPoint-WP/TouchPointWP.php:2314
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2313
-#: src/TouchPoint-WP/TouchPointWP.php:2314
+#: src/TouchPoint-WP/TouchPointWP.php:2319
+#: src/TouchPoint-WP/TouchPointWP.php:2320
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2504
+#: src/TouchPoint-WP/TouchPointWP.php:2510
 msgid "People Count Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2528
+#: src/TouchPoint-WP/TouchPointWP.php:2534
 msgid "People Query Failed"
 msgstr ""
 
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index 4b4241ca..a7a9654d 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -5,6 +5,7 @@
 
 namespace tp\TouchPointWP;
 
+use JsonException;
 use stdClass;
 use tp\TouchPointWP\Blocks\BlocksController;
 use tp\TouchPointWP\Utilities\Cleanup;
@@ -320,6 +321,7 @@ public static function pluginRowMeta(array $pluginMeta, string $pluginFile, arra
 				'<a href="%s" target="_blank">%s</a>',
 				"https://www.tenth.org/tech/wp",
 				sprintf(
+					// translators: This placeholder is filled by a food emoji. The food varies.
 					__("Made with %s in Philly by Tenth", "TouchPoint-WP"),
 					sprintf(
 						'<span title="%s">%s</span>',
@@ -1758,10 +1760,10 @@ public function getMemberTypesForDivisions(array $divisions = [], bool $shortCac
 			$mtObj       = (object)[];
 		} else {
 			$mtObj = json_decode($mtObj);
-			$cacheTime = $shortCache ? self::CACHE_SHORT_TTL : self::CACHE_TTL;
+			$cacheTime = $shortCache ? self::CACHE_TTL_SHORT : self::CACHE_TTL;
 			if ( ! isset($mtObj->$divKey)) {
 				$needsUpdate = true;
-			} else if (strtotime($mtObj->$divKey->_updated) < time() - self::CACHE_TTL || ! is_array($mtObj->$divKey->memTypes)) {
+			} else if (strtotime($mtObj->$divKey->_updated) < time() - $cacheTime || ! is_array($mtObj->$divKey->memTypes)) {
 				$needsUpdate = true;
 			}
 		}
@@ -1827,7 +1829,7 @@ public function getDivisions(bool $shortCache = false): array
 			$needsUpdate = true;
 		} else {
 			$divsObj = json_decode($divsObj);
-			$cacheTime = $shortCache ? self::CACHE_SHORT_TTL : self::CACHE_TTL;
+			$cacheTime = $shortCache ? self::CACHE_TTL_SHORT : self::CACHE_TTL;
 			if (strtotime($divsObj->_updated) < time() - $cacheTime || ! is_array($divsObj->divs)) {
 				$needsUpdate = true;
 			}
@@ -1910,7 +1912,7 @@ private function getMemberTypesForInvolvements_fromApi(array $involvements): arr
 	 *
 	 * @returns object[]
 	 */
-	public function getResCodes(): array
+	public function getResCodes(bool $shortCache = false): array
 	{
 		$rcObj = $this->settings->get('meta_resCodes');
 
@@ -1919,7 +1921,8 @@ public function getResCodes(): array
 			$needsUpdate = true;
 		} else {
 			$rcObj = json_decode($rcObj);
-			if (strtotime($rcObj->_updated) < time() - self::CACHE_TTL || ! is_array($rcObj->resCodes)) {
+			$cacheTime = $shortCache ? self::CACHE_TTL_SHORT : self::CACHE_TTL;
+			if (strtotime($rcObj->_updated) < time() - $cacheTime || ! is_array($rcObj->resCodes)) {
 				$needsUpdate = true;
 			}
 		}
@@ -1943,9 +1946,11 @@ public function getResCodes(): array
 	/**
 	 * Returns an array of objects that correspond to campuses.  Each Campus has a name, a code, and an id.
 	 *
+	 * @param bool $shortCache Set to true to shorten the expiry on the campus cache.
+	 *
 	 * @returns object[]
 	 */
-	public function getCampuses(): array
+	public function getCampuses(bool $shortCache = false): array
 	{
 		$cObj = $this->settings->get('meta_campuses');
 
@@ -1954,7 +1959,8 @@ public function getCampuses(): array
 			$needsUpdate = true;
 		} else {
 			$cObj = json_decode($cObj);
-			if (strtotime($cObj->_updated) < time() - self::CACHE_TTL || ! is_array($cObj->campuses)) {
+			$cacheTime = $shortCache ? self::CACHE_TTL_SHORT : self::CACHE_TTL;
+			if (strtotime($cObj->_updated) < time() - $cacheTime || ! is_array($cObj->campuses)) {
 				$needsUpdate = true;
 			}
 		}
@@ -2060,7 +2066,7 @@ public function getKeywords(bool $shortCache = false): array
 			$needsUpdate = true;
 		} else {
 			$kObj = json_decode($kObj);
-			$cacheTime = $shortCache ? self::CACHE_SHORT_TTL : self::CACHE_TTL;
+			$cacheTime = $shortCache ? self::CACHE_TTL_SHORT : self::CACHE_TTL;
 			if (strtotime($kObj->_updated) < time() - $cacheTime || ! is_array($kObj->keywords)) {
 				$needsUpdate = true;
 			}

From fe53b28f788d3a5499975a9246a6d0e888a686ea Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 17 Dec 2025 13:13:02 -0500
Subject: [PATCH 377/423] cherry-pick:Starting process to allow involvement
 sync to be split into smaller chunks.

---
 src/TouchPoint-WP/Involvement.php  | 462 +++++++++++++++++++----------
 src/TouchPoint-WP/Stats.php        |  12 +-
 src/TouchPoint-WP/StatusWidget.php |  36 ++-
 3 files changed, 339 insertions(+), 171 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 5d1b9e83..fc816215 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -259,10 +259,12 @@ protected function __construct(object $object)
 
 	/**
 	 * Get the settings array of objects for Involvement Post Types
+     *
+     * Was previously protected, but that doesn't make sense since the underlying function isn't.
 	 *
 	 * @return Involvement_PostTypeSettings[]
 	 */
-	final protected static function &allTypeSettings(): array
+	final public static function &allTypeSettings(): array
 	{
 		return Involvement_PostTypeSettings::instance();
 	}
@@ -363,7 +365,7 @@ public static function checkUpdates(): void
 	 *
 	 * @return int False on failure, or the number of groups that were updated or deleted.
 	 */
-	public final static function updateFromTouchPoint(bool $verbose = false): int
+	public final static function updateFromTouchPoint(?string $typeSlug = null, bool $verbose = false, bool $applyChanges = true): int
 	{
 		$count   = 0;
 		$success = true;
@@ -371,9 +373,12 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 		$startTime = microtime(true);
 
 		// Prevent other threads from attempting for an hour.
-		TouchPointWP::instance()->settings->set('inv_cron_last_run', time() + 3600);
+		if ($applyChanges) {
+			TouchPointWP::instance()->settings->set('inv_cron_last_run', time() + 3600);
+		}
 
-		$verbose &= TouchPointWP::currentUserIsAdmin();
+		// Any user can preview changes, only admins can apply them.
+		$verbose &= TouchPointWP::currentUserIsAdmin() | (TouchPointWP::currentUserPerson() !== null && !$applyChanges);
 
 		ini_set('max_execution_time', 300);
 		ini_set('memory_limit', '512M');
@@ -383,6 +388,10 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 
 
 		foreach (self::allTypeSettings() as $type) {
+            // Skip those that aren't pertinent.
+            if ($typeSlug !== null && $type->slug !== $typeSlug) {
+                continue;
+            }
 
 			if ($verbose) {
 				echo "<h2>$type->namePlural</h2>";
@@ -400,7 +409,7 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 			$update = false;
 			try {
 				TouchPointWP::instance()->setTpWpUserAsCurrent();
-				$update = self::updateInvolvementPostsForType($type, $verbose);
+				$update = self::updateInvolvementPostsForType($type, $verbose, $applyChanges);
 			} catch (Exception $e) {
 				if ($verbose) {
 					echo "An exception occurred while syncing $type->namePlural: " . $e->getMessage();
@@ -423,10 +432,12 @@ public final static function updateFromTouchPoint(bool $verbose = false): int
 		}
 		unset($type);
 
-		if ($success && $count !== 0) {
-			TouchPointWP::instance()->settings->set('inv_cron_last_run', time());
-		} else {
-			TouchPointWP::instance()->settings->set('inv_cron_last_run', 0);
+		if ($applyChanges) {
+			if ($success && $count !== 0) {
+				TouchPointWP::instance()->settings->set('inv_cron_last_run', time());
+			} else {
+				TouchPointWP::instance()->settings->set('inv_cron_last_run', 0);
+			}
 		}
 
 		if ($verbose) {
@@ -825,15 +836,15 @@ public function nextMeeting(): ?DateTimeExtended
 	}
 
 	/**
-	 * @param $apiMeeting
+	 * @param \DateTimeInterface $apiMeeting
 	 *
 	 * @return bool
 	 *
 	 * TODO update with #184
 	 */
-	protected static function apiMeetingIsAllDay($apiMeeting): bool
+	protected static function apiMeetingIsAllDay($dateTime): bool
 	{
-		return $apiMeeting->mtgStartDt->format("His") === "000000";
+		return $dateTime->format("His") === "000000";
 	}
 
 
@@ -1670,7 +1681,7 @@ public static function listShortcode($params = [], string $content = ""): string
 
 	/**
 	 * Get the list of involvements through API endpoint.  This is used by the Involvement List Shortcode.
-	 * 
+	 *
 	 * @return void
 	 */
 	protected static function ajaxListShortcode(): void
@@ -2118,7 +2129,14 @@ public static function api(array $uri): bool
 
 			case "force-sync":
 				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
-				echo self::updateFromTouchPoint(true);
+				$type = $_GET['type'] ?? null;
+				echo self::updateFromTouchPoint($type, true);
+				exit;
+
+			case "preview-sync":
+				TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE);
+				$type = $_GET['type'] ?? null;
+				echo self::updateFromTouchPoint($type, true, false);
 				exit;
 		}
 
@@ -2611,7 +2629,7 @@ public function hasGeo(): bool
 			return false;
 		}
 
-		return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null && 
+		return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null &&
 		       is_numeric($this->geo->lat) && is_numeric($this->geo->lng);
 	}
 
@@ -2634,10 +2652,11 @@ public function asGeoIFace(string $type = "unknown"): ?Geo
 	 *
 	 * @param Involvement_PostTypeSettings $typeSets
 	 * @param bool                         $verbose
+	 * @param bool                         $applyChanges
 	 *
 	 * @return false|int  False on failure.  Otherwise, the number of updates.
 	 */
-	final protected static function updateInvolvementPostsForType(Involvement_PostTypeSettings $typeSets, bool $verbose): bool|int
+	final protected static function updateInvolvementPostsForType(Involvement_PostTypeSettings $typeSets, bool $verbose, bool $applyChanges = true): bool|int
 	{
 		$siteTz = wp_timezone();
 
@@ -2805,21 +2824,25 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			$inv->titleToUse = trim($inv->titleToUse);
 
 			if ($post === null) {
-				$post = wp_insert_post(
-					[ // create new
-						'post_type'  => $typeSets->postType,
-						'post_title' => $inv->titleToUse,
-						'post_name'  => $inv->titleToUse,
-						'post_status' => 'publish',
-						'meta_input' => [
-							TouchPointWP::INVOLVEMENT_META_KEY => $inv->involvementId
+				if ($applyChanges) {
+					$post = wp_insert_post(
+						[ // create new
+							'post_type'   => $typeSets->postType,
+							'post_title'  => $inv->titleToUse,
+							'post_name'   => $inv->titleToUse,
+							'post_status' => 'publish',
+							'meta_input'  => [
+								TouchPointWP::INVOLVEMENT_META_KEY => $inv->involvementId
+							]
 						]
-					]
-				);
-				$post = get_post($post);
+					);
+					$post = get_post($post);
+				} elseif ($verbose) {
+					echo "<p>Would create new Post for Involvement {$inv->involvementId} ({$inv->titleToUse}).</p>";
+				}
 			}
 
-			$postsToKeep =  [...$postsToKeep, ...Involvement::doPostUpdate($post, $inv, $typeSets, $verbose)];
+			$postsToKeep =  [...$postsToKeep, ...Involvement::doPostUpdate($post, $inv, $typeSets, $verbose, $applyChanges)];
 			$postsToKeep[] = $post->ID;
 		}
 		unset($inv);
@@ -2844,7 +2867,9 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 		$removals = 0;
 		foreach ($q->get_posts() as $post) {
 			set_time_limit(10);
-			wp_delete_post($post->ID, true);
+			if ($applyChanges) {
+				wp_delete_post($post->ID, true);
+			}
 			$removals++;
 		}
 
@@ -2862,16 +2887,21 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 	 * @param object                       $inv
 	 * @param Involvement_PostTypeSettings $typeSets
 	 * @param bool                         $verbose
+	 * @param bool                         $applyChanges
 	 *
 	 * @return int[] A list of Post IDs that should be kept.
 	 */
-	protected static function doPostUpdate($post, object $inv, Involvement_PostTypeSettings $typeSets, bool $verbose = false): array
+	protected static function doPostUpdate($post, object $inv, Involvement_PostTypeSettings $typeSets, bool $verbose = false, bool $applyChanges = true): array
 	{
 		if ($post instanceof WP_Error) {
 			new TouchPointWP_WPError($post);
 			return [];
 		}
 
+		if (!$applyChanges && $post === null) {
+			$post = new WP_Post((object)[]); // Create an empty placeholder to dry-run the logic.
+		}
+
 		if ($post === null) {
 			new TouchPointWP_Exception("Post could not be found or created.", 171001);
 			return [];
@@ -2919,41 +2949,43 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 
 		// Status & Submit
 		$post->post_status = 'publish';
-		wp_update_post($post);
-
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "locationName", $inv->location);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "memberCount", $inv->memberCount);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "genderId", $inv->genderId);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupFull", !!$inv->groupFull);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupClosed", !!$inv->closed);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", !!$inv->hasRegQuestions);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regUrl", $inv->redirectUrl);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regTypeId", intval($inv->regTypeId));
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", intval($inv->siteRegTypeId));
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", !!$inv->hasRegQuestions);
-
+		if ($applyChanges) {
+			wp_update_post($post);
 
-		// Registration start
-		if ($inv->regStart === null) {
-			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart");
-		} else {
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart", $inv->regStart);
-		}
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "locationName", $inv->location);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "memberCount", $inv->memberCount);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "genderId", $inv->genderId);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupFull", ! ! $inv->groupFull);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupClosed", ! ! $inv->closed);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", ! ! $inv->hasRegQuestions);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regUrl", $inv->redirectUrl);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regTypeId", intval($inv->regTypeId));
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", intval($inv->siteRegTypeId));
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", ! ! $inv->hasRegQuestions);
+
+
+			// Registration start
+			if ($inv->regStart === null) {
+				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart");
+			} else {
+				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regStart", $inv->regStart);
+			}
 
-		// Registration end
-		if ($inv->regEnd === null) {
-			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd");
-		} else {
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd", $inv->regEnd);
-		}
+			// Registration end
+			if ($inv->regEnd === null) {
+				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd");
+			} else {
+				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regEnd", $inv->regEnd);
+			}
 
-		// Update image, if appropriate.
-		$imageUrl = "";
-		if (!!$typeSets->useImages) {
-			$imageUrl = $inv->imageUrl;
+			// Update image, if appropriate.
+			$imageUrl = "";
+			if ( ! ! $typeSets->useImages) {
+				$imageUrl = $inv->imageUrl;
+			}
 		}
 
-		$imageId = Utilities::updatePostImageFromUrl($post->ID, $imageUrl, $post->post_title, $verbose);
+		$imageId = Utilities::updatePostImageFromUrl($post->ID ?? 0, $imageUrl, $post->post_title, $verbose, $applyChanges);
 
 		////////////////////
 		//// SCHEDULING ////
@@ -3000,13 +3032,15 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 		if ($inv->firstMeeting !== null && $inv->firstMeeting < Utilities::dateTimeNow()) { // First meeting already happened.
 			$inv->firstMeeting = null; // We don't need to list info from the past.
 		}
-		if ($inv->firstMeeting === null) {
-			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting");
-		} else {
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting", $inv->firstMeeting);
+		if ($applyChanges) {
+			if ($inv->firstMeeting === null) {
+				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting");
+			} else {
+				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting", $inv->firstMeeting);
+			}
 		}
 
-		// Determine if there are meetings beyond the end date, and if so, nullify the end date
+		// Determine if there are meetings beyond the end date, and if so, nullify the end date  TODO figure out if this is a good idea or not. Possibly repeated below?
 		if ($inv->lastMeeting !== null) {
 			foreach ($inv->meetings as $m) {
 				if ($m->mtgStartDt > $inv->lastMeeting) {
@@ -3018,38 +3052,50 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 		if ($inv->lastMeeting !== null && $inv->lastMeeting > Utilities::dateTimeNowPlus1Y()) { // Last mtg is > 1yr away
 			$inv->lastMeeting = null; // For all practical purposes: it's not ending.
 		}
-		if ($inv->lastMeeting === null) {
-			delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting");
-		} else {
-			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting", $inv->lastMeeting);
+		if ($applyChanges) {
+			if ($inv->lastMeeting === null) {
+				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting");
+			} else {
+				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting", $inv->lastMeeting);
+			}
 		}
 
 		// Clear Cached Schedule String
 		$cacheKey = $inv->involvementId . "_" . get_locale();
-		wp_cache_delete($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP);
+		if ($applyChanges) {
+			wp_cache_delete($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP);
+		}
 
 		// Tense
 		if ($inv->firstMeeting !== null) {
 			$tense = Taxonomies::TAX_TENSE_FUTURE;
 		}
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		wp_set_post_terms($post->ID, [$tense], Taxonomies::TAX_TENSE, false);
+		if ($applyChanges) {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, [$tense], Taxonomies::TAX_TENSE, false);
+		}
 
 		// Update meetings and schedules
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "meetings", $inv->meetings);
-		update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "schedules", $inv->schedules);
+		if ($applyChanges) {
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "meetings", $inv->meetings);
+			update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "schedules", $inv->schedules);
+		}
 
 		// Day of week taxonomy
 		$dayTerms = [];
 		foreach ($days as $k => $d) {
 			$dayTerms[] = Utilities::getDayOfWeekShortForNumber_noI18n(intval($k[1]));
 		}
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		wp_set_post_terms($post->ID, $dayTerms, Taxonomies::TAX_WEEKDAY, false);
+		if ($applyChanges) {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, $dayTerms, Taxonomies::TAX_WEEKDAY, false);
+		}
 
 		// Time of day taxonomy
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		wp_set_post_terms($post->ID, $timeTerms, Taxonomies::TAX_DAYTIME, false);
+		if ($applyChanges) {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, $timeTerms, Taxonomies::TAX_DAYTIME, false);
+		}
 
 
 		////////////////
@@ -3067,20 +3113,28 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 			// Handle locations
 			if (property_exists($inv, "lat") && $inv->lat !== null &&
 			    property_exists($inv, "lng") && $inv->lng !== null) {
-				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat);
-				update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng);
+				if ($applyChanges) {
+					update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat);
+					update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng);
+				}
 			} else {
-				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat");
-				delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng");
+				if ($applyChanges) {
+					delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat");
+					delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng");
+				}
 			}
 
 			// Handle Resident Code
 			if (property_exists($inv, "resCodeName") && $inv->resCodeName !== null) {
-				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, [$inv->resCodeName], Taxonomies::TAX_RESCODE, false);
+				if ($applyChanges) {
+					/** @noinspection PhpRedundantOptionalArgumentInspection */
+					wp_set_post_terms($post->ID, [$inv->resCodeName], Taxonomies::TAX_RESCODE, false);
+				}
 			} else {
-				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, [], Taxonomies::TAX_RESCODE, false);
+				if ($applyChanges) {
+					/** @noinspection PhpRedundantOptionalArgumentInspection */
+					wp_set_post_terms($post->ID, [], Taxonomies::TAX_RESCODE, false);
+				}
 			}
 		}
 
@@ -3091,11 +3145,15 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 
 		if (TouchPointWP::instance()->settings->enable_campuses === "on") {
 			if (property_exists($inv, "campusName") && $inv->campusName !== null) {
-				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, [$inv->campusName], Taxonomies::TAX_CAMPUS, false);
+				if ($applyChanges) {
+					/** @noinspection PhpRedundantOptionalArgumentInspection */
+					wp_set_post_terms($post->ID, [$inv->campusName], Taxonomies::TAX_CAMPUS, false);
+				}
 			} else {
-				/** @noinspection PhpRedundantOptionalArgumentInspection */
-				wp_set_post_terms($post->ID, [], Taxonomies::TAX_CAMPUS, false);
+				if ($applyChanges) {
+					/** @noinspection PhpRedundantOptionalArgumentInspection */
+					wp_set_post_terms($post->ID, [], Taxonomies::TAX_CAMPUS, false);
+				}
 			}
 
 			if (Translation::useCampusAsLanguage() && $inv->campusName !== null) {
@@ -3110,7 +3168,9 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 						'source_language_code' => $langCode,
 						'trid'                 => $post->ID
 					];
-					do_action( 'wpml_set_element_language_details', $args);
+					if ($applyChanges) {
+						do_action('wpml_set_element_language_details', $args);
+					}
 					if ($verbose) {
 						echo "<p>Language Set to: $langCode</p>";
 					}
@@ -3133,16 +3193,20 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 				$maritalTax[] = "mostly_single";
 			}
 		}
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		wp_set_post_terms($post->ID, $maritalTax, Taxonomies::TAX_INV_MARITAL, false);
+		if ($applyChanges) {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, $maritalTax, Taxonomies::TAX_INV_MARITAL, false);
+		}
 
 		// Handle Age Groups
-		if ($inv->age_groups === null) {
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, [], Taxonomies::TAX_AGEGROUP, false);
-		} else {
-			/** @noinspection PhpRedundantOptionalArgumentInspection */
-			wp_set_post_terms($post->ID, $inv->age_groups, Taxonomies::TAX_AGEGROUP, false);
+		if ($applyChanges) {
+			if ($inv->age_groups === null) {
+				/** @noinspection PhpRedundantOptionalArgumentInspection */
+				wp_set_post_terms($post->ID, [], Taxonomies::TAX_AGEGROUP, false);
+			} else {
+				/** @noinspection PhpRedundantOptionalArgumentInspection */
+				wp_set_post_terms($post->ID, $inv->age_groups, Taxonomies::TAX_AGEGROUP, false);
+			}
 		}
 
 
@@ -3160,8 +3224,10 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 				}
 			}
 		}
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		wp_set_post_terms($post->ID, $divs, Taxonomies::TAX_DIV, false);
+		if ($applyChanges) {
+			/** @noinspection PhpRedundantOptionalArgumentInspection */
+			wp_set_post_terms($post->ID, $divs, Taxonomies::TAX_DIV, false);
+		}
 
 		if ($verbose) {
 			echo "<p>Division Terms:</p>";
@@ -3173,7 +3239,7 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 		//// Meetings ////
 		//////////////////
 
-		$postsToKeep = self::updateMeetingsForInvolvement($post, $inv, $typeSets, $imageId, $verbose);
+		$postsToKeep = self::updateMeetingsForInvolvement($post, $inv, $typeSets, $imageId, $verbose, $applyChanges);
 
 		if ($verbose) {
 			echo "<hr />";
@@ -3246,22 +3312,24 @@ protected static function computeSlugs(iterable $set, $inv, $includeTitle = fals
 	}
 
 	/**
-	 * @param WP_Post|object               $post  The parent post, which could be a group or Meeting.
-	 * @param object                       $inv   The involvement object from the API.
+	 * @param object                       $post The parent post, which could be a group or Meeting.
+	 * @param object                       $inv The involvement object from the API.
 	 * @param Involvement_PostTypeSettings $typeSets
 	 * @param int                          $imagePostId
 	 * @param bool                         $verbose
+	 * @param bool                         $applyChanges
 	 *
 	 * @return int[] An array of Post IDs that have been updated, and which should be retained.
 	 */
 	protected static function updateMeetingsForInvolvement(
 		object $post, object $inv, Involvement_PostTypeSettings $typeSets,
-		int $imagePostId, bool $verbose = false): array
+		int $imagePostId, bool $verbose = false, bool $applyChanges = true): array
 	{
 
 		// Return if meetings shouldn't be imported at all.
 		if (!$typeSets->importMeetings && !$inv->showInSites) {
-			self::doMeetingMetaUpdates($post, null, false, $verbose);
+			/** @var $post WP_Post */
+			self::doMeetingMetaUpdates($post, null, false, $verbose, $applyChanges);
 			return [$post->ID];
 		}
 
@@ -3280,7 +3348,8 @@ protected static function updateMeetingsForInvolvement(
 		if ($strategy === self::MEETING_STRATEGY_MULTIPLE) {
 
 			// If the main post was previously a single, it needs to have the meeting info removed.
-			self::doMeetingMetaUpdates($post, null, false, $verbose);
+			/** @var $post WP_Post */
+			self::doMeetingMetaUpdates($post, null, false, $verbose, $applyChanges);
 
 			// Group meetings together if they're adjacent and settings allow.
 			$doGrouping = match($typeSets->meetingGroupingMethod) {
@@ -3323,7 +3392,7 @@ protected static function updateMeetingsForInvolvement(
 
 				// A Meeting group, if it exists.
 				if ($groupingActive) {
-					$groupPost = self::updateMeeting($g, $inv, $typeSets, $post, $imagePostId, $verbose);
+					$groupPost = self::updateMeeting($g, $inv, $typeSets, $post, $imagePostId, $verbose, $applyChanges);
 					if ($groupPost) {
 						$postsToKeep[] = $groupPost->ID;
 					}
@@ -3338,7 +3407,7 @@ protected static function updateMeetingsForInvolvement(
 						$mtgO->slugToUse     = $g->slugToUse;
 						$mtgO->titleToUse    = $mtgO->name ?? $g->titleToUse;
 					}
-					$updatedPost = self::updateMeeting($mtgO, $inv, $typeSets, $groupPost ?? $post, $imagePostId, $verbose);
+					$updatedPost = self::updateMeeting($mtgO, $inv, $typeSets, $groupPost ?? $post, $imagePostId, $verbose, $applyChanges);
 					if ($updatedPost) {
 						$postsToKeep[] = $updatedPost->ID;
 					}
@@ -3354,12 +3423,16 @@ protected static function updateMeetingsForInvolvement(
 			// TODO resolve Undefined array key 0 warning
 			// TODO make sure synced
 			if ($strategy === self::MEETING_STRATEGY_SINGLE) {
-				self::doMeetingMetaUpdates($post, $inv->meetings[0], !!$inv->showInSites, $verbose);
+				/** @var $post WP_Post */
+				self::doMeetingMetaUpdates($post, $inv->meetings[0], !!$inv->showInSites, $verbose, $applyChanges);
 			} else { // MEETING_STRATEGY_NONE
-				self::doMeetingMetaUpdates($post, null, false, $verbose);
+				/** @var $post WP_Post */
+				self::doMeetingMetaUpdates($post, null, false, $verbose, $applyChanges);
 			}
 
-			wp_update_post($post);
+			if ($applyChanges) {
+				wp_update_post($post);
+			}
 
 			$postsToKeep[] = $post->ID;
 		}
@@ -3371,18 +3444,18 @@ protected static function updateMeetingsForInvolvement(
 	/**
 	 * Update a meeting post, or create it if it doesn't exist.
 	 *
-	 * @param Interfaces\apiMeeting $mtgO
-	 * @param object                $inv
-	 * @param array                 $slugFormats
-	 * @param array                 $slugStrategy
+	 * @param Interfaces\apiMeeting        $mtgO
+	 * @param object                       $inv
 	 * @param Involvement_PostTypeSettings $typeSets
-	 * @param ?WP_Post              $parentPost
-	 * @param int                   $imagePostId
-	 * @param bool                  $verbose
+	 * @param ?WP_Post                     $parentPost
+	 * @param int                          $imagePostId
+	 * @param bool                         $verbose
+	 * @param bool                         $applyChanges
 	 *
 	 * @return ?WP_Post
 	 */
-	protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $imagePostId, $verbose): ?WP_Post
+	protected static function updateMeeting(object $mtgO, object $inv, Involvement_PostTypeSettings $typeSets,
+		?WP_Post $parentPost, int $imagePostId, bool $verbose = false, bool $applyChanges = true): ?WP_Post
 	{
 		/////////////////////////////////
 		// Find or Create Meeting Post //
@@ -3412,6 +3485,9 @@ protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $im
 					echo "<p><b>Multiple Posts Exist.  An attempt will be made to remove them.</b></p>";
 				}
 
+				if (!$applyChanges) { // dont' loop forever, or do any deletions.
+					break;
+				}
 				for ($i = 1; $i <= $counts; $i++) {
 					wp_delete_post($mtgP[$i]->ID, true);
 				}
@@ -3432,18 +3508,25 @@ protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $im
 			if ($verbose) {
 				echo "<p>Post not found for Meeting $mtgO->mtgId.  Creating.</p>";
 			}
-			// create new
-			$mtgP = wp_insert_post([
-				                       'post_type'   => $typeSets->postTypeWithPrefix(),
-				                       'post_title'  => $mtgO->titleToUse,
-				                       'post_name'   => $mtgO->slugToUse,
-				                       'post_parent' => $parentPost->ID,
-				                       'post_status' => 'publish',
-				                       'meta_input'  => [
-					                       Meeting::MEETING_META_KEY => $mtgO->mtgId
-				                       ]
-			                       ]);
-			$mtgP = get_post($mtgP);
+			if ($applyChanges) {
+				// create new
+				$mtgP = wp_insert_post([
+					                       'post_type'   => $typeSets->postTypeWithPrefix(),
+					                       'post_title'  => $mtgO->titleToUse,
+					                       'post_name'   => $mtgO->slugToUse,
+					                       'post_parent' => $parentPost->ID,
+					                       'post_status' => 'publish',
+					                       'meta_input'  => [
+						                       Meeting::MEETING_META_KEY => $mtgO->mtgId
+					                       ]
+				                       ]);
+				$mtgP = get_post($mtgP);
+			} else {
+				if ($verbose) {
+					echo "<p>Would create new Post for Meeting {$mtgO->mtgId} ({$mtgO->titleToUse}).</p>";
+				}
+				$mtgP = new WP_Post((object)[]); // Create an empty placeholder to dry-run the logic.
+			}
 		}
 
 		$mtgP->post_title = $mtgO->titleToUse;
@@ -3456,18 +3539,21 @@ protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $im
 		}
 		$mtgP->post_parent = $parentPost->ID;
 
-		self::doMeetingMetaUpdates($mtgP, $mtgO, ! ! $inv->showInSites, $verbose);
+		self::doMeetingMetaUpdates($mtgP, $mtgO, ! ! $inv->showInSites, $verbose, $applyChanges);
 
-		wp_update_post($mtgP);
+		if ($applyChanges) {
+			wp_update_post($mtgP);
 
-		if ($imagePostId > 0) {
-			set_post_thumbnail($mtgP->ID, $imagePostId);
-		} else {
-			delete_post_thumbnail($mtgP->ID);
-		}
 
-		if ($mtgP->post_name !== $mtgO->slugToUse) {
-			Utilities::forceSlugUpdate($mtgP->ID, $mtgO->slugToUse);
+			if ($imagePostId > 0) {
+				set_post_thumbnail($mtgP->ID, $imagePostId);
+			} else {
+				delete_post_thumbnail($mtgP->ID);
+			}
+
+			if ($mtgP->post_name !== $mtgO->slugToUse) {
+				Utilities::forceSlugUpdate($mtgP->ID, $mtgO->slugToUse);
+			}
 		}
 
 		return $mtgP;
@@ -3483,33 +3569,46 @@ protected static function updateMeeting($mtgO, $inv, $typeSets, $parentPost, $im
 	 * @param ?object $mtgO
 	 * @param bool    $feature
 	 * @param bool    $verbose
+	 * @param bool    $applyChanges
 	 *
 	 * @return void
 	 */
-	protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, bool $feature, bool $verbose = false): void
+	protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, bool $feature, bool $verbose = false, bool $applyChanges = true): void
 	{
 		// If the main post was previously a single, it needs to have the meeting info removed.
 		if ($mtgO === null) {
-			delete_post_meta($mtgP->ID, Meeting::MEETING_META_KEY);
-			delete_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY);
-			delete_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY);
-			delete_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY);
-			delete_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY);
-			delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
-			delete_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER);
+			if ($applyChanges) {
+				delete_post_meta($mtgP->ID, Meeting::MEETING_META_KEY);
+				delete_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY);
+				delete_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY);
+				delete_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY);
+				delete_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY);
+				delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY);
+				delete_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER);
+			}
 		} else {
-			$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow();
-
-			update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId);
-			update_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY, DateFormats::timestampWithoutOffset($mtgO->mtgStartDt));
-			update_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY, DateFormats::timestampWithoutOffset($mtgO->mtgEndDt));
-			update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, !!$feature);
-			update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
-			update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
-			update_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER, 1 * isset($mtgO->isGroupMember));
+			if ($applyChanges) {
+				$eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow();
+
+				update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId);
+				update_post_meta(
+					$mtgP->ID,
+					Meeting::MEETING_START_META_KEY,
+					DateFormats::timestampWithoutOffset($mtgO->mtgStartDt)
+				);
+				update_post_meta(
+					$mtgP->ID,
+					Meeting::MEETING_END_META_KEY,
+					DateFormats::timestampWithoutOffset($mtgO->mtgEndDt)
+				);
+				update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, ! ! $feature);
+				update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId);
+				update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status));
+				update_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER, 1 * isset($mtgO->isGroupMember));
 
-			if ($mtgO->location !== null && !$eventIsPast) {
-				update_post_meta($mtgP->ID, Meeting::MEETING_LOCATION_META_KEY, $mtgO->location);
+				if ($mtgO->location !== null && ! $eventIsPast) {
+					update_post_meta($mtgP->ID, Meeting::MEETING_LOCATION_META_KEY, $mtgO->location);
+				}
 			}
 
 			if ($verbose) {
@@ -3532,6 +3631,9 @@ protected static function standardizeApiData(object $inv, DateTimeZone $siteTz,
 			Utilities::var_dump_expandable($inv);
 		}
 
+		// TODO convert firstMeeting, lastMeeting and schedules to RRules
+
+
 		// Start and end dates
 		if ($inv->firstMeeting !== null) {
 			try {
@@ -3564,6 +3666,39 @@ protected static function standardizeApiData(object $inv, DateTimeZone $siteTz,
 				unset($inv->schedules[$i]);
 			}
 		}
+
+		// TODO: extract end of meeting series from RRule and set involvement last meeting appropriately.
+		// TODO: extract start of meeting series from series (not rrule necessarily) and set involvement first meeting appropriately.
+		// TODO: figure out how to make meetings and series related, perhaps?
+		// TODO: calculate recurrence better.
+
+//		$rset = new RSet();
+//		foreach ($inv->meetingSeries as $i => $ms) {
+//			try {
+//				if ($ms->seriesStartDt === $ms->seriesEndDt || $ms->seriesEndDt == null) {
+//					$ms->seriesEndDt = null;
+//				} else {
+//					$ms->seriesEndDt = new DateTimeExtended($ms->seriesEndDt, $siteTz);
+//				}
+//				$ms->seriesStartDt = new DateTimeExtended($ms->seriesStartDt, $siteTz);
+//				$ms->seriesStartDt->isAllDay = self::apiMeetingIsAllDay($ms->seriesStartDt);
+//
+//				$ms->rro = RRule::createFromRfcString($ms->rRuleString ?? "");
+//				$rset->addRRule($ms->rro);
+//
+//				var_dump($ms->rro);
+//				var_dump($ms->rro->humanReadable());
+//				echo "<hr/>";
+//
+//			} catch (Exception) {
+//				unset($inv->meetingSeries[$i]);
+//			}
+//
+//			if ($ms->name == null || trim($ms->name) === "") {
+//				$ms->name = null;
+//			}
+//		}
+
 		foreach ($inv->meetings as $i => $m) {
 			try {
 				if ($m->mtgStartDt === $m->mtgEndDt || $m->mtgEndDt == null) {
@@ -3572,7 +3707,12 @@ protected static function standardizeApiData(object $inv, DateTimeZone $siteTz,
 					$m->mtgEndDt = new DateTimeExtended($m->mtgEndDt, $siteTz);
 				}
 				$m->mtgStartDt = new DateTimeExtended($m->mtgStartDt, $siteTz);
-				$m->mtgStartDt->isAllDay = self::apiMeetingIsAllDay($m);
+				$m->mtgStartDt->isAllDay = self::apiMeetingIsAllDay($m->mtgStartDt);
+
+				// if meetings exist beyond lastMeeting, nullify lastMeeting
+				if ($inv->lastMeeting !== null && $m->mtgStartDt > $inv->lastMeeting) {
+					$inv->lastMeeting = null;
+				}
 			} catch (Exception) {
 				unset($inv->meetings[$i]);
 			}
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index bec3652c..c3daa026 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -50,6 +50,7 @@ class Stats implements api, \JsonSerializable, updatesViaCron
 	protected int $rsvps = 0;
 	protected int $people = 0; // updated by query
 	protected int $partnerPosts = 0; // updated by query
+	protected array $involvementCounts = []; // updated by query
 	protected int $userAuths = 0;
 	protected int $softAuths = 0;
 
@@ -384,10 +385,17 @@ protected function updateQueriedStats(): void
 		global $wpdb;
 
 		$this->involvementPosts = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_invId'") ?? -1;
-		$this->reportPosts      = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_report'") ?? -1;
+		$this->reportPosts      = $wpdb->get_var("SELECT COUNT(DISTINCT ID) as c FROM $wpdb->posts WHERE post_type = 'tp_report'") ?? -1;
 		$this->meetings         = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_mtgId'") ?? -1;
 		$this->people           = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->usermeta WHERE meta_key = 'tp_peopleId';") ?? -1;
-		$this->partnerPosts     = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
+		$this->partnerPosts     = $wpdb->get_var("SELECT COUNT(DISTINCT ID) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1;
+
+		$invCounts = [];
+		$invQuery = "SELECT COUNT(DISTINCT pm.meta_value) as c FROM $wpdb->postmeta pm JOIN $wpdb->posts p ON pm.post_id = p.ID WHERE pm.meta_key = 'tp_invId' AND p.post_type = %s";
+		foreach (Involvement::getPostTypes() as $type) {
+			$invCounts[$type] = intval($wpdb->get_var($wpdb->prepare($invQuery, $type))) ?? 0;
+		}
+		$this->involvementCounts = $invCounts;
 
 		$this->_dirty = true;
 
diff --git a/src/TouchPoint-WP/StatusWidget.php b/src/TouchPoint-WP/StatusWidget.php
index 95cfb153..a4a373b9 100644
--- a/src/TouchPoint-WP/StatusWidget.php
+++ b/src/TouchPoint-WP/StatusWidget.php
@@ -33,7 +33,7 @@ public static function init(): void
 	}
 
 	/**
-	 * Setup the dashboard widget.
+	 * Set up the dashboard widget.
 	 */
 	public static function dashboardSetup(): void
 	{
@@ -98,26 +98,46 @@ public static function render(): void
 		echo "<th>" . __("Imported", "TouchPoint-WP") . "</th>";
 		echo "<th>" . __("Last Updated", "TouchPoint-WP") . "</th></tr>";
 
-		echo '<tr><th style="text-align:left;">People</th><td style="text-align:center;">' . $stats->people . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->person_cron_last_run) . "</td></tr>";
+		$label = __("People", "TouchPoint-WP");
+		$ts = self::timestampToFormated($settings->person_cron_last_run);
+		echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->people</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 		if ($settings->enable_involvements === "on") {
-			echo '<tr><th style="text-align:left;">Involvements</th><td style="text-align:center;">' . $stats->involvementPosts . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->inv_cron_last_run) . "</td></tr>";
+			$label = __('Involvements', 'TouchPoint-WP');
+			$ts = self::timestampToFormated($settings->inv_cron_last_run);
+			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->involvementPosts</td><td style=\"text-align:center;\">$ts</td></tr>";
+
+			foreach (Involvement::allTypeSettings() as $type) {
+				$count = $stats->involvementCounts[$type->postTypeWithPrefix()] ?? 0;
+				$ts = self::timestampToFormated($settings->inv_cron_last_run); // TODO
+				echo "<tr><th style=\"text-align:left; padding-left:1em;\">$type->namePlural</th><td style=\"text-align:center;\">$count</td><td style=\"text-align:center;\">$ts</td></tr>";
+			}
 		}
 
 		if ($settings->enable_meeting_cal === "on") {
-			echo '<tr><th style="text-align:left;">Meetings</th><td style="text-align:center;">' . $stats->meetings . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->inv_cron_last_run) . "</td></tr>";
+			$label = __('Meetings', 'TouchPoint-WP');
+			// TODO replace timestamp with event-type timestamp
+			$ts = self::timestampToFormated($settings->inv_cron_last_run);
+			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->meetings</td><td style=\"text-align:center;\">$ts</td></tr>";
 		}
 
 		if ($settings->enable_global === "on") {
-			echo '<tr><th style="text-align:left;">Partners</th><td style="text-align:center;">' . $stats->partnerPosts . '</td><td style="text-align:center;">' . self::timestampToFormated($settings->global_cron_last_run) . "</td></tr>";
+			$label = __('Partners', 'TouchPoint-WP');
+			$ts = self::timestampToFormated($settings->global_cron_last_run);
+			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->partnerPosts</td><td style=\"text-align:center;\">$ts</td></tr>";
 		}
 
-		echo '<tr><th style="text-align:left;">Reports</th><td style="text-align:center;">' . $reportData->cnt . '</td><td style="text-align:center;">' . self::timestampToFormated($reportData->ts) . "</td></tr>";
+		$label = __('Reports', 'TouchPoint-WP');
+		$ts = self::timestampToFormated($reportData->ts);
+		echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$reportData->cnt</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 		echo "</table>";
 
-		echo '<div style="text-align: right;">Version ' . TouchPointWP::VERSION . "</div>";
+		// Translators: %s is the current version number.
+		$label = __("Version: %s", "TouchPoint-WP");
+		$label = wp_sprintf($label, TouchPointWP::VERSION);
+		echo "<div style=\"text-align: right;\">$label</div>";
 
-		echo '</div>';
+		echo "</div>";
 	}
 }
\ No newline at end of file

From c48b0617808d5bf9ceb5bfca1efd8ced30c73c8d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 14:13:04 -0400
Subject: [PATCH 378/423] Fix actions style not being imported

---
 src/TouchPoint-WP/Involvement.php | 1 +
 src/TouchPoint-WP/Meeting.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index fc816215..c634db15 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -4060,6 +4060,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if (!$absoluteLinks) {
 			TouchPointWP::requireScript('swal2-defer');
 			TouchPointWP::requireScript('base-defer');
+			TouchPointWP::enqueueActionsStyle($context);
 			$this->enqueueForJsInstantiation();
 			$this->enqueueForJsonLdInstantiation();
 			Person::enqueueUsersForJsInstantiation();
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index c962e072..69f3d361 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -503,6 +503,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if (!$absoluteLinks) {
 			TouchPointWP::requireScript('swal2-defer');
 			TouchPointWP::requireScript('base-defer');
+			TouchPointWP::enqueueActionsStyle($context);
 			$this->enqueueForJsInstantiation();
 //		    $this->enqueueForJsonLdInstantiation();
 			Person::enqueueUsersForJsInstantiation();

From c35e693df3aee8c5a66370d5542edc58728bbab3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 14:41:29 -0400
Subject: [PATCH 379/423] clarifying a label

---
 src/TouchPoint-WP/Involvement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index c634db15..b646cc8b 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -2744,7 +2744,7 @@ final protected static function updateInvolvementPostsForType(Involvement_PostTy
 			if ($typeSets->postType === Meeting::POST_TYPE && !$inv->isParent) {
 				if (count($inv->meetings) < 1) {
 					if ($verbose) {
-						echo "<p>Stopping processing because no meetings were returned.  Involvement will be deleted from WordPress.</p>";
+						echo "<p>Stopping processing because no meetings were returned.  Involvement will be deleted from WordPress if it exists.</p>";
 					}
 					continue;
 				}

From b339c8e8175d6268fc709b808d300af7cec567f0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 14:53:03 -0400
Subject: [PATCH 380/423] moving actions style call where it belongs

---
 src/TouchPoint-WP/Auth.php        | 2 +-
 src/TouchPoint-WP/Involvement.php | 5 +++--
 src/TouchPoint-WP/Meeting.php     | 2 +-
 src/TouchPoint-WP/Person.php      | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index a69f6c10..e8c12461 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -129,7 +129,7 @@ public static function printLoginLink(): void
 		$html = '<p class="touchpoint-wp-auth-form">';
 		$url = self::getLoginUrl();
 
-		TouchPointWP::enqueueActionsStyle('login-button');
+		TouchPointWP::enqueueActionsStyle('login');
 
 		/** @noinspection HtmlUnknownTarget */
 		$html .= "<a href=\"$url\" class=\"button button-secondary button-large\" style=\"width: 100%; text-align: center; margin-bottom: 1em;\">";
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index b646cc8b..1eedd90d 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -4060,7 +4060,6 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if (!$absoluteLinks) {
 			TouchPointWP::requireScript('swal2-defer');
 			TouchPointWP::requireScript('base-defer');
-			TouchPointWP::enqueueActionsStyle($context);
 			$this->enqueueForJsInstantiation();
 			$this->enqueueForJsonLdInstantiation();
 			Person::enqueueUsersForJsInstantiation();
@@ -4093,6 +4092,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		// Show on map button.  (Only works if map is called before this is.)
 		if (self::$_hasArchiveMap && $this->geo !== null && !$absoluteLinks) {
 			$text = __("Show on Map", 'TouchPoint-WP');
+			TouchPointWP::enqueueActionsStyle("show-on-map");
 			if ($ret->count() > 1) {
 				$ret->prepend("<button type=\"button\" data-tp-action=\"showOnMap\" title=\"$text\" $btnClass><i class=\"tenth-icons map-marker\"></i></button>", "map");
 			} else {
@@ -4105,6 +4105,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Involvement in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$url = "$tpHost/Org/$this->invId";
+			TouchPointWP::enqueueActionsStyle("inv-tp");
 			$ret['inv_tp']  = "<button type=\"button\" data-tp-action=\"inv-tp\" onclick=\"window.open('$url', '_blank', 'noopener');\" title=\"$title\" class=\"$classesOnly\"><i class=\"tenth-icons touchpoint-icon\"></i></button>";
 		}
 
@@ -4208,7 +4209,7 @@ public function getRegisterButton(string $btnClass, bool $absoluteLinks = false,
 				$text = __('Register', 'TouchPoint-WP');
 				$link = $this->getRegistrationUrl();
 				if (!$absoluteLinks) {
-					TouchPointWP::enqueueActionsStyle('inv-register');
+					TouchPointWP::enqueueActionsStyle('inv-register-ext');
 					return "<button type=\"button\" data-tp-action=\"register-ext\" $btnClass onclick=\"window.open('$link', '_blank', 'noopener');\">$text</button>";
 				}
 				return "<a href=\"$link\" $btnClass>$text</a>  ";
diff --git a/src/TouchPoint-WP/Meeting.php b/src/TouchPoint-WP/Meeting.php
index 69f3d361..0edb43d7 100644
--- a/src/TouchPoint-WP/Meeting.php
+++ b/src/TouchPoint-WP/Meeting.php
@@ -503,7 +503,6 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		if (!$absoluteLinks) {
 			TouchPointWP::requireScript('swal2-defer');
 			TouchPointWP::requireScript('base-defer');
-			TouchPointWP::enqueueActionsStyle($context);
 			$this->enqueueForJsInstantiation();
 //		    $this->enqueueForJsonLdInstantiation();
 			Person::enqueueUsersForJsInstantiation();
@@ -534,6 +533,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		}
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin() && !$this->isMeetingGroup()) {
+			TouchPointWP::enqueueActionsStyle('mtg-tp');
 			$tpHost = TouchPointWP::instance()->host();
 			// Translators: %s is the system name, "TouchPoint" by default.
 			$title  = wp_sprintf(__("Meeting in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 315659ea..eaab9872 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1274,6 +1274,7 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
 			// Translators: %s is the system name, "TouchPoint" by default.
+			TouchPointWP::enqueueActionsStyle('person-tp');
 			$title  = wp_sprintf(__("Person in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$ret['person_tp']  = "<button type=\"button\" data-tp-action=\"person-tp\" onclick=\"window.open('{$this->getProfileUrl()}', '_blank', 'noopener');\" title=\"$title\" class=\"$classesOnly\"><i class=\"tenth-icons touchpoint-icon\"></i></button>";
 		}

From f784893a38e519b7c4325324828a7758809e2377 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 16:52:30 -0400
Subject: [PATCH 381/423] Resolve an issue with timezone formatting.  Closes
 #243.

---
 src/TouchPoint-WP/Involvement.php             | 16 ++++++-------
 src/TouchPoint-WP/Report.php                  |  2 +-
 src/TouchPoint-WP/Utilities.php               |  2 +-
 .../Utilities/DateTimeExtended.php            | 24 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 1eedd90d..8ca12c87 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -1068,8 +1068,8 @@ protected function scheduleStrings_calc(): array
 				$r['firstLast'] = wp_sprintf(
 				// translators: {start date} through {end date}  e.g. February 14 through August 12
 					__('%1$s through %2$s', 'TouchPoint-WP'),
-					$this->firstMeeting->format($dateFormat),
-					$this->lastMeeting->format($dateFormat)
+					$this->firstMeeting->format_i18n($dateFormat),
+					$this->lastMeeting->format_i18n($dateFormat)
 				);
 				if ($dayStr === null) {
 					$dayStr = $r['firstLast'];
@@ -1078,15 +1078,15 @@ protected function scheduleStrings_calc(): array
 					// translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
 						__('%1$s, %2$s through %3$s', 'TouchPoint-WP'),
 						$dayStr,
-						$this->firstMeeting->format($dateFormat),
-						$this->lastMeeting->format($dateFormat)
+						$this->firstMeeting->format_i18n($dateFormat),
+						$this->lastMeeting->format_i18n($dateFormat)
 					);
 				}
 			} elseif ($this->firstMeeting !== null) {
 				$r['firstLast'] = wp_sprintf(
 				// translators: Starts {start date}  e.g. Starts September 15
 					__('Starts %1$s', 'TouchPoint-WP'),
-					$this->firstMeeting->format($dateFormat)
+					$this->firstMeeting->format_i18n($dateFormat)
 				);
 				if ($dayStr === null) {
 					$dayStr = $r['firstLast'];
@@ -1095,14 +1095,14 @@ protected function scheduleStrings_calc(): array
 					// translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
 						__('%1$s, starting %2$s', 'TouchPoint-WP'),
 						$dayStr,
-						$this->firstMeeting->format($dateFormat)
+						$this->firstMeeting->format_i18n($dateFormat)
 					);
 				}
 			} elseif ($this->lastMeeting !== null) {
 				$r['firstLast'] = wp_sprintf(
 				// translators: Through {end date}  e.g. Through September 15
 					__('Through %1$s', 'TouchPoint-WP'),
-					$this->lastMeeting->format($dateFormat)
+					$this->lastMeeting->format_i18n($dateFormat)
 				);
 				if ($dayStr === null) {
 					$dayStr = $r['firstLast'];
@@ -1111,7 +1111,7 @@ protected function scheduleStrings_calc(): array
 					// translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
 						__('%1$s, through %2$s', 'TouchPoint-WP'),
 						$dayStr,
-						$this->lastMeeting->format($dateFormat)
+						$this->lastMeeting->format_i18n($dateFormat)
 					);
 				}
 			}
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index c40186d5..873fa36d 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -578,7 +578,7 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 	{
 		TouchPointWP::instance()->setTpWpUserAsCurrent();
 
-		// Find Report Shortcodes in post content and add their involvements to the query.
+		// Find Report Shortcodes in post content and them to the list for updates.
 		$referencingPosts   = Utilities::getPostContentWithShortcode(self::SHORTCODE_REPORT);
 		$postIdsToNotDelete = [];
 
diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php
index 158eb031..9f70ea9a 100644
--- a/src/TouchPoint-WP/Utilities.php
+++ b/src/TouchPoint-WP/Utilities.php
@@ -243,7 +243,7 @@ public static function getDayOfWeekShortForNumber_noI18n(int $dayNum): string
 	 */
 	public static function getTimeOfDayTermForTime(DateTimeInterface $dt, bool $i18n = true): string
 	{
-		$timeInt = intval($dt->format('Hi'));
+		$timeInt = intval($dt->format('Gi'));
 
 		if ($timeInt < 300 || $timeInt >= 2200) {
 			return $i18n ? _x('Late Night', 'Time of Day', 'TouchPoint-WP') : "Late Night";
diff --git a/src/TouchPoint-WP/Utilities/DateTimeExtended.php b/src/TouchPoint-WP/Utilities/DateTimeExtended.php
index 8e311c7b..bcdf4fe8 100644
--- a/src/TouchPoint-WP/Utilities/DateTimeExtended.php
+++ b/src/TouchPoint-WP/Utilities/DateTimeExtended.php
@@ -20,8 +20,30 @@ public function __construct($time = "now", $timezone = null)
 		parent::__construct($time, $timezone);
 	}
 
+	/**
+	 * Get a formatted date string according to the given format.  For user-facing text, please use
+	 * format_i18n instead, which allows the format string to be localized.
+	 *
+	 * @param string $format
+	 *
+	 * @return string
+	 *
+	 * @see self::format_i18n()
+	 */
 	public function format(string $format): string
 	{
-		return date_i18n($format, $this->getTimestamp());
+		return parent::format($format);
+	}
+
+	/**
+	 * Get a human-intended formatted string according to the given format.
+	 *
+	 * @param string $format
+	 *
+	 * @return string
+	 */
+	public function format_i18n(string $format): string
+	{
+		return date_i18n($format, $this->getTimestamp() + $this->getOffset());
 	}
 }
\ No newline at end of file

From a5f41b398f3c2b173ebf4d2c9154329388e333e8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 1 Apr 2026 23:07:51 -0400
Subject: [PATCH 382/423] Resolve an issue where partner map sometimes isn't
 initializing correctly.

---
 assets/js/partner-defer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/partner-defer.js b/assets/js/partner-defer.js
index 32eb053b..bed2bca3 100644
--- a/assets/js/partner-defer.js
+++ b/assets/js/partner-defer.js
@@ -119,7 +119,7 @@
 
         static initMap(mapDivId) {
             // if google.maps isn't defined yet, have this called again when it's ready.
-            if (typeof google === 'undefined' || typeof google.maps === 'undefined') {
+            if (typeof google === 'undefined' || typeof google.maps === 'undefined' || typeof google.maps.MapTypeId === "undefined") {
                 setTimeout(() => this.initMap(mapDivId), 100);
                 return;
             }

From c9ebcdbb90bc771a527deda52f359ecae814eed8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 2 Apr 2026 00:30:05 -0400
Subject: [PATCH 383/423] Finally resolving the issue with the calendar
 right-hand border

---
 assets/template/calendar-grid-style.css | 29 ++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/assets/template/calendar-grid-style.css b/assets/template/calendar-grid-style.css
index d84a14bc..cc214a4b 100644
--- a/assets/template/calendar-grid-style.css
+++ b/assets/template/calendar-grid-style.css
@@ -2,16 +2,28 @@
 div.calGrid {
     display: grid;
     grid-template-columns: repeat(7, 1fr);
+    /*margin-right: 1px;*/
 }
 
 div.calGrid,
 div.calGrid > div.calWeekdayHead,
 div.calGrid > div.calDay {
-    border: 1px solid black;
+    border: 1px solid #000a;
+}
+
+div.calGrid {
+    border-right: none;
+}
+
+div.calGrid > div.calWeekdayHead:nth-child(7n),
+div.calGrid > div.calDay:nth-child(7n) {
+    border-right: 2px solid #000a;
 }
 
 div.calGrid > div.calDay {
     min-height: 5em;
+    overflow-x: auto;
+    scrollbar-width: none;
 }
 
 div.calGrid div.calDay > h3.calDayHead {
@@ -21,11 +33,15 @@ div.calGrid div.calDay > h3.calDayHead {
 div.calGrid div.calDay > * {
     display: block;
 }
+div.calGrid div.calDay > a.event {
+    font-size: .95em;
+}
 
 div.calGrid div.calDay > a.event.feat {
     font-weight: bold;
-    font-size: 1.2em;
-    padding-bottom: .5em;
+    font-size: 1.05em;
+    padding-top: .3em;
+    padding-bottom: .4em;
 }
 
 div.calGrid div.calDay > a.event.cancelled {
@@ -37,7 +53,8 @@ div.calGrid div.calDay > a,
 div.calGrid div.calWeekdayHead,
 div.calGrid div.calDay > h3.calDayHead,
 div.calGrid div.calDay > span.calDayNum {
-    padding: .2em 5px;
+    text-indent: -20px;
+    padding: .2em 5px .2em 25px;
 }
 
 div.calGrid div.calDay.before,
@@ -57,8 +74,10 @@ div.calGridNav.bottom {
     }
 
     div.calGrid,
-    div.calGrid > div.calDay {
+    div.calGrid > div.calDay,
+    div.calGrid > div.calDay:nth-child(7n) {
         border: unset;
+        border-right: unset;
         min-height: unset;
         margin-bottom: 1em;
     }

From 12cf81ab9c25484d1bdaf54c78105b9d0c62e3a3 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 2 Apr 2026 00:41:02 -0400
Subject: [PATCH 384/423] cleaning up capitalization of labels, i18n.

---
 i18n/TouchPoint-WP-es_ES.po          | 173 +++++++++++++++------------
 i18n/TouchPoint-WP.pot               | 165 +++++++++++++------------
 src/TouchPoint-WP/Person.php         |   4 +-
 src/templates/involvement-single.php |   6 +-
 4 files changed, 191 insertions(+), 157 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 4aff00da..7ece81fb 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -88,7 +88,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:180
 #: src/templates/admin/invKoForm.php:334
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:800
+#: src/TouchPoint-WP/Meeting.php:801
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:195
 #: assets/js/base-defer.js:1115
@@ -124,13 +124,13 @@ msgid "Gender"
 msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:252
-#: src/TouchPoint-WP/Involvement.php:1918
+#: src/TouchPoint-WP/Involvement.php:1929
 #: src/TouchPoint-WP/Taxonomies.php:755
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:256
-#: src/TouchPoint-WP/Involvement.php:1944
+#: src/TouchPoint-WP/Involvement.php:1955
 #: src/TouchPoint-WP/Taxonomies.php:821
 msgid "Time of Day"
 msgstr "Hora del día"
@@ -174,7 +174,7 @@ msgstr "Seleccione..."
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2207
+#: src/TouchPoint-WP/Involvement.php:2225
 #, php-format
 msgid "No %s Found."
 msgstr "No se encontraron %s"
@@ -199,82 +199,82 @@ msgstr "Periódico"
 msgid "Multi-Day"
 msgstr "varios días"
 
-#: src/TouchPoint-WP/Involvement.php:512
+#: src/TouchPoint-WP/Involvement.php:523
 msgid "Currently Full"
 msgstr "Actualmente lleno"
 
-#: src/TouchPoint-WP/Involvement.php:517
+#: src/TouchPoint-WP/Involvement.php:528
 msgid "Currently Closed"
 msgstr "Actualmente cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:524
+#: src/TouchPoint-WP/Involvement.php:535
 msgid "Registration Not Open Yet"
 msgstr "Registro aún no abierto"
 
-#: src/TouchPoint-WP/Involvement.php:530
+#: src/TouchPoint-WP/Involvement.php:541
 msgid "Registration Closed"
 msgstr "Registro cerrado"
 
-#: src/TouchPoint-WP/Involvement.php:1793
+#: src/TouchPoint-WP/Involvement.php:1804
 #: src/TouchPoint-WP/Partner.php:840
 #: blocks/people-list/index.js:127
 msgid "Any"
 msgstr "Cualquier"
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:2001
+#: src/TouchPoint-WP/Involvement.php:2012
 #: src/TouchPoint-WP/Partner.php:864
 #, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3855
+#: src/TouchPoint-WP/Involvement.php:3995
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3858
+#: src/TouchPoint-WP/Involvement.php:3998
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:3937
+#: src/TouchPoint-WP/Involvement.php:4077
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:4006
-#: src/TouchPoint-WP/Involvement.php:4067
+#: src/TouchPoint-WP/Involvement.php:4148
+#: src/TouchPoint-WP/Involvement.php:4209
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:4012
+#: src/TouchPoint-WP/Involvement.php:4154
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:4016
+#: src/TouchPoint-WP/Involvement.php:4158
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:4021
+#: src/TouchPoint-WP/Involvement.php:4163
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:4024
+#: src/TouchPoint-WP/Involvement.php:4166
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:4027
+#: src/TouchPoint-WP/Involvement.php:4169
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:4030
+#: src/TouchPoint-WP/Involvement.php:4172
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:4058
+#: src/TouchPoint-WP/Involvement.php:4200
 #: assets/js/base-defer.js:1000
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:3954
+#: src/TouchPoint-WP/Involvement.php:4094
 #: src/TouchPoint-WP/Partner.php:1357
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -301,8 +301,8 @@ msgstr "ID de Personas de TouchPoint"
 msgid "Contact"
 msgstr "Contacta"
 
-#: src/TouchPoint-WP/Meeting.php:799
-#: src/TouchPoint-WP/Meeting.php:820
+#: src/TouchPoint-WP/Meeting.php:800
+#: src/TouchPoint-WP/Meeting.php:821
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr "RSVP"
@@ -459,6 +459,7 @@ msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
 #: src/TouchPoint-WP/Settings.php:529
+#: src/TouchPoint-WP/StatusWidget.php:101
 msgid "People"
 msgstr "Gente"
 
@@ -540,6 +541,7 @@ msgid "By enabling this option, users who can't edit anything won't see the Admi
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
 #: src/TouchPoint-WP/Settings.php:642
+#: src/TouchPoint-WP/StatusWidget.php:106
 msgid "Involvements"
 msgstr "Involucramientos"
 
@@ -802,7 +804,7 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1557
+#: src/TouchPoint-WP/Person.php:1558
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:20
 msgid "and"
@@ -1026,16 +1028,16 @@ msgstr "OK"
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/TouchPoint-WP/Involvement.php:1966
+#: src/TouchPoint-WP/Involvement.php:1977
 #: src/TouchPoint-WP/Taxonomies.php:890
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/TouchPoint-WP/Involvement.php:1979
+#: src/TouchPoint-WP/Involvement.php:1990
 msgid "Age"
 msgstr "Años"
 
-#: src/TouchPoint-WP/Involvement.php:1850
+#: src/TouchPoint-WP/Involvement.php:1861
 msgid "Genders"
 msgstr "Géneros"
 
@@ -1197,34 +1199,34 @@ msgctxt "Time of Day"
 msgid "Night"
 msgstr "Noche"
 
-#: src/TouchPoint-WP/Involvement.php:1967
+#: src/TouchPoint-WP/Involvement.php:1978
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr "Mayoría solteras"
 
-#: src/TouchPoint-WP/Involvement.php:1968
+#: src/TouchPoint-WP/Involvement.php:1979
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr "Mayoría casadas"
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:2009
+#: src/TouchPoint-WP/Involvement.php:2020
 #: src/TouchPoint-WP/Partner.php:880
 #, php-format
 msgid "Zoom out or %s to see more."
 msgstr "Alejar o %s para ver más."
 
-#: src/TouchPoint-WP/Involvement.php:2012
+#: src/TouchPoint-WP/Involvement.php:2023
 #: src/TouchPoint-WP/Partner.php:883
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr "restablecer el mapa"
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1018
-#: src/TouchPoint-WP/Involvement.php:1050
-#: src/TouchPoint-WP/Involvement.php:1143
-#: src/TouchPoint-WP/Involvement.php:1167
+#: src/TouchPoint-WP/Involvement.php:1029
+#: src/TouchPoint-WP/Involvement.php:1061
+#: src/TouchPoint-WP/Involvement.php:1154
+#: src/TouchPoint-WP/Involvement.php:1178
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -1233,44 +1235,44 @@ msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1059
+#: src/TouchPoint-WP/Involvement.php:1070
 #, php-format
 msgid "%1$s through %2$s"
 msgstr "%1$s al %2$s"
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1068
+#: src/TouchPoint-WP/Involvement.php:1079
 #, php-format
 msgid "%1$s, %2$s through %3$s"
 msgstr "%1$s, %2$s al %3$s"
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1077
+#: src/TouchPoint-WP/Involvement.php:1088
 #, php-format
 msgid "Starts %1$s"
 msgstr "Comienza el %1$s"
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1085
+#: src/TouchPoint-WP/Involvement.php:1096
 #, php-format
 msgid "%1$s, starting %2$s"
 msgstr "%1$s, comienza el %2$s"
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1093
+#: src/TouchPoint-WP/Involvement.php:1104
 #, php-format
 msgid "Through %1$s"
 msgstr "Hasta el %1$s"
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1101
+#: src/TouchPoint-WP/Involvement.php:1112
 #, php-format
 msgid "%1$s, through %2$s"
 msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3876
+#: src/TouchPoint-WP/Involvement.php:4016
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -1288,35 +1290,35 @@ msgstr "La participación tiene un tipo de registro de \"No Online Registration\
 msgid "Involvement registration has ended (end date is past)"
 msgstr "El registro de participación ha finalizado (la fecha de finalización ya pasó)"
 
-#: src/TouchPoint-WP/Involvement.php:2148
+#: src/TouchPoint-WP/Involvement.php:2166
 msgid "This involvement type doesn't exist."
 msgstr "Este tipo de participación no existe."
 
-#: src/TouchPoint-WP/Involvement.php:2158
+#: src/TouchPoint-WP/Involvement.php:2176
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr "Este tipo de participación no tiene habilitadas las ubicaciones geográficas."
 
-#: src/TouchPoint-WP/Involvement.php:2177
+#: src/TouchPoint-WP/Involvement.php:2195
 msgid "Could not locate."
 msgstr "No se pudo localizar."
 
-#: src/TouchPoint-WP/Meeting.php:726
+#: src/TouchPoint-WP/Meeting.php:727
 #: src/TouchPoint-WP/TouchPointWP.php:1203
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
-#: src/TouchPoint-WP/Meeting.php:754
+#: src/TouchPoint-WP/Meeting.php:755
 #: src/TouchPoint-WP/TouchPointWP.php:445
 msgid "Only POST requests are allowed."
 msgstr "Solo se permiten solicitudes POST."
 
-#: src/TouchPoint-WP/Meeting.php:764
+#: src/TouchPoint-WP/Meeting.php:765
 #: src/TouchPoint-WP/TouchPointWP.php:454
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:4190
-#: src/TouchPoint-WP/Involvement.php:4295
+#: src/TouchPoint-WP/Involvement.php:4332
+#: src/TouchPoint-WP/Involvement.php:4437
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1444,7 +1446,7 @@ msgstr "Actualizada %1$s %2$s"
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: src/TouchPoint-WP/Involvement.php:1893
+#: src/TouchPoint-WP/Involvement.php:1904
 msgid "Language"
 msgstr "Idioma"
 
@@ -1456,7 +1458,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1564
+#: src/TouchPoint-WP/Person.php:1565
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1481,8 +1483,8 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4282
-#: src/TouchPoint-WP/Person.php:1950
+#: src/TouchPoint-WP/Involvement.php:4424
+#: src/TouchPoint-WP/Person.php:1951
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1502,16 +1504,16 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1801
+#: src/TouchPoint-WP/Person.php:1802
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4272
-#: src/TouchPoint-WP/Person.php:1967
+#: src/TouchPoint-WP/Involvement.php:4414
+#: src/TouchPoint-WP/Person.php:1968
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1703
+#: src/TouchPoint-WP/Person.php:1704
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
@@ -1612,11 +1614,11 @@ msgstr "mañana"
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
-#: src/TouchPoint-WP/Meeting.php:603
+#: src/TouchPoint-WP/Meeting.php:604
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/TouchPoint-WP/Meeting.php:604
+#: src/TouchPoint-WP/Meeting.php:605
 msgid "Scheduled"
 msgstr "Programado"
 
@@ -1655,7 +1657,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3965
+#: src/TouchPoint-WP/Involvement.php:4106
 #, php-format
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
@@ -1665,17 +1667,11 @@ msgid "In the Past"
 msgstr "en el pasado"
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:538
+#: src/TouchPoint-WP/Meeting.php:539
 #, php-format
 msgid "Meeting in %s"
 msgstr "Reunión en %s"
 
-#. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1277
-#, php-format
-msgid "Person in %s"
-msgstr "Persona en %s"
-
 #: src/TouchPoint-WP/Settings.php:900
 msgid "Meeting Name (Plural)"
 msgstr "Nombre de las reuniones (singular)"
@@ -1686,6 +1682,7 @@ msgstr "Lo que llamas Reuniones en tu iglesia"
 
 #: src/TouchPoint-WP/Settings.php:906
 #: src/TouchPoint-WP/Settings.php:908
+#: src/TouchPoint-WP/StatusWidget.php:118
 msgid "Meetings"
 msgstr "Reuniones"
 
@@ -1732,7 +1729,7 @@ msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
 
-#: src/TouchPoint-WP/Meeting.php:605
+#: src/TouchPoint-WP/Meeting.php:606
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr "desconocido"
@@ -1742,8 +1739,8 @@ msgid "Creating an Involvement object from an object without a post_id is not ye
 msgstr "Aún no se admite la creación de un objeto de participación a partir de un objeto sin post_id."
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1021
-#: src/TouchPoint-WP/Involvement.php:1044
+#: src/TouchPoint-WP/Involvement.php:1032
+#: src/TouchPoint-WP/Involvement.php:1055
 #, php-format
 msgid "%1$s All Day"
 msgstr "todo el dia los %1$s"
@@ -1854,8 +1851,8 @@ msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el ca
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/templates/involvement-single.php:50
 #, php-format
-msgid "This %s has been Cancelled."
-msgstr "Este %s ha sido Cancelado."
+msgid "This %s has been cancelled."
+msgstr "Este %s ha sido cancelado."
 
 #: src/templates/admin/invKoForm.php:212
 #: blocks/inv-list/index.js:130
@@ -1870,7 +1867,7 @@ msgstr "Código de Residente"
 msgid "Campus"
 msgstr "Campus"
 
-#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Involvement.php:1056
 msgid "All Day"
 msgstr "todo el dia"
 
@@ -1997,8 +1994,8 @@ msgctxt "block description"
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
-#: src/TouchPoint-WP/Involvement.php:1683
-#: src/TouchPoint-WP/Person.php:2000
+#: src/TouchPoint-WP/Involvement.php:1694
+#: src/TouchPoint-WP/Person.php:2001
 msgid "None right now."
 msgstr "Nada por ahora"
 
@@ -2099,3 +2096,23 @@ msgstr "Esta opción le permite filtrar las personas que se muestran en función
 #: src/TouchPoint-WP/Utilities.php:513
 msgid "Expand"
 msgstr "Expandir"
+
+#: src/TouchPoint-WP/StatusWidget.php:125
+msgid "Partners"
+msgstr "Misioneros"
+
+#: src/TouchPoint-WP/StatusWidget.php:130
+msgid "Reports"
+msgstr "Informes"
+
+#. Translators: %s is the current version number.
+#: src/TouchPoint-WP/StatusWidget.php:137
+#, php-format
+msgid "Version: %s"
+msgstr "versión: %s"
+
+#. Translators: %s is the system name, "TouchPoint" by default.
+#: src/TouchPoint-WP/Person.php:1278
+#, php-format
+msgid "Profile in %s"
+msgstr "Perfil en %s"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index f761e587..41315e89 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-01T16:54:41+00:00\n"
+"POT-Creation-Date: 2026-04-02T04:36:37+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -79,7 +79,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:180
 #: src/templates/admin/invKoForm.php:334
 #: src/templates/parts/involvement-nearby-list.php:2
-#: src/TouchPoint-WP/Meeting.php:800
+#: src/TouchPoint-WP/Meeting.php:801
 #: src/TouchPoint-WP/Rsvp.php:77
 #: assets/js/base-defer.js:195
 #: assets/js/base-defer.js:1115
@@ -217,13 +217,13 @@ msgid "Gender"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:252
-#: src/TouchPoint-WP/Involvement.php:1918
+#: src/TouchPoint-WP/Involvement.php:1929
 #: src/TouchPoint-WP/Taxonomies.php:755
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:256
-#: src/TouchPoint-WP/Involvement.php:1944
+#: src/TouchPoint-WP/Involvement.php:1955
 #: src/TouchPoint-WP/Taxonomies.php:821
 msgid "Time of Day"
 msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
 #: src/templates/involvement-single.php:50
 #, php-format
-msgid "This %s has been Cancelled."
+msgid "This %s has been cancelled."
 msgstr ""
 
 #. Translators: %s is the singular name of the of a Meeting, such as "Event".
@@ -325,7 +325,7 @@ msgstr ""
 
 #. translators: %s will be the plural post type (e.g. Small Groups)
 #: src/templates/parts/involvement-list-none.php:16
-#: src/TouchPoint-WP/Involvement.php:2207
+#: src/TouchPoint-WP/Involvement.php:2225
 #, php-format
 msgid "No %s Found."
 msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:3876
+#: src/TouchPoint-WP/Involvement.php:4016
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -401,27 +401,27 @@ msgstr ""
 msgid "Creating an Involvement object from an object without a post_id is not yet supported."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:512
+#: src/TouchPoint-WP/Involvement.php:523
 msgid "Currently Full"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:517
+#: src/TouchPoint-WP/Involvement.php:528
 msgid "Currently Closed"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:524
+#: src/TouchPoint-WP/Involvement.php:535
 msgid "Registration Not Open Yet"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:530
+#: src/TouchPoint-WP/Involvement.php:541
 msgid "Registration Closed"
 msgstr ""
 
 #. translators: %1$s is the date(s), %2$s is the time(s).
-#: src/TouchPoint-WP/Involvement.php:1018
-#: src/TouchPoint-WP/Involvement.php:1050
-#: src/TouchPoint-WP/Involvement.php:1143
-#: src/TouchPoint-WP/Involvement.php:1167
+#: src/TouchPoint-WP/Involvement.php:1029
+#: src/TouchPoint-WP/Involvement.php:1061
+#: src/TouchPoint-WP/Involvement.php:1154
+#: src/TouchPoint-WP/Involvement.php:1178
 #: src/TouchPoint-WP/StatusWidget.php:73
 #: src/TouchPoint-WP/Utilities/DateFormats.php:288
 #: src/TouchPoint-WP/Utilities/DateFormats.php:352
@@ -430,191 +430,191 @@ msgid "%1$s at %2$s"
 msgstr ""
 
 #. translators: "Mon All Day"  or  "Sundays All Day"
-#: src/TouchPoint-WP/Involvement.php:1021
-#: src/TouchPoint-WP/Involvement.php:1044
+#: src/TouchPoint-WP/Involvement.php:1032
+#: src/TouchPoint-WP/Involvement.php:1055
 #, php-format
 msgid "%1$s All Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1045
+#: src/TouchPoint-WP/Involvement.php:1056
 msgid "All Day"
 msgstr ""
 
 #. translators: {start date} through {end date}  e.g. February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1059
+#: src/TouchPoint-WP/Involvement.php:1070
 #, php-format
 msgid "%1$s through %2$s"
 msgstr ""
 
 #. translators: {schedule}, {start date} through {end date}  e.g. Sundays at 11am, February 14 through August 12
-#: src/TouchPoint-WP/Involvement.php:1068
+#: src/TouchPoint-WP/Involvement.php:1079
 #, php-format
 msgid "%1$s, %2$s through %3$s"
 msgstr ""
 
 #. translators: Starts {start date}  e.g. Starts September 15
-#: src/TouchPoint-WP/Involvement.php:1077
+#: src/TouchPoint-WP/Involvement.php:1088
 #, php-format
 msgid "Starts %1$s"
 msgstr ""
 
 #. translators: {schedule}, starting {start date}  e.g. Sundays at 11am, starting February 14
-#: src/TouchPoint-WP/Involvement.php:1085
+#: src/TouchPoint-WP/Involvement.php:1096
 #, php-format
 msgid "%1$s, starting %2$s"
 msgstr ""
 
 #. translators: Through {end date}  e.g. Through September 15
-#: src/TouchPoint-WP/Involvement.php:1093
+#: src/TouchPoint-WP/Involvement.php:1104
 #, php-format
 msgid "Through %1$s"
 msgstr ""
 
 #. translators: {schedule}, through {end date}  e.g. Sundays at 11am, through February 14
-#: src/TouchPoint-WP/Involvement.php:1101
+#: src/TouchPoint-WP/Involvement.php:1112
 #, php-format
 msgid "%1$s, through %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1683
-#: src/TouchPoint-WP/Person.php:2000
+#: src/TouchPoint-WP/Involvement.php:1694
+#: src/TouchPoint-WP/Person.php:2001
 msgid "None right now."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1793
+#: src/TouchPoint-WP/Involvement.php:1804
 #: src/TouchPoint-WP/Partner.php:840
 #: blocks/people-list/index.js:127
 msgid "Any"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1850
+#: src/TouchPoint-WP/Involvement.php:1861
 msgid "Genders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1893
+#: src/TouchPoint-WP/Involvement.php:1904
 msgid "Language"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1966
+#: src/TouchPoint-WP/Involvement.php:1977
 #: src/TouchPoint-WP/Taxonomies.php:890
 msgid "Marital Status"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1967
+#: src/TouchPoint-WP/Involvement.php:1978
 msgctxt "Marital status for a group of people"
 msgid "Mostly Single"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1968
+#: src/TouchPoint-WP/Involvement.php:1979
 msgctxt "Marital status for a group of people"
 msgid "Mostly Married"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:1979
+#: src/TouchPoint-WP/Involvement.php:1990
 msgid "Age"
 msgstr ""
 
 #. translators: %s is for the user-provided term for the items on the map (e.g. Small Group or Partner)
-#: src/TouchPoint-WP/Involvement.php:2001
+#: src/TouchPoint-WP/Involvement.php:2012
 #: src/TouchPoint-WP/Partner.php:864
 #, php-format
 msgid "The %s listed are only those shown on the map."
 msgstr ""
 
 #. translators: %s is the link to "reset the map"
-#: src/TouchPoint-WP/Involvement.php:2009
+#: src/TouchPoint-WP/Involvement.php:2020
 #: src/TouchPoint-WP/Partner.php:880
 #, php-format
 msgid "Zoom out or %s to see more."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2012
+#: src/TouchPoint-WP/Involvement.php:2023
 #: src/TouchPoint-WP/Partner.php:883
 msgctxt "Zoom out or reset the map to see more."
 msgid "reset the map"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2148
+#: src/TouchPoint-WP/Involvement.php:2166
 msgid "This involvement type doesn't exist."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2158
+#: src/TouchPoint-WP/Involvement.php:2176
 msgid "This involvement type doesn't have geographic locations enabled."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:2177
+#: src/TouchPoint-WP/Involvement.php:2195
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3855
+#: src/TouchPoint-WP/Involvement.php:3995
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3858
+#: src/TouchPoint-WP/Involvement.php:3998
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3937
+#: src/TouchPoint-WP/Involvement.php:4077
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3954
+#: src/TouchPoint-WP/Involvement.php:4094
 #: src/TouchPoint-WP/Partner.php:1357
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:3965
+#: src/TouchPoint-WP/Involvement.php:4106
 #, php-format
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4006
-#: src/TouchPoint-WP/Involvement.php:4067
+#: src/TouchPoint-WP/Involvement.php:4148
+#: src/TouchPoint-WP/Involvement.php:4209
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4012
+#: src/TouchPoint-WP/Involvement.php:4154
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4016
+#: src/TouchPoint-WP/Involvement.php:4158
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4021
+#: src/TouchPoint-WP/Involvement.php:4163
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4024
+#: src/TouchPoint-WP/Involvement.php:4166
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4027
+#: src/TouchPoint-WP/Involvement.php:4169
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4030
+#: src/TouchPoint-WP/Involvement.php:4172
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4058
+#: src/TouchPoint-WP/Involvement.php:4200
 #: assets/js/base-defer.js:1000
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4190
-#: src/TouchPoint-WP/Involvement.php:4295
+#: src/TouchPoint-WP/Involvement.php:4332
+#: src/TouchPoint-WP/Involvement.php:4437
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4272
-#: src/TouchPoint-WP/Person.php:1967
+#: src/TouchPoint-WP/Involvement.php:4414
+#: src/TouchPoint-WP/Person.php:1968
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4282
-#: src/TouchPoint-WP/Person.php:1950
+#: src/TouchPoint-WP/Involvement.php:4424
+#: src/TouchPoint-WP/Person.php:1951
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -632,41 +632,41 @@ msgid "In the Past"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Meeting.php:538
+#: src/TouchPoint-WP/Meeting.php:539
 #, php-format
 msgid "Meeting in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:603
+#: src/TouchPoint-WP/Meeting.php:604
 msgid "Cancelled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:604
+#: src/TouchPoint-WP/Meeting.php:605
 msgid "Scheduled"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:605
+#: src/TouchPoint-WP/Meeting.php:606
 msgctxt "Event Status is not a recognized value."
 msgid "Unknown"
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:726
+#: src/TouchPoint-WP/Meeting.php:727
 #: src/TouchPoint-WP/TouchPointWP.php:1203
 msgid "Only GET requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:754
+#: src/TouchPoint-WP/Meeting.php:755
 #: src/TouchPoint-WP/TouchPointWP.php:445
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:764
+#: src/TouchPoint-WP/Meeting.php:765
 #: src/TouchPoint-WP/TouchPointWP.php:454
 msgid "Invalid data provided."
 msgstr ""
 
-#: src/TouchPoint-WP/Meeting.php:799
-#: src/TouchPoint-WP/Meeting.php:820
+#: src/TouchPoint-WP/Meeting.php:800
+#: src/TouchPoint-WP/Meeting.php:821
 #: src/TouchPoint-WP/Rsvp.php:82
 msgid "RSVP"
 msgstr ""
@@ -694,27 +694,27 @@ msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1277
+#: src/TouchPoint-WP/Person.php:1278
 #, php-format
-msgid "Person in %s"
+msgid "Profile in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1557
+#: src/TouchPoint-WP/Person.php:1558
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:20
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1564
+#: src/TouchPoint-WP/Person.php:1565
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1703
+#: src/TouchPoint-WP/Person.php:1704
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1801
+#: src/TouchPoint-WP/Person.php:1802
 msgid "You may need to sign in."
 msgstr ""
 
@@ -890,6 +890,7 @@ msgid "Upload the package to {tpName} here"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:529
+#: src/TouchPoint-WP/StatusWidget.php:101
 msgid "People"
 msgstr ""
 
@@ -979,6 +980,7 @@ msgid "By enabling this option, users who can't edit anything won't see the Admi
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:642
+#: src/TouchPoint-WP/StatusWidget.php:106
 msgid "Involvements"
 msgstr ""
 
@@ -1160,6 +1162,7 @@ msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:906
 #: src/TouchPoint-WP/Settings.php:908
+#: src/TouchPoint-WP/StatusWidget.php:118
 msgid "Meetings"
 msgstr ""
 
@@ -1379,6 +1382,20 @@ msgstr ""
 msgid "Last Updated"
 msgstr ""
 
+#: src/TouchPoint-WP/StatusWidget.php:125
+msgid "Partners"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:130
+msgid "Reports"
+msgstr ""
+
+#. Translators: %s is the current version number.
+#: src/TouchPoint-WP/StatusWidget.php:137
+#, php-format
+msgid "Version: %s"
+msgstr ""
+
 #. translators: %s: taxonomy name, plural
 #: src/TouchPoint-WP/Taxonomies.php:51
 #, php-format
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index eaab9872..6161f9ad 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -1273,9 +1273,9 @@ public function getActionButtons(?string $context = null, string $btnClass = "",
 		}
 
 		if ($withTouchPointLink && TouchPointWP::currentUserIsAdmin()) {
-			// Translators: %s is the system name, "TouchPoint" by default.
 			TouchPointWP::enqueueActionsStyle('person-tp');
-			$title  = wp_sprintf(__("Person in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
+			// Translators: %s is the system name, "TouchPoint" by default.
+			$title  = wp_sprintf(__("Profile in %s", "TouchPoint-WP"), TouchPointWP::instance()->settings->system_name);
 			$ret['person_tp']  = "<button type=\"button\" data-tp-action=\"person-tp\" onclick=\"window.open('{$this->getProfileUrl()}', '_blank', 'noopener');\" title=\"$title\" class=\"$classesOnly\"><i class=\"tenth-icons touchpoint-icon\"></i></button>";
 		}
 
diff --git a/src/templates/involvement-single.php b/src/templates/involvement-single.php
index fe61b5e4..6a028364 100644
--- a/src/templates/involvement-single.php
+++ b/src/templates/involvement-single.php
@@ -47,8 +47,8 @@
 
             echo wp_sprintf(
                 // Translators: %s is the singular name of the of a Meeting, such as "Event".
-                __('This %s has been Cancelled.', 'TouchPoint-WP'),
-                __($meetingsCalled) // deliberately no domain
+                __('This %s has been cancelled.', 'TouchPoint-WP'),
+                strtolower(__($meetingsCalled)) // deliberately no domain
             );
             echo "</div>";
         } elseif ($obj->isPast()) {
@@ -59,7 +59,7 @@
             echo wp_sprintf(
             // Translators: %s is the singular name of the of a Meeting, such as "Event".
                     __('This %s has already happened.', 'TouchPoint-WP'),
-                    __($meetingsCalled) // deliberately no domain
+                    strtolower(__($meetingsCalled)) // deliberately no domain
             );
             echo "</div>";
         }

From 4cf1fb12fbdd10b0d150017472c6d45b0adcb364 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 2 Apr 2026 00:47:13 -0400
Subject: [PATCH 385/423] add flush-rewrite api endpoint

---
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index a33983b2..babe0910 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -126,6 +126,13 @@ public static function api(array $uri): bool
 				TouchPointWP::instance()->migrate(true);
 				exit;
 
+			case "flush-rewrite":
+				if ( ! TouchPointWP::currentUserIsAdmin()) {
+					return false;
+				}
+				TouchPointWP::instance()->flushRewriteRules(true);
+				exit;
+
 			case "phpinfo":
 				if (!TouchPointWP::currentUserIsAdmin()) {
 					return false;

From e415bb61227896c1e131195a7510c15bc05a225c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 2 Apr 2026 02:09:05 -0400
Subject: [PATCH 386/423] resolve icons not appearing in block editor

---
 src/TouchPoint-WP/Blocks/BlocksController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index 213e92ca..51311e7d 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -141,7 +141,9 @@ public static function api(array $uri): bool
 				// open files and print
 				echo file_get_contents($dir . '/template/block-preview-style.css') . "\n\n";
 				if (TouchPointWP::includeActionsStyle("block-preview")) {
-					echo file_get_contents($dir . '/template/actions-style.css') . "\n\n";
+					$s = file_get_contents($dir . '/template/actions-style.css') . "\n\n";
+					$au = TouchPointWP::instance()->assets_url;
+					echo str_replace(["'../", "\"../"], ["'$au", "\"$au"], $s);
 				}
 				if (TouchPointWP::includePartialsStyle("block-preview")) {
 					echo file_get_contents($dir . '/template/partials-template-style.css') . "\n\n";

From 22dc8a9ae7b89351053e47b85493313174ab7c43 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 2 Apr 2026 02:53:55 -0400
Subject: [PATCH 387/423] rollback of really bad decision to think meetings
 would be translatable.  They are not, at least not currently.

---
 wpml-config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wpml-config.xml b/wpml-config.xml
index 57fe652f..866aedda 100644
--- a/wpml-config.xml
+++ b/wpml-config.xml
@@ -2,7 +2,7 @@
     <custom-types>
         <custom-type translate="0">tp_partner</custom-type>
         <custom-type translate="0">tp_report</custom-type>
-        <custom-type translate="1">tp_meeting</custom-type>
+        <custom-type translate="0">tp_meeting</custom-type>
     </custom-types>
     <taxonomies>
         <taxonomy translate="1" display-as-translated="1">tp_rescode</taxonomy>

From 2f8a4e3b9daf3fe75dae6796dc6299ce3dd6ce02 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 2 Apr 2026 03:10:01 -0400
Subject: [PATCH 388/423] Adding some other fields to avoid translation

---
 wpml-config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wpml-config.xml b/wpml-config.xml
index 866aedda..da3dddc1 100644
--- a/wpml-config.xml
+++ b/wpml-config.xml
@@ -19,6 +19,9 @@
         <custom-field action="translate">tp_locationname</custom-field>
         <custom-field action="ignore">tp_membercount</custom-field>
         <custom-field action="ignore">tp_genderid</custom-field>
+        <custom-field action="ignore">tp_divid</custom-field>
+        <custom-field action="ignore">tp_lookup_id</custom-field>
+        <custom-field action="ignore">tp_programid</custom-field>
         <custom-field action="ignore">tp_groupfull</custom-field>
         <custom-field action="ignore">tp_groupclosed</custom-field>
         <custom-field action="ignore">tp_hasregquestions</custom-field>

From d45adc9a13f67dd6785bd5e6d7bb59ea946a4b9d Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 3 Apr 2026 19:11:20 -0400
Subject: [PATCH 389/423] Managing translations better.

---
 src/TouchPoint-WP/Involvement.php           | 29 ++++++---------------
 src/TouchPoint-WP/Utilities/Translation.php | 25 ++++++++++++++++++
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index 8ca12c87..b75f4a0c 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -3156,29 +3156,15 @@ protected static function doPostUpdate($post, object $inv, Involvement_PostTypeS
 				}
 			}
 
-			if (Translation::useCampusAsLanguage() && $inv->campusName !== null) {
-
-				// Set content's original language based on Campus.
-				$langCode = Translation::getWpmlLangCodeForString($inv->campusName);
-				if ($langCode !== null) {
-					$args = [
-						'element_id'           => $post->ID,
-						'element_type'         => apply_filters('wpml_element_type', $typeSets->postTypeWithPrefix()),
-						'language_code'        => $langCode,
-						'source_language_code' => $langCode,
-						'trid'                 => $post->ID
-					];
-					if ($applyChanges) {
-						do_action('wpml_set_element_language_details', $args);
-					}
-					if ($verbose) {
-						echo "<p>Language Set to: $langCode</p>";
-					}
-				}
-			}
+			Translation::setPostLanguageFromCampus(
+				$inv->campusName,
+				$post,
+				$typeSets->postTypeWithPrefix(),
+				$verbose,
+				$applyChanges
+			);
 		}
 
-
 		/////////////////////
 		//// Demographic ////
 		/////////////////////
@@ -3540,6 +3526,7 @@ protected static function updateMeeting(object $mtgO, object $inv, Involvement_P
 		$mtgP->post_parent = $parentPost->ID;
 
 		self::doMeetingMetaUpdates($mtgP, $mtgO, ! ! $inv->showInSites, $verbose, $applyChanges);
+		Translation::setPostLanguageFromCampus($inv->campusName, $mtgP, $typeSets->postTypeWithPrefix(), $verbose, $applyChanges);
 
 		if ($applyChanges) {
 			wp_update_post($mtgP);
diff --git a/src/TouchPoint-WP/Utilities/Translation.php b/src/TouchPoint-WP/Utilities/Translation.php
index 6447b5ae..2e33896e 100644
--- a/src/TouchPoint-WP/Utilities/Translation.php
+++ b/src/TouchPoint-WP/Utilities/Translation.php
@@ -49,4 +49,29 @@ public static function getWpmlLangCodeForString(string $string): ?string
 
 		return $wpdb->get_var($wpdb->prepare($lang_code_query, $string, $string));
 	}
+
+
+	public static function setPostLanguageFromCampus(?string $campusName, \WP_Post $post, string $postType, bool $verbose = false, bool $applyChanges = true): void
+	{
+		if (Translation::useCampusAsLanguage() && $campusName !== null) {
+
+			// Set content's original language based on Campus.
+			$langCode = Translation::getWpmlLangCodeForString($campusName);
+			if ($langCode !== null) {
+				$args = [
+					'element_id'           => $post->ID,
+					'element_type'         => apply_filters('wpml_element_type', $postType),
+					'language_code'        => $langCode,
+					'source_language_code' => $langCode,
+					'trid'                 => $post->ID
+				];
+				if ($applyChanges) {
+					do_action('wpml_set_element_language_details', $args);
+				}
+				if ($verbose) {
+					echo "<p>Language Set to: $langCode</p>";
+				}
+			}
+		}
+	}
 }
\ No newline at end of file

From 638ea3e9708aca8a34a7ca546422defd5f785dd8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 3 Apr 2026 19:15:43 -0400
Subject: [PATCH 390/423] Styling improvements

---
 assets/template/partials-template-style.css | 3 +++
 src/TouchPoint-WP/Involvement.php           | 4 ++--
 src/TouchPoint-WP/Person.php                | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/assets/template/partials-template-style.css b/assets/template/partials-template-style.css
index a85264f9..02433944 100644
--- a/assets/template/partials-template-style.css
+++ b/assets/template/partials-template-style.css
@@ -45,6 +45,7 @@ article.inv-list-item h2 a {
 
 .person-list {
     text-align: center;
+    margin: 0 -1.6em;
 }
 
 .person-list-item {
@@ -54,7 +55,9 @@ article.inv-list-item h2 a {
     padding: 0.8em;
     display: inline-block;
     width: 12em;
+    max-width: 24vw;
     height: 17em;
+    max-height: 40vw;
     overflow: hidden;
     background-size: cover;
     background-position: center;
diff --git a/src/TouchPoint-WP/Involvement.php b/src/TouchPoint-WP/Involvement.php
index b75f4a0c..15c70a91 100644
--- a/src/TouchPoint-WP/Involvement.php
+++ b/src/TouchPoint-WP/Involvement.php
@@ -836,13 +836,13 @@ public function nextMeeting(): ?DateTimeExtended
 	}
 
 	/**
-	 * @param \DateTimeInterface $apiMeeting
+	 * @param \DateTimeInterface $dateTime
 	 *
 	 * @return bool
 	 *
 	 * TODO update with #184
 	 */
-	protected static function apiMeetingIsAllDay($dateTime): bool
+	protected static function apiMeetingIsAllDay(\DateTimeInterface $dateTime): bool
 	{
 		return $dateTime->format("His") === "000000";
 	}
diff --git a/src/TouchPoint-WP/Person.php b/src/TouchPoint-WP/Person.php
index 6161f9ad..c7fe263a 100644
--- a/src/TouchPoint-WP/Person.php
+++ b/src/TouchPoint-WP/Person.php
@@ -537,6 +537,10 @@ public static function peopleListShortcode($params = [], string $content = ""):
 		$btnClass = $params['btnclass'];
 		$listClass = $params['class'];
 
+		if (!str_contains(" $listClass ", ' person-list ')) {
+			$listClass .= ' person-list';
+		}
+
 		if ($content === "") {
 			$content = "<!-- " . __("No people to show.  This may be because the list hasn't synced yet, or because it is not configured correctly.") . " -->";
 		}

From e51469bd26eaa82cd21ad76254e93c712cf1b9ed Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 6 Apr 2026 22:33:40 -0400
Subject: [PATCH 391/423] remove useless trailing comma

---
 src/TouchPoint-WP/Utilities/DateFormats.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 5de1ea25..557ff63e 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -261,7 +261,7 @@ public static function DateStringFormattedShort(DateTimeInterface $dt): string
 	 *
 	 * @return ?string
 	 */
-	public static function DurationToString(?DateTimeExtended $start, ?DateTimeExtended $end, ?bool $multiDay = null, ): ?string
+	public static function DurationToString(?DateTimeExtended $start, ?DateTimeExtended $end, ?bool $multiDay = null): ?string
 	{
 		if ($start === null) {
 			return null;

From 0994122721059c4a5ebfc9416110c97455956d2e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 Apr 2026 22:33:43 -0400
Subject: [PATCH 392/423] i18n update

---
 i18n/TouchPoint-WP-es_ES.po | 58 +++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 60 ++++++++++++++++++-------------------
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 7ece81fb..5a8af191 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -228,53 +228,53 @@ msgstr "Cualquier"
 msgid "The %s listed are only those shown on the map."
 msgstr "Los %s enumerados son solo los que se muestran en el mapa."
 
-#: src/TouchPoint-WP/Involvement.php:3995
+#: src/TouchPoint-WP/Involvement.php:3982
 msgid "Men Only"
 msgstr "Solo hombres"
 
-#: src/TouchPoint-WP/Involvement.php:3998
+#: src/TouchPoint-WP/Involvement.php:3985
 msgid "Women Only"
 msgstr "Solo mujeres"
 
-#: src/TouchPoint-WP/Involvement.php:4077
+#: src/TouchPoint-WP/Involvement.php:4064
 msgid "Contact Leaders"
 msgstr "Contacta con las líderes"
 
-#: src/TouchPoint-WP/Involvement.php:4148
-#: src/TouchPoint-WP/Involvement.php:4209
+#: src/TouchPoint-WP/Involvement.php:4135
+#: src/TouchPoint-WP/Involvement.php:4196
 msgid "Register"
 msgstr "Regístrate ahora"
 
-#: src/TouchPoint-WP/Involvement.php:4154
+#: src/TouchPoint-WP/Involvement.php:4141
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: src/TouchPoint-WP/Involvement.php:4158
+#: src/TouchPoint-WP/Involvement.php:4145
 msgid "Schedule"
 msgstr "Programe"
 
-#: src/TouchPoint-WP/Involvement.php:4163
+#: src/TouchPoint-WP/Involvement.php:4150
 msgid "Give"
 msgstr "Dar"
 
-#: src/TouchPoint-WP/Involvement.php:4166
+#: src/TouchPoint-WP/Involvement.php:4153
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: src/TouchPoint-WP/Involvement.php:4169
+#: src/TouchPoint-WP/Involvement.php:4156
 msgid "Record Attendance"
 msgstr "Registre su asistencia"
 
-#: src/TouchPoint-WP/Involvement.php:4172
+#: src/TouchPoint-WP/Involvement.php:4159
 msgid "Get Tickets"
 msgstr "Obtener boletos"
 
-#: src/TouchPoint-WP/Involvement.php:4200
+#: src/TouchPoint-WP/Involvement.php:4187
 #: assets/js/base-defer.js:1000
 msgid "Join"
 msgstr "Únete"
 
-#: src/TouchPoint-WP/Involvement.php:4094
+#: src/TouchPoint-WP/Involvement.php:4081
 #: src/TouchPoint-WP/Partner.php:1357
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
@@ -293,11 +293,11 @@ msgstr "No se muestra en el mapa"
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr "No se proporcionó una identificación de usuario de WordPress para inicializar un objeto de persona."
 
-#: src/TouchPoint-WP/Person.php:707
+#: src/TouchPoint-WP/Person.php:711
 msgid "TouchPoint People ID"
 msgstr "ID de Personas de TouchPoint"
 
-#: src/TouchPoint-WP/Person.php:1264
+#: src/TouchPoint-WP/Person.php:1268
 msgid "Contact"
 msgstr "Contacta"
 
@@ -804,7 +804,7 @@ msgstr "Configuración de TouchPoint-WP"
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: src/TouchPoint-WP/Person.php:1558
+#: src/TouchPoint-WP/Person.php:1562
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:20
 msgid "and"
@@ -1272,7 +1272,7 @@ msgstr "%1$s, hasta el %2$s"
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:4016
+#: src/TouchPoint-WP/Involvement.php:4003
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -1317,8 +1317,8 @@ msgstr "Solo se permiten solicitudes POST."
 msgid "Invalid data provided."
 msgstr "Datos proporcionados no válidos."
 
-#: src/TouchPoint-WP/Involvement.php:4332
-#: src/TouchPoint-WP/Involvement.php:4437
+#: src/TouchPoint-WP/Involvement.php:4319
+#: src/TouchPoint-WP/Involvement.php:4424
 msgid "Invalid Post Type."
 msgstr "Tipo de publicación no válida."
 
@@ -1458,7 +1458,7 @@ msgstr "Importar imágenes desde TouchPoint"
 msgid "Importing images sometimes conflicts with other plugins. Disabling image imports can help."
 msgstr "La importación de imágenes a veces entra en conflicto con otros complementos. Deshabilitar las importaciones de imágenes puede ayudar."
 
-#: src/TouchPoint-WP/Person.php:1565
+#: src/TouchPoint-WP/Person.php:1569
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr "otros"
@@ -1483,8 +1483,8 @@ msgstr "Slug de reuniones"
 msgid "The root path for Meetings"
 msgstr "La ruta raíz para las reuniones"
 
-#: src/TouchPoint-WP/Involvement.php:4424
-#: src/TouchPoint-WP/Person.php:1951
+#: src/TouchPoint-WP/Involvement.php:4411
+#: src/TouchPoint-WP/Person.php:1955
 msgid "Contact Prohibited."
 msgstr "Contacto prohibido."
 
@@ -1504,16 +1504,16 @@ msgstr "Una vez que haya configurado y guardado la configuración en esta págin
 msgid "Something went wrong."
 msgstr "Algo salió mal."
 
-#: src/TouchPoint-WP/Person.php:1802
+#: src/TouchPoint-WP/Person.php:1806
 msgid "You may need to sign in."
 msgstr "Es posible que tengas que iniciar sesión."
 
-#: src/TouchPoint-WP/Involvement.php:4414
-#: src/TouchPoint-WP/Person.php:1968
+#: src/TouchPoint-WP/Involvement.php:4401
+#: src/TouchPoint-WP/Person.php:1972
 msgid "Contact Blocked for Spam."
 msgstr "Contacto bloqueado por spam."
 
-#: src/TouchPoint-WP/Person.php:1704
+#: src/TouchPoint-WP/Person.php:1708
 msgid "Registration Blocked for Spam."
 msgstr "Registro bloqueado por spam."
 
@@ -1657,7 +1657,7 @@ msgid "%s is cancelled."
 msgstr "%s esta cancelado."
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:4106
+#: src/TouchPoint-WP/Involvement.php:4093
 #, php-format
 msgid "Involvement in %s"
 msgstr "Participaciones en %s"
@@ -1995,7 +1995,7 @@ msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
 #: src/TouchPoint-WP/Involvement.php:1694
-#: src/TouchPoint-WP/Person.php:2001
+#: src/TouchPoint-WP/Person.php:2005
 msgid "None right now."
 msgstr "Nada por ahora"
 
@@ -2112,7 +2112,7 @@ msgid "Version: %s"
 msgstr "versión: %s"
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1278
+#: src/TouchPoint-WP/Person.php:1282
 #, php-format
 msgid "Profile in %s"
 msgstr "Perfil en %s"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 41315e89..a4234883 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-02T04:36:37+00:00\n"
+"POT-Creation-Date: 2026-04-09T02:32:47+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -338,7 +338,7 @@ msgstr ""
 
 #. translators: number of miles
 #: src/templates/parts/involvement-nearby-list.php:10
-#: src/TouchPoint-WP/Involvement.php:4016
+#: src/TouchPoint-WP/Involvement.php:4003
 #, php-format
 msgctxt "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'"
 msgid "%2.1fmi"
@@ -477,7 +477,7 @@ msgid "%1$s, through %2$s"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1694
-#: src/TouchPoint-WP/Person.php:2001
+#: src/TouchPoint-WP/Person.php:2005
 msgid "None right now."
 msgstr ""
 
@@ -546,75 +546,75 @@ msgstr ""
 msgid "Could not locate."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3995
+#: src/TouchPoint-WP/Involvement.php:3982
 msgid "Men Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:3998
+#: src/TouchPoint-WP/Involvement.php:3985
 msgid "Women Only"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4077
+#: src/TouchPoint-WP/Involvement.php:4064
 msgid "Contact Leaders"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4094
+#: src/TouchPoint-WP/Involvement.php:4081
 #: src/TouchPoint-WP/Partner.php:1357
 msgid "Show on Map"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Involvement.php:4106
+#: src/TouchPoint-WP/Involvement.php:4093
 #, php-format
 msgid "Involvement in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4148
-#: src/TouchPoint-WP/Involvement.php:4209
+#: src/TouchPoint-WP/Involvement.php:4135
+#: src/TouchPoint-WP/Involvement.php:4196
 msgid "Register"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4154
+#: src/TouchPoint-WP/Involvement.php:4141
 msgid "Create Account"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4158
+#: src/TouchPoint-WP/Involvement.php:4145
 msgid "Schedule"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4163
+#: src/TouchPoint-WP/Involvement.php:4150
 msgid "Give"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4166
+#: src/TouchPoint-WP/Involvement.php:4153
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4169
+#: src/TouchPoint-WP/Involvement.php:4156
 msgid "Record Attendance"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4172
+#: src/TouchPoint-WP/Involvement.php:4159
 msgid "Get Tickets"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4200
+#: src/TouchPoint-WP/Involvement.php:4187
 #: assets/js/base-defer.js:1000
 msgid "Join"
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4332
-#: src/TouchPoint-WP/Involvement.php:4437
+#: src/TouchPoint-WP/Involvement.php:4319
+#: src/TouchPoint-WP/Involvement.php:4424
 msgid "Invalid Post Type."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4414
-#: src/TouchPoint-WP/Person.php:1968
+#: src/TouchPoint-WP/Involvement.php:4401
+#: src/TouchPoint-WP/Person.php:1972
 msgid "Contact Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Involvement.php:4424
-#: src/TouchPoint-WP/Person.php:1951
+#: src/TouchPoint-WP/Involvement.php:4411
+#: src/TouchPoint-WP/Person.php:1955
 msgid "Contact Prohibited."
 msgstr ""
 
@@ -685,36 +685,36 @@ msgstr ""
 msgid "No WordPress User ID provided for initializing a person object."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:707
+#: src/TouchPoint-WP/Person.php:711
 msgid "TouchPoint People ID"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1264
+#: src/TouchPoint-WP/Person.php:1268
 msgid "Contact"
 msgstr ""
 
 #. Translators: %s is the system name, "TouchPoint" by default.
-#: src/TouchPoint-WP/Person.php:1278
+#: src/TouchPoint-WP/Person.php:1282
 #, php-format
 msgid "Profile in %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1558
+#: src/TouchPoint-WP/Person.php:1562
 #: src/TouchPoint-WP/Utilities.php:299
 #: assets/js/base-defer.js:20
 msgid "and"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1565
+#: src/TouchPoint-WP/Person.php:1569
 msgctxt "list of people, and *others*"
 msgid "others"
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1704
+#: src/TouchPoint-WP/Person.php:1708
 msgid "Registration Blocked for Spam."
 msgstr ""
 
-#: src/TouchPoint-WP/Person.php:1802
+#: src/TouchPoint-WP/Person.php:1806
 msgid "You may need to sign in."
 msgstr ""
 

From 349b3bfbf2a9e531417338535d25ae3be5425993 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 Apr 2026 22:37:29 -0400
Subject: [PATCH 393/423] package updates

---
 .gitignore        |     5 +-
 composer.lock     |  1837 +++
 package-lock.json | 27928 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 29769 insertions(+), 1 deletion(-)
 create mode 100644 composer.lock
 create mode 100644 package-lock.json

diff --git a/.gitignore b/.gitignore
index d97c6172..d628dab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 /vendor/
 /vendorX/
-composer.lock
 /assets/images/people
 /TouchPointWP_ErrorLog.txt
 /.phpdoc/
@@ -16,10 +15,14 @@ composer.lock
 /.idea/copilotDiffState.xml
 /.idea/data_source_mapping.xml
 /.idea/copilot*
+/.idea/db-forest-config.xml
+/.idea/sshConfigs.xml
 
 *.min.js
 node_modules
 
+.phpunit.result.cache
+
 /i18n/*.json
 /i18n/*.mo
 /i18n/*.l10n.php
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000..81846855
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,1837 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "0b57ae97067961f50b8a9ffb3a199c36",
+    "packages": [
+        {
+            "name": "composer/installers",
+            "version": "v1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19",
+                "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.6.* || ^2.0",
+                "composer/semver": "^1 || ^3",
+                "phpstan/phpstan": "^0.12.55",
+                "phpstan/phpstan-phpunit": "^0.12.16",
+                "symfony/phpunit-bridge": "^4.2 || ^5",
+                "symfony/process": "^2.3"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "Lan Management System",
+                "MODX Evo",
+                "MantisBT",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Starbug",
+                "Thelia",
+                "Whmcs",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "eZ Platform",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "joomla",
+                "known",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "majima",
+                "mako",
+                "mediawiki",
+                "miaoxing",
+                "modulework",
+                "modx",
+                "moodle",
+                "osclass",
+                "pantheon",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "processwire",
+                "puppet",
+                "pxcms",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "sylius",
+                "symfony",
+                "tastyigniter",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v1.12.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-09-13T08:19:44+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/deprecations",
+            "version": "1.1.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca",
+                "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<=7.5 || >=14"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9 || ^12 || ^14",
+                "phpstan/phpstan": "1.4.10 || 2.1.30",
+                "phpstan/phpstan-phpunit": "^1.0 || ^2",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12.4 || ^13.0",
+                "psr/log": "^1 || ^2 || ^3"
+            },
+            "suggest": {
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Deprecations\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.6"
+            },
+            "time": "2026-02-07T07:09:04+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.19.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "51bd93cc741b7fc3d63d20b6bdcd99fdaa359837"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/51bd93cc741b7fc3d63d20b6bdcd99fdaa359837",
+                "reference": "51bd93cc741b7fc3d63d20b6bdcd99fdaa359837",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.5"
+            },
+            "time": "2025-12-06T11:45:25+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/Reflection.git",
+                "reference": "447928a45710d6313e68774cf12b5f730b909baa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/447928a45710d6313e68774cf12b5f730b909baa",
+                "reference": "447928a45710d6313e68774cf12b5f730b909baa",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.0",
+                "php": ">=7.2",
+                "phpdocumentor/reflection-common": "^2.0",
+                "phpdocumentor/reflection-docblock": "^5",
+                "phpdocumentor/type-resolver": "^1.0",
+                "psr/log": "~1.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "~1.2",
+                "mockery/mockery": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-4.x": "4.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\": "src/phpDocumentor"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Reflection library to do Static Analysis for PHP Projects",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/Reflection/issues",
+                "source": "https://github.com/phpDocumentor/Reflection/tree/4.x"
+            },
+            "time": "2020-06-19T18:26:14+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "5.6.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/5cee1d3dfc2d2aa6599834520911d246f656bcb8",
+                "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/deprecations": "^1.1",
+                "ext-filter": "*",
+                "php": "^7.4 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7|^2.0",
+                "webmozart/assert": "^1.9.1 || ^2"
+            },
+            "require-dev": {
+                "mockery/mockery": "~1.3.5 || ~1.6.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "psalm/phar": "^5.26"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.6"
+            },
+            "time": "2025-12-22T21:13:58+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195",
+                "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/deprecations": "^1.0",
+                "php": "^7.3 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0",
+                "phpstan/phpdoc-parser": "^1.18|^2.0"
+            },
+            "require-dev": {
+                "ext-tokenizer": "*",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^9.5",
+                "rector/rector": "^0.13.9",
+                "vimeo/psalm": "^4.25"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0"
+            },
+            "time": "2025-11-21T15:09:14+00:00"
+        },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "2.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a",
+                "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^5.3.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2"
+            },
+            "time": "2026-01-25T14:56:51+00:00"
+        },
+        {
+            "name": "pronamic/wp-documentor",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pronamic/wp-documentor.git",
+                "reference": "a81e7626f2dc5a3767bbce010584c7a08813ffeb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pronamic/wp-documentor/zipball/a81e7626f2dc5a3767bbce010584c7a08813ffeb",
+                "reference": "a81e7626f2dc5a3767bbce010584c7a08813ffeb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0",
+                "phpdocumentor/reflection": "^4.0",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "symfony/console": "^5.0 || ^6.0 || ^6.1 || ^6.2",
+                "symfony/filesystem": "^5.0 || ^6.0 || ^6.1 || ^6.2",
+                "symfony/finder": "^5.0 || ^6.0 || ^6.1 || ^6.2",
+                "symfony/polyfill-php80": "^1.24"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpcompatibility/phpcompatibility-wp": "^2.1",
+                "phpdocumentor/phpdocumentor": "^3.0",
+                "roots/wordpress": "^5.7",
+                "squizlabs/php_codesniffer": "^3.6",
+                "wp-coding-standards/wpcs": "^2.3"
+            },
+            "bin": [
+                "bin/wp-documentor"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Pronamic\\WordPress\\Documentor\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Pronamic",
+                    "email": "info@pronamic.eu",
+                    "homepage": "https://www.pronamic.eu/",
+                    "role": "Company"
+                },
+                {
+                    "name": "Remco Tolsma",
+                    "email": "info@remcotolsma.nl",
+                    "homepage": "https://www.remcotolsma.nl/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Documentation Generator for WordPress.",
+            "keywords": [
+                "api",
+                "application",
+                "dga",
+                "documentation",
+                "phpdoc",
+                "wordpress"
+            ],
+            "support": {
+                "issues": "https://github.com/pronamic/wp-documentor/issues",
+                "source": "https://github.com/pronamic/wp-documentor/tree/v1.4.0"
+            },
+            "time": "2024-05-06T08:16:13+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
+            "time": "2021-05-03T11:20:27+00:00"
+        },
+        {
+            "name": "skayo/phpdoc-md",
+            "version": "0.2.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Skayo/phpdoc-md.git",
+                "reference": "bb603128bd6bf332020f14f0c0875ac875aeef4f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Skayo/phpdoc-md/zipball/bb603128bd6bf332020f14f0c0875ac875aeef4f",
+                "reference": "bb603128bd6bf332020f14f0c0875ac875aeef4f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "twig/twig": "~1.2|2.0"
+            },
+            "require-dev": {
+                "phpdocumentor/phpdocumentor": "~2.8.0",
+                "sabre/cs": "~0.0.5"
+            },
+            "bin": [
+                "bin/phpdocmd"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPDocMD\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "evert@rooftopsolutions.nl",
+                    "homepage": "http://www.rooftopsolutions.nl/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Skayo",
+                    "email": "jonasg.cool@gmail.com",
+                    "homepage": "https://skayo.github.io",
+                    "role": "Contributor"
+                }
+            ],
+            "description": "PHP documentation generator, with markdown output",
+            "homepage": "https://github.com/Skayo/phpdoc-md",
+            "keywords": [
+                "markdown",
+                "php",
+                "phpdoc"
+            ],
+            "support": {
+                "source": "https://github.com/Skayo/phpdoc-md/tree/0.2.5"
+            },
+            "funding": [
+                {
+                    "url": "https://buymeacoff.ee/Skayo",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://liberapay.com/Skayo",
+                    "type": "liberapay"
+                }
+            ],
+            "time": "2018-06-23T23:32:59+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v6.4.32",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
+                "reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v6.4.32"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-01-13T08:45:59+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v6.4.30",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "441c6b69f7222aadae7cbf5df588496d5ee37789"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/441c6b69f7222aadae7cbf5df588496d5ee37789",
+                "reference": "441c6b69f7222aadae7cbf5df588496d5ee37789",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.30"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-11-26T14:43:45+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v6.4.33",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "24965ca011dac87431729640feef8bcf7b5523e0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/24965ca011dac87431729640feef8bcf7b5523e0",
+                "reference": "24965ca011dac87431729640feef8bcf7b5523e0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v6.4.33"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-01-26T13:03:48+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-27T09:58:17+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-12-23T08:48:59+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-01-02T08:10:11+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v3.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
+                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-15T11:30:57+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v7.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "1c4b10461bf2ec27537b5f36105337262f5f5d6f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/1c4b10461bf2ec27537b5f36105337262f5f5d6f",
+                "reference": "1c4b10461bf2ec27537b5f36105337262f5f5d6f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.33",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v7.4.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-01-12T10:54:30+00:00"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.44.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "b1f009c449e435a0384814e67205d9190a4d050e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b1f009c449e435a0384814e67205d9190a4d050e",
+                "reference": "b1f009c449e435a0384814e67205d9190a4d050e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "require-dev": {
+                "psr/container": "^1.0",
+                "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.44-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Twig Team",
+                    "role": "Contributors"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/v1.44.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T17:17:16+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.12.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-date": "*",
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "suggest": {
+                "ext-intl": "",
+                "ext-simplexml": "",
+                "ext-spl": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.12.1"
+            },
+            "time": "2025-10-29T15:56:20+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {},
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=8.0",
+        "ext-json": "*",
+        "ext-zip": "*",
+        "ext-dom": "*"
+    },
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..8b0f5c96
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,27928 @@
+{
+  "name": "touchpoint-wp",
+  "version": "0.0.97",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "touchpoint-wp",
+      "version": "0.0.97",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "@wordpress/components": "^30.0.0",
+        "@wordpress/element": "^6.27.0"
+      },
+      "devDependencies": {
+        "@wordpress/block-editor": "^14",
+        "@wordpress/blocks": "^14",
+        "@wordpress/env": "^10",
+        "@wordpress/i18n": "^5",
+        "@wordpress/scripts": "^30.18.0",
+        "baseline-browser-mapping": "^2.10.12",
+        "style-loader": "^4.0.0",
+        "uglify-js": "^3.17.4"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@ariakit/core": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.4.18.tgz",
+      "integrity": "sha512-9urEa+GbZTSyredq3B/3thQjTcSZSUC68XctwCkJNH/xNfKN5O+VThiem2rcJxpsGw8sRUQenhagZi0yB4foyg==",
+      "license": "MIT"
+    },
+    "node_modules/@ariakit/react": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.4.24.tgz",
+      "integrity": "sha512-kL0+7ZdPXM8uJ2/cCudm94QKh2DAcE8kNcPnFgnyXaMhStpvkEIumSEu0dIHAGkv7s6NWWANrGZK7ADwcXjoXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@ariakit/react-core": "0.4.24"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ariakit"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@ariakit/react-core": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.4.24.tgz",
+      "integrity": "sha512-MuqDooqkeaYCeMpvj+ygcONb2bS3CGniD3mW99l7P8Fioa+/kPvQCQfJjC6pR9mWFPCRiOpDjfXGREaYgm5olQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@ariakit/core": "0.4.18",
+        "@floating-ui/dom": "^1.0.0",
+        "use-sync-external-store": "^1.2.0"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz",
+      "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helpers": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.7.tgz",
+      "integrity": "sha512-B+BO9x86VYsQHimucBAL1fxTJKF4wyKY6ZVzee9QgzdZOUfs3BaR6AQrgoGrRI+7IFS1wUz/VyQ+SoBcSpdPbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.27.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz",
+      "integrity": "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.28.6",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz",
+      "integrity": "sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "regexpu-core": "^6.3.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.8.tgz",
+      "integrity": "sha512-47UwBLPpQi1NoWzLuHNjRoHlYXMwIJoBf7MFou6viC/sIHWYygpvr0B6IAyh5sBdA2nr2LPIRww8lfaUVQINBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "debug": "^4.4.3",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.22.11"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz",
+      "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz",
+      "integrity": "sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.6.tgz",
+      "integrity": "sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
+      "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
+      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.0"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz",
+      "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.6.tgz",
+      "integrity": "sha512-a0aBScVTlNaiUe35UtfxAN7A/tehvvG4/ByO6+46VPKTRSlfnAFsgKy0FUh+qAkQrDTmhDkT+IBOKlOoMUxQ0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/traverse": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.28.6.tgz",
+      "integrity": "sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
+      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
+      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz",
+      "integrity": "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz",
+      "integrity": "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.29.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.28.6.tgz",
+      "integrity": "sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.6.tgz",
+      "integrity": "sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.28.6.tgz",
+      "integrity": "sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.6.tgz",
+      "integrity": "sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.6.tgz",
+      "integrity": "sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-replace-supers": "^7.28.6",
+        "@babel/traverse": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.28.6.tgz",
+      "integrity": "sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/template": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz",
+      "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.28.6.tgz",
+      "integrity": "sha512-SljjowuNKB7q5Oayv4FoPzeB74g3QgLt8IVJw9ADvWy3QnUb/01aw8I4AVv8wYnPvQz2GDDZ/g3GhcNyDBI4Bg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.6.tgz",
+      "integrity": "sha512-Iao5Konzx2b6g7EPqTy40UZbcdXE126tTxVFr/nAIj+WItNxjKSYTEw3RC+A2/ZetmdJsgueL1KhaMCQHkLPIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.6.tgz",
+      "integrity": "sha512-WitabqiGjV/vJ0aPOLSFfNY1u9U3R7W36B03r5I2KoNix+a3sOhJ3pKFB3R5It9/UiK78NiO0KE9P21cMhlPkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.28.6.tgz",
+      "integrity": "sha512-Nr+hEN+0geQkzhbdgQVPoqr47lZbm+5fCUmO70722xJZd0Mvb59+33QLImGj6F+DkK3xgDi1YVysP8whD6FQAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.6.tgz",
+      "integrity": "sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.28.6.tgz",
+      "integrity": "sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz",
+      "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.29.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.28.6.tgz",
+      "integrity": "sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.28.6.tgz",
+      "integrity": "sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.6.tgz",
+      "integrity": "sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/traverse": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.28.6.tgz",
+      "integrity": "sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.6.tgz",
+      "integrity": "sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.28.6.tgz",
+      "integrity": "sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.28.6.tgz",
+      "integrity": "sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-constant-elements": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.27.1.tgz",
+      "integrity": "sha512-edoidOjl/ZxvYo4lSBOQGDSyToYVkTAwyVoa2tkuYTSmjrB1+uAedoL5iROVLXkxH+vRgA7uP4tMg2pUJpZ3Ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-display-name": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
+      "integrity": "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz",
+      "integrity": "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-syntax-jsx": "^7.28.6",
+        "@babel/types": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx-development": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz",
+      "integrity": "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-transform-react-jsx": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.27.1.tgz",
+      "integrity": "sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz",
+      "integrity": "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.28.6.tgz",
+      "integrity": "sha512-QGWAepm9qxpaIs7UM9FvUSnCGlb8Ua1RhyM4/veAxLwt3gMat/LSGrZixyuj4I6+Kn9iwvqCyPTtbdxanYoWYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.7.tgz",
+      "integrity": "sha512-Y9p487tyTzB0yDYQOtWnC+9HGOuogtP3/wNpun1xJXEEvI6vip59BSBTsHnekZLqxmPcgsrAKt46HAAb//xGhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "core-js-compat": "^3.38.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.28.6.tgz",
+      "integrity": "sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.6.tgz",
+      "integrity": "sha512-0YWL2RFxOqEm9Efk5PvreamxPME8OyY0wM5wh5lHjF+VtVhdneCWGzZeSqzOfiobVqQaNCd2z0tQvnI9DaPWPw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.28.6.tgz",
+      "integrity": "sha512-4Wlbdl/sIZjzi/8St0evF0gEZrgOswVO6aOzqxh1kDZOl9WmLrHq2HtGhnOJZmHZYKP8WZ1MDLCt5DAWwRo57A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.28.6.tgz",
+      "integrity": "sha512-/wHc/paTUmsDYN7SZkpWxogTOBNnlx7nBQYfy6JJlCT7G3mVhltk3e++N7zV0XfgGsrqBxd4rJQt9H16I21Y1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.2.tgz",
+      "integrity": "sha512-DYD23veRYGvBFhcTY1iUvJnDNpuqNd/BzBwCvzOTKUnJjKg5kpUBh3/u9585Agdkgj+QuygG7jLfOPWMa2KVNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-import-assertions": "^7.28.6",
+        "@babel/plugin-syntax-import-attributes": "^7.28.6",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.29.0",
+        "@babel/plugin-transform-async-to-generator": "^7.28.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.28.6",
+        "@babel/plugin-transform-class-properties": "^7.28.6",
+        "@babel/plugin-transform-class-static-block": "^7.28.6",
+        "@babel/plugin-transform-classes": "^7.28.6",
+        "@babel/plugin-transform-computed-properties": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-dotall-regex": "^7.28.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.0",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.6",
+        "@babel/plugin-transform-exponentiation-operator": "^7.28.6",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.28.6",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.28.6",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.28.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.29.0",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
+        "@babel/plugin-transform-numeric-separator": "^7.28.6",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.6",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.28.6",
+        "@babel/plugin-transform-optional-chaining": "^7.28.6",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/plugin-transform-private-methods": "^7.28.6",
+        "@babel/plugin-transform-private-property-in-object": "^7.28.6",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.29.0",
+        "@babel/plugin-transform-regexp-modifiers": "^7.28.6",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.28.6",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.28.6",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.28.6",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.15",
+        "babel-plugin-polyfill-corejs3": "^0.14.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.6",
+        "core-js-compat": "^3.48.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/preset-react": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.28.5.tgz",
+      "integrity": "sha512-Z3J8vhRq7CeLjdC58jLv4lnZ5RKFUJWqH5emvxmv9Hv3BD1T9R/Im713R4MTKwvFaV74ejZ3sM01LyEKk4ugNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-transform-react-display-name": "^7.28.0",
+        "@babel/plugin-transform-react-jsx": "^7.27.1",
+        "@babel/plugin-transform-react-jsx-development": "^7.27.1",
+        "@babel/plugin-transform-react-pure-annotations": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-typescript": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz",
+      "integrity": "sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-typescript": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
+      "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cacheable/memory": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.0.8.tgz",
+      "integrity": "sha512-FvEb29x5wVwu/Kf93IWwsOOEuhHh6dYCJF3vcKLzXc0KXIW181AOzv6ceT4ZpBHDvAfG60eqb+ekmrnLHIy+jw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/utils": "^2.4.0",
+        "@keyv/bigmap": "^1.3.1",
+        "hookified": "^1.15.1",
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/memory/node_modules/@keyv/bigmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
+      "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.4.0",
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/memory/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
+    "node_modules/@cacheable/utils": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.4.1.tgz",
+      "integrity": "sha512-eiFgzCbIneyMlLOmNG4g9xzF7Hv3Mga4LjxjcSC/ues6VYq2+gUbQI8JqNuw/ZM8tJIeIaBGpswAsqV2V7ApgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.5.1",
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/utils/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-syntax-patches-for-csstree": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.2.tgz",
+      "integrity": "sha512-5GkLzz4prTIpoyeUiIu3iV6CSG3Plo7xRVOFPKI7FVEJ3mZ0A8SwK0XU3Gl7xAkiQ+mDyam+NNp875/C5y+jSA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "peerDependencies": {
+        "css-tree": "^3.2.1"
+      },
+      "peerDependenciesMeta": {
+        "css-tree": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/media-query-list-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz",
+      "integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.1",
+        "@csstools/css-tokenizer": "^3.0.1"
+      }
+    },
+    "node_modules/@date-fns/tz": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz",
+      "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==",
+      "license": "MIT"
+    },
+    "node_modules/@date-fns/utc": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@date-fns/utc/-/utc-2.1.1.tgz",
+      "integrity": "sha512-SlJDfG6RPeEX8wEVv6ZB3kak4MmbtyiI2qX/5zuKdordbrhB/iaJ58GVMZgJ6P1sJaM1gMgENFYYeg1JWrCFrA==",
+      "license": "MIT"
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@dual-bundle/import-meta-resolve": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz",
+      "integrity": "sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/JounQin"
+      }
+    },
+    "node_modules/@emnapi/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.2.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz",
+      "integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/wasi-threads": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz",
+      "integrity": "sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emotion/babel-plugin": {
+      "version": "11.13.5",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
+      "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/runtime": "^7.18.3",
+        "@emotion/hash": "^0.9.2",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/serialize": "^1.3.3",
+        "babel-plugin-macros": "^3.1.0",
+        "convert-source-map": "^1.5.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-root": "^1.1.0",
+        "source-map": "^0.5.7",
+        "stylis": "4.2.0"
+      }
+    },
+    "node_modules/@emotion/cache": {
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz",
+      "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/sheet": "^1.4.0",
+        "@emotion/utils": "^1.4.2",
+        "@emotion/weak-memoize": "^0.4.0",
+        "stylis": "4.2.0"
+      }
+    },
+    "node_modules/@emotion/css": {
+      "version": "11.13.5",
+      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.13.5.tgz",
+      "integrity": "sha512-wQdD0Xhkn3Qy2VNcIzbLP9MR8TafI0MJb7BEAXKp+w4+XqErksWR4OXomuDzPsN4InLdGhVe6EYcn2ZIUCpB8w==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/babel-plugin": "^11.13.5",
+        "@emotion/cache": "^11.13.5",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/sheet": "^1.4.0",
+        "@emotion/utils": "^1.4.2"
+      }
+    },
+    "node_modules/@emotion/hash": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
+      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
+      "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/memoize": "^0.9.0"
+      }
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/react": {
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
+      "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@emotion/babel-plugin": "^11.13.5",
+        "@emotion/cache": "^11.14.0",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
+        "@emotion/utils": "^1.4.2",
+        "@emotion/weak-memoize": "^0.4.0",
+        "hoist-non-react-statics": "^3.3.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@emotion/serialize": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz",
+      "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/hash": "^0.9.2",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/unitless": "^0.10.0",
+        "@emotion/utils": "^1.4.2",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@emotion/sheet": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz",
+      "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/styled": {
+      "version": "11.14.1",
+      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
+      "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@emotion/babel-plugin": "^11.13.5",
+        "@emotion/is-prop-valid": "^1.3.0",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
+        "@emotion/utils": "^1.4.2"
+      },
+      "peerDependencies": {
+        "@emotion/react": "^11.0.0-rc.0",
+        "react": ">=16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz",
+      "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz",
+      "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@emotion/utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz",
+      "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/weak-memoize": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
+      "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
+      "license": "MIT"
+    },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.41.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.41.0.tgz",
+      "integrity": "sha512-aKUhyn1QI5Ksbqcr3fFJj16p99QdjUxXAEuFst1Z47DRyoiMwivIH9MV/ARcJOCXVjPfjITciej8ZD2O/6qUmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "comment-parser": "1.4.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@floating-ui/core": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
+      "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.11"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
+      "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.7.5",
+        "@floating-ui/utils": "^0.2.11"
+      }
+    },
+    "node_modules/@floating-ui/react-dom": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz",
+      "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.6.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
+      "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
+      "license": "MIT"
+    },
+    "node_modules/@formatjs/ecma402-abstract": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.6.tgz",
+      "integrity": "sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "2.2.7",
+        "@formatjs/intl-localematcher": "0.6.2",
+        "decimal.js": "^10.4.3",
+        "tslib": "^2.8.0"
+      }
+    },
+    "node_modules/@formatjs/fast-memoize": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.7.tgz",
+      "integrity": "sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.8.0"
+      }
+    },
+    "node_modules/@formatjs/icu-messageformat-parser": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.11.4.tgz",
+      "integrity": "sha512-7kR78cRrPNB4fjGFZg3Rmj5aah8rQj9KPzuLsmcSn4ipLXQvC04keycTI1F7kJYDwIXtT2+7IDEto842CfZBtw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "2.3.6",
+        "@formatjs/icu-skeleton-parser": "1.8.16",
+        "tslib": "^2.8.0"
+      }
+    },
+    "node_modules/@formatjs/icu-skeleton-parser": {
+      "version": "1.8.16",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.16.tgz",
+      "integrity": "sha512-H13E9Xl+PxBd8D5/6TVUluSpxGNvFSlN/b3coUp0e0JpuWXXnQDiavIpY3NnvSp4xhEMoXyyBvVfdFX8jglOHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "2.3.6",
+        "tslib": "^2.8.0"
+      }
+    },
+    "node_modules/@formatjs/intl-localematcher": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.6.2.tgz",
+      "integrity": "sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.8.0"
+      }
+    },
+    "node_modules/@hapi/address": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-5.1.1.tgz",
+      "integrity": "sha512-A+po2d/dVoY7cYajycYI43ZbYMXukuopIsqCjh5QzsBCipDtdofHntljDlpccMjIfTy6UOkg+5KPriwYch2bXA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^11.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@hapi/formula": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-3.0.2.tgz",
+      "integrity": "sha512-hY5YPNXzw1He7s0iqkRQi+uMGh383CGdyyIGYtB+W5N3KHPXoqychklvHhKCC9M3Xtv0OCs/IHw+r4dcHtBYWw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.7.tgz",
+      "integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/pinpoint": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.1.tgz",
+      "integrity": "sha512-EKQmr16tM8s16vTT3cA5L0kZZcTMU5DUOZTuvpnY738m+jyP3JIUj+Mm1xc1rsLkGBQ/gVnfKYPwOmPg1tUR4Q==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/tlds": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@hapi/tlds/-/tlds-1.1.6.tgz",
+      "integrity": "sha512-xdi7A/4NZokvV0ewovme3aUO5kQhW9pQ2YD1hRqZGhhSi5rBv4usHYidVocXSi9eihYsznZxLtAiEYYUL6VBGw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@hapi/topo": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-6.0.2.tgz",
+      "integrity": "sha512-KR3rD5inZbGMrHmgPxsJ9dbi6zEK+C3ZwUwTa+eMwWLz7oijWUTWD2pMSNNYJAU6Qq+65NkxXjqHr/7LM2Xkqg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^11.0.2"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@inquirer/ansi": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-1.0.2.tgz",
+      "integrity": "sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/checkbox": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.3.2.tgz",
+      "integrity": "sha512-VXukHf0RR1doGe6Sm4F0Em7SWYLTHSsbGfJdS9Ja2bX5/D5uwVOEjr07cncLROdBvmnvCATYEWlHqYmXv2IlQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "5.1.21",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.21.tgz",
+      "integrity": "sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "10.3.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.3.2.tgz",
+      "integrity": "sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/editor": {
+      "version": "4.2.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.23.tgz",
+      "integrity": "sha512-aLSROkEwirotxZ1pBaP8tugXRFCxW94gwrQLxXfrZsKkfjOYC1aRvAZuhpJOb5cu4IBTJdsCigUlf2iCOu4ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/external-editor": "^1.0.3",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "4.0.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.23.tgz",
+      "integrity": "sha512-nRzdOyFYnpeYTTR2qFwEVmIWypzdAx/sIkCMeTNTcflFOovfqUk+HcFhQQVBftAh9gmGrpFj6QcGEqrDMDOiew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/external-editor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.3.tgz",
+      "integrity": "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chardet": "^2.1.1",
+        "iconv-lite": "^0.7.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.15.tgz",
+      "integrity": "sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/input": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.3.1.tgz",
+      "integrity": "sha512-kN0pAM4yPrLjJ1XJBjDxyfDduXOuQHrBB8aLDMueuwUGn+vNpF7Gq7TvyVxx8u4SHlFFj4trmj+a2cbpG4Jn1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.23.tgz",
+      "integrity": "sha512-5Smv0OK7K0KUzUfYUXDXQc9jrf8OHo4ktlEayFlelCjwMXz0299Y8OrI+lj7i4gCBY15UObk76q0QtxjzFcFcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "4.0.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.23.tgz",
+      "integrity": "sha512-zREJHjhT5vJBMZX/IUbyI9zVtVfOLiTO66MrF/3GFZYZ7T4YILW5MSkEYHceSii/KtRk+4i3RE7E1CUXA2jHcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.10.1.tgz",
+      "integrity": "sha512-Dx/y9bCQcXLI5ooQ5KyvA4FTgeo2jYj/7plWfV5Ak5wDPKQZgudKez2ixyfz7tKXzcJciTxqLeK7R9HItwiByg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/checkbox": "^4.3.2",
+        "@inquirer/confirm": "^5.1.21",
+        "@inquirer/editor": "^4.2.23",
+        "@inquirer/expand": "^4.0.23",
+        "@inquirer/input": "^4.3.1",
+        "@inquirer/number": "^3.0.23",
+        "@inquirer/password": "^4.0.23",
+        "@inquirer/rawlist": "^4.1.11",
+        "@inquirer/search": "^3.2.2",
+        "@inquirer/select": "^4.4.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.11.tgz",
+      "integrity": "sha512-+LLQB8XGr3I5LZN/GuAHo+GpDJegQwuPARLChlMICNdwW7OwV2izlCSCxN6cqpL0sMXmbKbFcItJgdQq5EBXTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.2.2.tgz",
+      "integrity": "sha512-p2bvRfENXCZdWF/U2BXvnSI9h+tuA8iNqtUKb9UWbmLYCRQxd8WkvwWvYn+3NgYaNwdUkHytJMGG4MMLucI1kA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.4.2.tgz",
+      "integrity": "sha512-l4xMuJo55MAe+N7Qr4rX90vypFwCajSakx59qe/tMaC1aEHWLyw68wF4o0A4SLAY4E0nd+Vt+EyskeDIqu1M6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.10.tgz",
+      "integrity": "sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@kwsites/file-exists": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
+      "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.1"
+      }
+    },
+    "node_modules/@kwsites/promise-deferred": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
+      "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@tybys/wasm-util": "^0.10.0"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@octokit/app": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-14.1.0.tgz",
+      "integrity": "sha512-g3uEsGOQCBl1+W1rgfwoRFUIR6PtvB2T1E4RpygeUU5LrLvlOqcxrt5lfykIeRpUPpupreGJUYl70fqMDXdTpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-app": "^6.0.0",
+        "@octokit/auth-unauthenticated": "^5.0.0",
+        "@octokit/core": "^5.0.0",
+        "@octokit/oauth-app": "^6.0.0",
+        "@octokit/plugin-paginate-rest": "^9.0.0",
+        "@octokit/types": "^12.0.0",
+        "@octokit/webhooks": "^12.0.4"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-app": {
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-6.1.4.tgz",
+      "integrity": "sha512-QkXkSOHZK4dA5oUqY5Dk3S+5pN2s1igPjEASNQV8/vgJgW034fQWR16u7VsNOK/EljA00eyjYF5mWNxWKWhHRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-oauth-app": "^7.1.0",
+        "@octokit/auth-oauth-user": "^4.1.0",
+        "@octokit/request": "^8.3.1",
+        "@octokit/request-error": "^5.1.0",
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.3.1",
+        "lru-cache": "npm:@wolfy1339/lru-cache@^11.0.2-patch.1",
+        "universal-github-app-jwt": "^1.1.2",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-app/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/auth-app/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/auth-app/node_modules/lru-cache": {
+      "name": "@wolfy1339/lru-cache",
+      "version": "11.0.2-patch.1",
+      "resolved": "https://registry.npmjs.org/@wolfy1339/lru-cache/-/lru-cache-11.0.2-patch.1.tgz",
+      "integrity": "sha512-BgYZfL2ADCXKOw2wJtkM3slhHotawWkgIRRxq4wEybnZQPjvAp71SPX35xepMykTw8gXlzWcWPTY31hlbnRsDA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "18 >=18.20 || 20 || >=22"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-app": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-7.1.0.tgz",
+      "integrity": "sha512-w+SyJN/b0l/HEb4EOPRudo7uUOSW51jcK1jwLa+4r7PA8FPFpoxEnHBHMITqCsc/3Vo2qqFjgQfz/xUUvsSQnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-oauth-device": "^6.1.0",
+        "@octokit/auth-oauth-user": "^4.1.0",
+        "@octokit/request": "^8.3.1",
+        "@octokit/types": "^13.0.0",
+        "@types/btoa-lite": "^1.0.0",
+        "btoa-lite": "^1.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-device": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-6.1.0.tgz",
+      "integrity": "sha512-FNQ7cb8kASufd6Ej4gnJ3f1QB5vJitkoV1O0/g6e6lUsQ7+VsSNRHRmFScN2tV4IgKA12frrr/cegUs0t+0/Lw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/oauth-methods": "^4.1.0",
+        "@octokit/request": "^8.3.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-user": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-4.1.0.tgz",
+      "integrity": "sha512-FrEp8mtFuS/BrJyjpur+4GARteUCrPeR/tZJzD8YourzoVhRics7u7we/aDcKv+yywRNwNi/P4fRi631rG/OyQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-oauth-device": "^6.1.0",
+        "@octokit/oauth-methods": "^4.1.0",
+        "@octokit/request": "^8.3.1",
+        "@octokit/types": "^13.0.0",
+        "btoa-lite": "^1.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-unauthenticated": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-5.0.1.tgz",
+      "integrity": "sha512-oxeWzmBFxWd+XolxKTc4zr+h3mt+yofn4r7OfoIkR/Cj/o70eEGmPsFbueyJE2iBAGpjgTnEOKM3pnuEGVmiqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^12.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz",
+      "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/endpoint/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/endpoint/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/graphql/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/oauth-app": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-app/-/oauth-app-6.1.0.tgz",
+      "integrity": "sha512-nIn/8eUJ/BKUVzxUXd5vpzl1rwaVxMyYbQkNZjHrF7Vk/yu98/YDF/N2KeWO7uZ0g3b5EyiFXFkZI8rJ+DH1/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-oauth-app": "^7.0.0",
+        "@octokit/auth-oauth-user": "^4.0.0",
+        "@octokit/auth-unauthenticated": "^5.0.0",
+        "@octokit/core": "^5.0.0",
+        "@octokit/oauth-authorization-url": "^6.0.2",
+        "@octokit/oauth-methods": "^4.0.0",
+        "@types/aws-lambda": "^8.10.83",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/oauth-authorization-url": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-authorization-url/-/oauth-authorization-url-6.0.2.tgz",
+      "integrity": "sha512-CdoJukjXXxqLNK4y/VOiVzQVjibqoj/xHgInekviUJV73y/BSIcwvJ/4aNHPBPKcPWFnd4/lO9uqRV65jXhcLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/oauth-methods": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-4.1.0.tgz",
+      "integrity": "sha512-4tuKnCRecJ6CG6gr0XcEXdZtkTDbfbnD5oaHBmLERTjTMZNi2CbfEHZxPU41xXLDG4DfKf+sonu00zvKI9NSbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/oauth-authorization-url": "^6.0.2",
+        "@octokit/request": "^8.3.1",
+        "@octokit/request-error": "^5.1.0",
+        "@octokit/types": "^13.0.0",
+        "btoa-lite": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-graphql": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-graphql/-/plugin-paginate-graphql-4.0.1.tgz",
+      "integrity": "sha512-R8ZQNmrIKKpHWC6V2gum4x9LG2qF1RxRjo27gjQcG3j+vf2tLsEfE7I/wRWEPzYMaenr1M+qDAtNcwZve1ce1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=5"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-retry": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-6.1.0.tgz",
+      "integrity": "sha512-WrO3bvq4E1Xh1r2mT9w6SDFg01gFmP81nIG77+p/MqW1JeXXgL++6umim3t6x0Zj5pZm3rXAN+0HEjmmdhIRig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^13.0.0",
+        "bottleneck": "^2.15.3"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-retry/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-retry/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/plugin-throttling": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-8.2.0.tgz",
+      "integrity": "sha512-nOpWtLayKFpgqmgD0y3GqXafMFuKcA4tRPZIfu7BArd2lEZeb1988nhWhwx4aZWmjDmUfdgVf7W+Tt4AmvRmMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.2.0",
+        "bottleneck": "^2.15.3"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "^5.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/webhooks": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-12.3.2.tgz",
+      "integrity": "sha512-exj1MzVXoP7xnAcAB3jZ97pTvVPkQF9y6GA/dvYC47HV7vLv+24XRS6b/v/XnyikpEuvMhugEXdGtAlU086WkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/webhooks-methods": "^4.1.0",
+        "@octokit/webhooks-types": "7.6.1",
+        "aggregate-error": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/webhooks-methods": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-4.1.0.tgz",
+      "integrity": "sha512-zoQyKw8h9STNPqtm28UGOYFE7O6D4Il8VJwhAtMHFt2C4L0VQT1qGKLeefUOqHNs1mNRYSadVv7x0z8U2yyeWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/webhooks-types": {
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-7.6.1.tgz",
+      "integrity": "sha512-S8u2cJzklBC0FgTwWVLaM8tMrDuDMVE4xiTK4EYXM9GntyvrdbSoxqDQa+Fh57CCNApyIpyeqPhhFEmHPfrXgw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz",
+      "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/api-logs": {
+      "version": "0.57.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.57.2.tgz",
+      "integrity": "sha512-uIX52NnTM0iBh84MShlpouI7UKqkZ7MrUszTmaypHBu4r7NofznSnQRfJ+uUeDtQDj6w8eFGg5KBLDAwAPz1+A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/context-async-hooks": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.30.1.tgz",
+      "integrity": "sha512-s5vvxXPVdjqS3kTLKMeBMvop9hbWkwzBpu+mUO2M7sZtlkyDJGwFe33wRKnbaYDo8ExRVBIIdwIGrqpxHuKttA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/core": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.30.1.tgz",
+      "integrity": "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "1.28.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/core/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
+      "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation": {
+      "version": "0.57.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.57.2.tgz",
+      "integrity": "sha512-BdBGhQBh8IjZ2oIIX6F2/Q3LKm/FDDKi6ccYKcBTeilh6SNdNKveDOLk73BkSJjQLJk6qe4Yh+hHw1UPhCDdrg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.57.2",
+        "@types/shimmer": "^1.2.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1",
+        "semver": "^7.5.2",
+        "shimmer": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-amqplib": {
+      "version": "0.46.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.46.1.tgz",
+      "integrity": "sha512-AyXVnlCf/xV3K/rNumzKxZqsULyITJH6OVLiW6730JPRqWA7Zc9bvYoVNpN6iOpTU8CasH34SU/ksVJmObFibQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-connect": {
+      "version": "0.43.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.43.1.tgz",
+      "integrity": "sha512-ht7YGWQuV5BopMcw5Q2hXn3I8eG8TH0J/kc/GMcW4CuNTgiP6wCu44BOnucJWL3CmFWaRHI//vWyAhaC8BwePw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@types/connect": "3.4.38"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-dataloader": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.16.1.tgz",
+      "integrity": "sha512-K/qU4CjnzOpNkkKO4DfCLSQshejRNAJtd4esgigo/50nxCB6XCyi1dhAblUHM9jG5dRm8eu0FB+t87nIo99LYQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-express": {
+      "version": "0.47.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.47.1.tgz",
+      "integrity": "sha512-QNXPTWteDclR2B4pDFpz0TNghgB33UMjUt14B+BZPmtH1MwUFAfLHBaP5If0Z5NZC+jaH8oF2glgYjrmhZWmSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-fs": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.19.1.tgz",
+      "integrity": "sha512-6g0FhB3B9UobAR60BGTcXg4IHZ6aaYJzp0Ki5FhnxyAPt8Ns+9SSvgcrnsN2eGmk3RWG5vYycUGOEApycQL24A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-generic-pool": {
+      "version": "0.43.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.43.1.tgz",
+      "integrity": "sha512-M6qGYsp1cURtvVLGDrPPZemMFEbuMmCXgQYTReC/IbimV5sGrLBjB+/hANUpRZjX67nGLdKSVLZuQQAiNz+sww==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-graphql": {
+      "version": "0.47.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.47.1.tgz",
+      "integrity": "sha512-EGQRWMGqwiuVma8ZLAZnExQ7sBvbOx0N/AE/nlafISPs8S+QtXX+Viy6dcQwVWwYHQPAcuY3bFt3xgoAwb4ZNQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-hapi": {
+      "version": "0.45.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.45.2.tgz",
+      "integrity": "sha512-7Ehow/7Wp3aoyCrZwQpU7a2CnoMq0XhIcioFuKjBb0PLYfBfmTsFTUyatlHu0fRxhwcRsSQRTvEhmZu8CppBpQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-http": {
+      "version": "0.57.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.57.2.tgz",
+      "integrity": "sha512-1Uz5iJ9ZAlFOiPuwYg29Bf7bJJc/GeoeJIFKJYQf67nTVKFe8RHbEtxgkOmK4UGZNHKXcpW4P8cWBYzBn1USpg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "1.30.1",
+        "@opentelemetry/instrumentation": "0.57.2",
+        "@opentelemetry/semantic-conventions": "1.28.0",
+        "forwarded-parse": "2.1.2",
+        "semver": "^7.5.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
+      "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-http/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-ioredis": {
+      "version": "0.47.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.47.1.tgz",
+      "integrity": "sha512-OtFGSN+kgk/aoKgdkKQnBsQFDiG8WdCxu+UrHr0bXScdAmtSzLSraLo7wFIb25RVHfRWvzI5kZomqJYEg/l1iA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/redis-common": "^0.36.2",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-kafkajs": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.7.1.tgz",
+      "integrity": "sha512-OtjaKs8H7oysfErajdYr1yuWSjMAectT7Dwr+axIoZqT9lmEOkD/H/3rgAs8h/NIuEi2imSXD+vL4MZtOuJfqQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-knex": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.44.1.tgz",
+      "integrity": "sha512-U4dQxkNhvPexffjEmGwCq68FuftFK15JgUF05y/HlK3M6W/G2iEaACIfXdSnwVNe9Qh0sPfw8LbOPxrWzGWGMQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-koa": {
+      "version": "0.47.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.47.1.tgz",
+      "integrity": "sha512-l/c+Z9F86cOiPJUllUCt09v+kICKvT+Vg1vOAJHtHPsJIzurGayucfCMq2acd/A/yxeNWunl9d9eqZ0G+XiI6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-lru-memoizer": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.44.1.tgz",
+      "integrity": "sha512-5MPkYCvG2yw7WONEjYj5lr5JFehTobW7wX+ZUFy81oF2lr9IPfZk9qO+FTaM0bGEiymwfLwKe6jE15nHn1nmHg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mongodb": {
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.52.0.tgz",
+      "integrity": "sha512-1xmAqOtRUQGR7QfJFfGV/M2kC7wmI2WgZdpru8hJl3S0r4hW0n3OQpEHlSGXJAaNFyvT+ilnwkT+g5L4ljHR6g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mongoose": {
+      "version": "0.46.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.46.1.tgz",
+      "integrity": "sha512-3kINtW1LUTPkiXFRSSBmva1SXzS/72we/jL22N+BnF3DFcoewkdkHPYOIdAAk9gSicJ4d5Ojtt1/HeibEc5OQg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mysql": {
+      "version": "0.45.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.45.1.tgz",
+      "integrity": "sha512-TKp4hQ8iKQsY7vnp/j0yJJ4ZsP109Ht6l4RHTj0lNEG1TfgTrIH5vJMbgmoYXWzNHAqBH2e7fncN12p3BP8LFg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@types/mysql": "2.15.26"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mysql2": {
+      "version": "0.45.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.45.2.tgz",
+      "integrity": "sha512-h6Ad60FjCYdJZ5DTz1Lk2VmQsShiViKe0G7sYikb0GHI0NVvApp2XQNRHNjEMz87roFttGPLHOYVPlfy+yVIhQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@opentelemetry/sql-common": "^0.40.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-pg": {
+      "version": "0.51.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.51.1.tgz",
+      "integrity": "sha512-QxgjSrxyWZc7Vk+qGSfsejPVFL1AgAJdSBMYZdDUbwg730D09ub3PXScB9d04vIqPriZ+0dqzjmQx0yWKiCi2Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.26.0",
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@opentelemetry/sql-common": "^0.40.1",
+        "@types/pg": "8.6.1",
+        "@types/pg-pool": "2.0.6"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-redis-4": {
+      "version": "0.46.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.46.1.tgz",
+      "integrity": "sha512-UMqleEoabYMsWoTkqyt9WAzXwZ4BlFZHO40wr3d5ZvtjKCHlD4YXLm+6OLCeIi/HkX7EXvQaz8gtAwkwwSEvcQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/redis-common": "^0.36.2",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-tedious": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.18.1.tgz",
+      "integrity": "sha512-5Cuy/nj0HBaH+ZJ4leuD7RjgvA844aY2WW+B5uLcWtxGjRZl3MNLuxnNg5DYWZNPO+NafSSnra0q49KWAHsKBg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.57.1",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@types/tedious": "^4.0.14"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-undici": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.10.1.tgz",
+      "integrity": "sha512-rkOGikPEyRpMCmNu9AQuV5dtRlDmJp2dK5sw8roVshAGoB6hH/3QjDtRhdwd75SsJwgynWUNRUYe0wAkTo16tQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.8.0",
+        "@opentelemetry/instrumentation": "^0.57.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.7.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@opentelemetry/redis-common": {
+      "version": "0.36.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz",
+      "integrity": "sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/resources": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.30.1.tgz",
+      "integrity": "sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "1.30.1",
+        "@opentelemetry/semantic-conventions": "1.28.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
+      "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-base": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.30.1.tgz",
+      "integrity": "sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "1.30.1",
+        "@opentelemetry/resources": "1.30.1",
+        "@opentelemetry/semantic-conventions": "1.28.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
+      "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz",
+      "integrity": "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@opentelemetry/sql-common": {
+      "version": "0.40.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sql-common/-/sql-common-0.40.1.tgz",
+      "integrity": "sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.1.0"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.3",
+        "is-glob": "^4.0.3",
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@paulirish/trace_engine": {
+      "version": "0.0.59",
+      "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.59.tgz",
+      "integrity": "sha512-439NUzQGmH+9Y017/xCchBP9571J4bzhpcNhrxorf7r37wcyJZkgUfrUsRL3xl+JDcZ6ORhoFCzCw98c6S3YHw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "legacy-javascript": "latest",
+        "third-party-web": "latest"
+      }
+    },
+    "node_modules/@php-wasm/cli-util": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/cli-util/-/cli-util-3.1.15.tgz",
+      "integrity": "sha512-RsEmW1pVNeXDGrrQy254jyDGIhwc6U5mmKpbD1iq1KMF1cVTZhtKy5BEtuJlY3Htgd1/zXoGRdfSlHguZguLGg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/util": "3.1.15",
+        "fast-xml-parser": "^5.5.1",
+        "jsonc-parser": "3.3.1"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/logger": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/logger/-/logger-3.1.15.tgz",
+      "integrity": "sha512-qqMVDo18/JcUKShj5tHaWp9MvaMvzssFBVOyO94GB7QAk84nx3dn5QeqJX45txl7Zw1XoGewWfIitfVG9knUVQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/node-polyfills": "3.1.15"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node/-/node-3.1.15.tgz",
+      "integrity": "sha512-tGrueWDECzL7KQYo0rj/YP6/M7souF5eRM/8Gn3bPHfReKZdnJf2D8R0KqzVFlIrbF7paJWzrGoMO8otaSisbQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/cli-util": "3.1.15",
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node-7-4": "3.1.15",
+        "@php-wasm/node-8-0": "3.1.15",
+        "@php-wasm/node-8-1": "3.1.15",
+        "@php-wasm/node-8-2": "3.1.15",
+        "@php-wasm/node-8-3": "3.1.15",
+        "@php-wasm/node-8-4": "3.1.15",
+        "@php-wasm/node-8-5": "3.1.15",
+        "@php-wasm/node-polyfills": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "@wp-playground/common": "3.1.15",
+        "express": "4.22.0",
+        "fast-xml-parser": "^5.5.1",
+        "fs-ext-extra-prebuilt": "2.2.7",
+        "ini": "4.1.2",
+        "jsonc-parser": "3.3.1",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3",
+        "yargs": "17.7.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-7-4": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-7-4/-/node-7-4-3.1.15.tgz",
+      "integrity": "sha512-VnhGHF7F98Y7KX+0X8aQA0xvZM6HPEEj1BpwiPQZdc63sXYGmGhtqWZqeL9R9TEfs+8/sz0gk5Vh+wzhxFjypQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-8-0": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-8-0/-/node-8-0-3.1.15.tgz",
+      "integrity": "sha512-e+larvOOoo5M3zXTae7aU2P/K5EFTHwTQqd5UjZcuSzIfMbWPvEM8Ykk5QebpRt015UsVVhwamjTWADy3r0qPg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-8-1": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-8-1/-/node-8-1-3.1.15.tgz",
+      "integrity": "sha512-gwvO+W/aOYIhYsogdVDkceesXwVFT0JBZr+FbDitK7C3f9ZnX/4xzMFnN5EQYu3E0jOLH5gvaWUVnOPPI+lrUg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-8-2": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-8-2/-/node-8-2-3.1.15.tgz",
+      "integrity": "sha512-M5NSfHLdUoymlU9EGIErvDFrVR80DQQY+/ijN/+4giuAJ2q00eH15qoWO61vffPxueZIKMx57aPBIn93J0WSJA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-8-3": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-8-3/-/node-8-3-3.1.15.tgz",
+      "integrity": "sha512-qMdc8joBPKKz1QKy7trlqqP8fW99oWUzt2KlhUUh3I46dkzBZ+7PvacnEubqETD78IWm3sazgO7PqbzQcqCKvQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-8-4": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-8-4/-/node-8-4-3.1.15.tgz",
+      "integrity": "sha512-3RkeC98j4Su55eMBIhpT9rqmQyFmD0g/fnTOcVVF4x7VoIH1qImRwtKSA0jal9tPGtyMfdw3TSzJEjkEmU+WSA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-8-5": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-8-5/-/node-8-5-3.1.15.tgz",
+      "integrity": "sha512-aAhql2q38equXpfMEolzev1at0HDIm8Yshf3OB2n5lh/u1GJvXycVE4DAUTnzD+t5Q5Pz76HFxt8x4d4+Ppo3g==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/node-polyfills": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/node-polyfills/-/node-polyfills-3.1.15.tgz",
+      "integrity": "sha512-TzFaD7tB4uL3uSt33OAsV9CO0U7wDYHhd79nBuSXRfbWbx9GBvI/bUqANE7sRMSNNCuAoIJ+5hRqoX+Lq0QgaQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later"
+    },
+    "node_modules/@php-wasm/progress": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/progress/-/progress-3.1.15.tgz",
+      "integrity": "sha512-9dApeEIQdxcIfvF2KVX1nDlJnfT6pPoKQC3RJKn/L/cmM3q3r+bUmRaCR0oBaSqrB6syp4/+SeTe/yyhUfh7Pw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node-polyfills": "3.1.15"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/scopes": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/scopes/-/scopes-3.1.15.tgz",
+      "integrity": "sha512-VLReby1RrbhO8bA1Py9cCE/15G2DcHUwqu5BNjvVIWVnqqzI8wOUkDGwON9CtcfPmC2GDSgwkOxVQDJ2Tmu0YQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/stream-compression": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/stream-compression/-/stream-compression-3.1.15.tgz",
+      "integrity": "sha512-zJLPpOJHgSWsoWscojgmrkIy6S7tn/D/zwo6iVCQLWZquW4GY0drt/0xgEPpYmsRS+Iz92lfwfxUr+Zpb05rRg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/node-polyfills": "3.1.15",
+        "@php-wasm/util": "3.1.15"
+      }
+    },
+    "node_modules/@php-wasm/universal": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/universal/-/universal-3.1.15.tgz",
+      "integrity": "sha512-AIxn8pDdzzXnRTYi4tOfMjyS2kmSrzNcf1exUt3pmNuWQF0ey1Lv9ulImzi6lvuLgRwwlqzfoJtHzii2ITfCfw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node-polyfills": "3.1.15",
+        "@php-wasm/progress": "3.1.15",
+        "@php-wasm/stream-compression": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "ini": "4.1.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/util": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/util/-/util-3.1.15.tgz",
+      "integrity": "sha512-D0e0Re57fJhoj1ZuDV4iamVc7Dw8EzVj5qicy+u8FHaqX6U4kutNbUZv2Vtezal02ssNnhXG4psFPVpUPhXDTg==",
+      "dev": true,
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/web-service-worker": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/web-service-worker/-/web-service-worker-3.1.15.tgz",
+      "integrity": "sha512-zfCzD++N7lDgFt8L7esRn9yYD4/aBAEhghnsfsOqKurHTSwRz7DCZGNdTaxy8UlYvuyGRTnBPkGSPwz9VpgKpg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/scopes": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "ini": "4.1.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@php-wasm/xdebug-bridge": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@php-wasm/xdebug-bridge/-/xdebug-bridge-3.1.15.tgz",
+      "integrity": "sha512-VlEUUwT8qUsZPnL7njRCPsxx2oQ7AAY0i5UYwhG1tR39bzsxBiteynoZAsmX8fYVvMtHZCW2LtSHAQH6+OvBTQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "@wp-playground/common": "3.1.15",
+        "express": "4.22.0",
+        "fast-xml-parser": "^5.5.1",
+        "fs-ext-extra-prebuilt": "2.2.7",
+        "ini": "4.1.2",
+        "jsonc-parser": "3.3.1",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3",
+        "xml2js": "0.6.2",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "xdebug-bridge": "xdebug-bridge.js"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
+    "node_modules/@playwright/test": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
+      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "playwright": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.5.17",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.17.tgz",
+      "integrity": "sha512-tXDyE1/jzFsHXjhRZQ3hMl0IVhYe5qula43LDWIhVfjp9G/nT5OQY5AORVOrkEGAUltBJOfOWeETbmhm6kHhuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-html": "^0.0.9",
+        "core-js-pure": "^3.23.3",
+        "error-stack-parser": "^2.0.6",
+        "html-entities": "^2.1.0",
+        "loader-utils": "^2.0.4",
+        "schema-utils": "^4.2.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      },
+      "peerDependencies": {
+        "@types/webpack": "4.x || 5.x",
+        "react-refresh": ">=0.10.0 <1.0.0",
+        "sockjs-client": "^1.4.0",
+        "type-fest": ">=0.17.0 <5.0.0",
+        "webpack": ">=4.43.0 <6.0.0",
+        "webpack-dev-server": "3.x || 4.x || 5.x",
+        "webpack-hot-middleware": "2.x",
+        "webpack-plugin-serve": "0.x || 1.x"
+      },
+      "peerDependenciesMeta": {
+        "@types/webpack": {
+          "optional": true
+        },
+        "sockjs-client": {
+          "optional": true
+        },
+        "type-fest": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        },
+        "webpack-hot-middleware": {
+          "optional": true
+        },
+        "webpack-plugin-serve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@prisma/instrumentation": {
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-6.11.1.tgz",
+      "integrity": "sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0 || ^0.57.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.8"
+      }
+    },
+    "node_modules/@puppeteer/browsers": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.6.1.tgz",
+      "integrity": "sha512-aBSREisdsGH890S2rQqK82qmQYU3uFpSH8wcZWHgHzl3LfzsxAKbLNiAG9mO8v1Y0UICBeClICxPJvyr0rcuxg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.5.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
+      "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+      "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+      "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz",
+      "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz",
+      "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-escape-keydown": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-guards": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz",
+      "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz",
+      "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope/node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-id": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz",
+      "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-portal": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz",
+      "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-presence": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz",
+      "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
+      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz",
+      "integrity": "sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
+      "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
+      "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-effect-event": "0.0.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-effect-event": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
+      "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-escape-keydown": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz",
+      "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+      "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@react-spring/animated": {
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.5.tgz",
+      "integrity": "sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@react-spring/shared": "~9.7.5",
+        "@react-spring/types": "~9.7.5"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@react-spring/core": {
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.5.tgz",
+      "integrity": "sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@react-spring/animated": "~9.7.5",
+        "@react-spring/shared": "~9.7.5",
+        "@react-spring/types": "~9.7.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-spring/donate"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@react-spring/rafz": {
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.5.tgz",
+      "integrity": "sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@react-spring/shared": {
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.5.tgz",
+      "integrity": "sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@react-spring/rafz": "~9.7.5",
+        "@react-spring/types": "~9.7.5"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@react-spring/types": {
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.5.tgz",
+      "integrity": "sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@react-spring/web": {
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.5.tgz",
+      "integrity": "sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@react-spring/animated": "~9.7.5",
+        "@react-spring/core": "~9.7.5",
+        "@react-spring/shared": "~9.7.5",
+        "@react-spring/types": "~9.7.5"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@sentry/core": {
+      "version": "9.47.1",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.47.1.tgz",
+      "integrity": "sha512-KX62+qIt4xgy8eHKHiikfhz2p5fOciXd0Cl+dNzhgPFq8klq4MGMNaf148GB3M/vBqP4nw/eFvRMAayFCgdRQw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@sentry/node": {
+      "version": "9.47.1",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-9.47.1.tgz",
+      "integrity": "sha512-CDbkasBz3fnWRKSFs6mmaRepM2pa+tbZkrqhPWifFfIkJDidtVW40p6OnquTvPXyPAszCnDZRnZT14xyvNmKPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@opentelemetry/api": "^1.9.0",
+        "@opentelemetry/context-async-hooks": "^1.30.1",
+        "@opentelemetry/core": "^1.30.1",
+        "@opentelemetry/instrumentation": "^0.57.2",
+        "@opentelemetry/instrumentation-amqplib": "^0.46.1",
+        "@opentelemetry/instrumentation-connect": "0.43.1",
+        "@opentelemetry/instrumentation-dataloader": "0.16.1",
+        "@opentelemetry/instrumentation-express": "0.47.1",
+        "@opentelemetry/instrumentation-fs": "0.19.1",
+        "@opentelemetry/instrumentation-generic-pool": "0.43.1",
+        "@opentelemetry/instrumentation-graphql": "0.47.1",
+        "@opentelemetry/instrumentation-hapi": "0.45.2",
+        "@opentelemetry/instrumentation-http": "0.57.2",
+        "@opentelemetry/instrumentation-ioredis": "0.47.1",
+        "@opentelemetry/instrumentation-kafkajs": "0.7.1",
+        "@opentelemetry/instrumentation-knex": "0.44.1",
+        "@opentelemetry/instrumentation-koa": "0.47.1",
+        "@opentelemetry/instrumentation-lru-memoizer": "0.44.1",
+        "@opentelemetry/instrumentation-mongodb": "0.52.0",
+        "@opentelemetry/instrumentation-mongoose": "0.46.1",
+        "@opentelemetry/instrumentation-mysql": "0.45.1",
+        "@opentelemetry/instrumentation-mysql2": "0.45.2",
+        "@opentelemetry/instrumentation-pg": "0.51.1",
+        "@opentelemetry/instrumentation-redis-4": "0.46.1",
+        "@opentelemetry/instrumentation-tedious": "0.18.1",
+        "@opentelemetry/instrumentation-undici": "0.10.1",
+        "@opentelemetry/resources": "^1.30.1",
+        "@opentelemetry/sdk-trace-base": "^1.30.1",
+        "@opentelemetry/semantic-conventions": "^1.34.0",
+        "@prisma/instrumentation": "6.11.1",
+        "@sentry/core": "9.47.1",
+        "@sentry/node-core": "9.47.1",
+        "@sentry/opentelemetry": "9.47.1",
+        "import-in-the-middle": "^1.14.2",
+        "minimatch": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@sentry/node-core": {
+      "version": "9.47.1",
+      "resolved": "https://registry.npmjs.org/@sentry/node-core/-/node-core-9.47.1.tgz",
+      "integrity": "sha512-7TEOiCGkyShJ8CKtsri9lbgMCbB+qNts2Xq37itiMPN2m+lIukK3OX//L8DC5nfKYZlgikrefS63/vJtm669hQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sentry/core": "9.47.1",
+        "@sentry/opentelemetry": "9.47.1",
+        "import-in-the-middle": "^1.14.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.9.0",
+        "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/core": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/instrumentation": ">=0.57.1 <1",
+        "@opentelemetry/resources": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/semantic-conventions": "^1.34.0"
+      }
+    },
+    "node_modules/@sentry/opentelemetry": {
+      "version": "9.47.1",
+      "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-9.47.1.tgz",
+      "integrity": "sha512-STtFpjF7lwzeoedDJV+5XA6P89BfmFwFftmHSGSe3UTI8z8IoiR5yB6X2vCjSPvXlfeOs13qCNNCEZyznxM8Xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sentry/core": "9.47.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.9.0",
+        "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/core": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.0.0",
+        "@opentelemetry/semantic-conventions": "^1.34.0"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.10",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz",
+      "integrity": "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@stylistic/stylelint-plugin": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.1.3.tgz",
+      "integrity": "sha512-85fsmzgsIVmyG3/GFrjuYj6Cz8rAM7IZiPiXCMiSMfoDOC1lOrzrXPDk24WqviAghnPqGpx8b0caK2PuewWGFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.1",
+        "@csstools/css-tokenizer": "^3.0.1",
+        "@csstools/media-query-list-parser": "^3.0.1",
+        "is-plain-object": "^5.0.0",
+        "postcss": "^8.4.41",
+        "postcss-selector-parser": "^6.1.2",
+        "postcss-value-parser": "^4.2.0",
+        "style-search": "^0.1.0"
+      },
+      "engines": {
+        "node": "^18.12 || >=20.9"
+      },
+      "peerDependencies": {
+        "stylelint": "^16.8.0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
+      "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz",
+      "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz",
+      "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz",
+      "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz",
+      "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz",
+      "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz",
+      "integrity": "sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-transform-svg-component": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz",
+      "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-preset": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz",
+      "integrity": "sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@svgr/babel-plugin-add-jsx-attribute": "8.0.0",
+        "@svgr/babel-plugin-remove-jsx-attribute": "8.0.0",
+        "@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0",
+        "@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0",
+        "@svgr/babel-plugin-svg-dynamic-title": "8.0.0",
+        "@svgr/babel-plugin-svg-em-dimensions": "8.0.0",
+        "@svgr/babel-plugin-transform-react-native-svg": "8.1.0",
+        "@svgr/babel-plugin-transform-svg-component": "8.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/core": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
+      "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.21.3",
+        "@svgr/babel-preset": "8.1.0",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^8.1.3",
+        "snake-case": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/hast-util-to-babel-ast": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz",
+      "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.21.3",
+        "entities": "^4.4.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/plugin-jsx": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz",
+      "integrity": "sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.21.3",
+        "@svgr/babel-preset": "8.1.0",
+        "@svgr/hast-util-to-babel-ast": "8.0.0",
+        "svg-parser": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@svgr/core": "*"
+      }
+    },
+    "node_modules/@svgr/plugin-svgo": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz",
+      "integrity": "sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^8.1.3",
+        "deepmerge": "^4.3.1",
+        "svgo": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@svgr/core": "*"
+      }
+    },
+    "node_modules/@svgr/webpack": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.1.0.tgz",
+      "integrity": "sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.21.3",
+        "@babel/plugin-transform-react-constant-elements": "^7.21.3",
+        "@babel/preset-env": "^7.20.2",
+        "@babel/preset-react": "^7.18.6",
+        "@babel/preset-typescript": "^7.21.0",
+        "@svgr/core": "8.1.0",
+        "@svgr/plugin-jsx": "8.1.0",
+        "@svgr/plugin-svgo": "8.1.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tabby_ai/hijri-converter": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@tabby_ai/hijri-converter/-/hijri-converter-1.0.5.tgz",
+      "integrity": "sha512-r5bClKrcIusDoo049dSL8CawnHR6mRdDwhlQuIgZRNty68q0x8k3Lf1BtPAMxRf/GgnHBnIO4ujd3+GQdLWzxQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@tannin/compile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@tannin/compile/-/compile-1.1.0.tgz",
+      "integrity": "sha512-n8m9eNDfoNZoxdvWiTfW/hSPhehzLJ3zW7f8E7oT6mCROoMNWCB4TYtv041+2FMAxweiE0j7i1jubQU4MEC/Gg==",
+      "license": "MIT",
+      "dependencies": {
+        "@tannin/evaluate": "^1.2.0",
+        "@tannin/postfix": "^1.1.0"
+      }
+    },
+    "node_modules/@tannin/evaluate": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@tannin/evaluate/-/evaluate-1.2.0.tgz",
+      "integrity": "sha512-3ioXvNowbO/wSrxsDG5DKIMxC81P0QrQTYai8zFNY+umuoHWRPbQ/TuuDEOju9E+jQDXmj6yI5GyejNuh8I+eg==",
+      "license": "MIT"
+    },
+    "node_modules/@tannin/plural-forms": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@tannin/plural-forms/-/plural-forms-1.1.0.tgz",
+      "integrity": "sha512-xl9R2mDZO/qiHam1AgMnAES6IKIg7OBhcXqy6eDsRCdXuxAFPcjrej9HMjyCLE0DJ/8cHf0i5OQTstuBRhpbHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@tannin/compile": "^1.1.0"
+      }
+    },
+    "node_modules/@tannin/postfix": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz",
+      "integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw==",
+      "license": "MIT"
+    },
+    "node_modules/@tannin/sprintf": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@tannin/sprintf/-/sprintf-1.3.3.tgz",
+      "integrity": "sha512-RwARl+hFwhzy0tg9atWcchLFvoQiOh4rrP7uG2N5E4W80BPCUX0ElcUR9St43fxB9EfjsW2df9Qp+UsTbvQDjA==",
+      "license": "MIT"
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tybys/wasm-util": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@types/aws-lambda": {
+      "version": "8.10.161",
+      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.161.tgz",
+      "integrity": "sha512-rUYdp+MQwSFocxIOcSsYSF3YYYC/uUpMbCY/mbO21vGqfrEYvNSoPyKYDj6RhXXpPfS0KstW9RwG3qXh9sL7FQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.2"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/btoa-lite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/btoa-lite/-/btoa-lite-1.0.2.tgz",
+      "integrity": "sha512-ZYbcE2x7yrvNFJiU7xJGrpF/ihpkM7zKgw8bha3LNJSesvTtUNxbpzaT7WXBIryf6jovisrxTBvymxMeLLj1Mg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.25",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.25.tgz",
+      "integrity": "sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "^1"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.1.tgz",
+      "integrity": "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+      "version": "4.19.8",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.8.tgz",
+      "integrity": "sha512-02S5fmqeoKzVZCHPZid4b8JH2eM5HzQLZWN2FohQEy/0eXTq8VXZfSN6Pcr3F6N9R/vNrj7cpgbhjie6m/1tCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gradient-parser": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@types/gradient-parser/-/gradient-parser-1.1.0.tgz",
+      "integrity": "sha512-SaEcbgQscHtGJ1QL+ajgDTmmqU2f6T+00jZRcFlVHUW2Asivc84LNUev/UQFyu117AsdyrtI+qpwLvgjJXJxmw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/highlight-words-core": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/highlight-words-core/-/highlight-words-core-1.2.1.tgz",
+      "integrity": "sha512-9VZUA5omXBfn+hDxFjUDu1FOJTBM3LmvqfDey+Z6Aa8B8/JmF5SMj6FBrjfgJ/Q3YXOZd3qyTDfJyMZSs/wCUA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.17",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.17.tgz",
+      "integrity": "sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jsdom": {
+      "version": "20.0.1",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
+      "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "parse5": "^7.0.0"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/jsonwebtoken": {
+      "version": "9.0.10",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz",
+      "integrity": "sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mousetrap": {
+      "version": "1.6.15",
+      "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.15.tgz",
+      "integrity": "sha512-qL0hyIMNPow317QWW/63RvL1x5MVMV+Ru3NaY9f/CuEpCqrmb7WeuK2071ZY5hczOnm38qExWM2i2WtkXLSqFw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mysql": {
+      "version": "2.15.26",
+      "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.26.tgz",
+      "integrity": "sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.19.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.37.tgz",
+      "integrity": "sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
+      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/pg": {
+      "version": "8.6.1",
+      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.1.tgz",
+      "integrity": "sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "pg-protocol": "*",
+        "pg-types": "^2.2.0"
+      }
+    },
+    "node_modules/@types/pg-pool": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/pg-pool/-/pg-pool-2.0.6.tgz",
+      "integrity": "sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/pg": "*"
+      }
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.15",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
+      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/qs": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.0.tgz",
+      "integrity": "sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/react": {
+      "version": "18.3.28",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.28.tgz",
+      "integrity": "sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "csstype": "^3.2.2"
+      }
+    },
+    "node_modules/@types/react-dom": {
+      "version": "18.3.7",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
+      "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^18.0.0"
+      }
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
+      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/send": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz",
+      "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.10",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.10.tgz",
+      "integrity": "sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "<1"
+      }
+    },
+    "node_modules/@types/serve-static/node_modules/@types/send": {
+      "version": "0.17.6",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.6.tgz",
+      "integrity": "sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/shimmer": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz",
+      "integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/tedious": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/@types/tedious/-/tedious-4.0.14.tgz",
+      "integrity": "sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
+      "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
+      "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.5.1",
+        "@typescript-eslint/scope-manager": "6.21.0",
+        "@typescript-eslint/type-utils": "6.21.0",
+        "@typescript-eslint/utils": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.4",
+        "natural-compare": "^1.4.0",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
+      "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "6.21.0",
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/typescript-estree": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
+      "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
+      "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "6.21.0",
+        "@typescript-eslint/utils": "6.21.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
+      "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
+      "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
+      "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.21.0",
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/typescript-estree": "6.21.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
+      "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "6.21.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-android-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-freebsd-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@napi-rs/wasm-runtime": "^0.2.11"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@use-gesture/core": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
+      "integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw==",
+      "license": "MIT"
+    },
+    "node_modules/@use-gesture/react": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz",
+      "integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==",
+      "license": "MIT",
+      "dependencies": {
+        "@use-gesture/core": "10.3.1"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wordpress/a11y": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-4.42.0.tgz",
+      "integrity": "sha512-7NdHXJt3XDBXujkhoZkuBzZJIY+LrG0r2aPSJVujoHwioBR3V+HgdcGa1xydAnKtdiNnYa8fEdlWqk49EEQ0MA==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/dom-ready": "^4.42.0",
+        "@wordpress/i18n": "^6.15.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/a11y/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/api-fetch": {
+      "version": "7.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.42.0.tgz",
+      "integrity": "sha512-Y6WI4ZovoKNaSz6TTtZwc80RrgIoGc8lxDLi/KCHAr4Nyxu6YaSfLPtHsaqDmrggdZuce7KHx0T/oyHKtDu0Aw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/url": "^4.42.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/api-fetch/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/autop": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-4.42.0.tgz",
+      "integrity": "sha512-cda5C9P15fUUQZmdYUnOxKTbZqoCX9oeo0UHaSmSsJcuoj3jFvGr5NxjTHKPxwS/2p/mIdfb3VDS4klBx9uraw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default": {
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.42.0.tgz",
+      "integrity": "sha512-/WC38ZuGsLYF7yXyqzMwgcKBB49sE94SymXTmSwwHpglJ1CaLpcrI7LcUdqsz1M7YbkUHN/2UgvqWe/E95Fm/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/core": "7.25.7",
+        "@babel/plugin-syntax-import-attributes": "7.26.0",
+        "@babel/plugin-transform-react-jsx": "7.25.7",
+        "@babel/plugin-transform-runtime": "7.25.7",
+        "@babel/preset-env": "7.25.7",
+        "@babel/preset-typescript": "7.25.7",
+        "@wordpress/browserslist-config": "^6.42.0",
+        "@wordpress/warning": "^3.42.0",
+        "browserslist": "^4.21.10",
+        "core-js": "^3.31.0",
+        "react": "^18.3.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.7.tgz",
+      "integrity": "sha512-vILAg5nwGlR9EXE8JIOX4NHXd49lrYbN8hnjffDtoULwpL9hUx/N55nqh2qd0q6FyNDfjl9V79ecKGvFbcSA0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/plugin-syntax-jsx": "^7.25.7",
+        "@babel/types": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/preset-env": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.7.tgz",
+      "integrity": "sha512-Gibz4OUdyNqqLj+7OAvBZxOD7CklCtMA5/j0JgUEwOnaRULsPDXmic2iKxL2DX2vQduPR5wH2hjZas/Vr/Oc0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.25.7",
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.7",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.7",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.25.7",
+        "@babel/plugin-syntax-import-attributes": "^7.25.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.25.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.7",
+        "@babel/plugin-transform-async-to-generator": "^7.25.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.25.7",
+        "@babel/plugin-transform-block-scoping": "^7.25.7",
+        "@babel/plugin-transform-class-properties": "^7.25.7",
+        "@babel/plugin-transform-class-static-block": "^7.25.7",
+        "@babel/plugin-transform-classes": "^7.25.7",
+        "@babel/plugin-transform-computed-properties": "^7.25.7",
+        "@babel/plugin-transform-destructuring": "^7.25.7",
+        "@babel/plugin-transform-dotall-regex": "^7.25.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.25.7",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.7",
+        "@babel/plugin-transform-dynamic-import": "^7.25.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.25.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.7",
+        "@babel/plugin-transform-for-of": "^7.25.7",
+        "@babel/plugin-transform-function-name": "^7.25.7",
+        "@babel/plugin-transform-json-strings": "^7.25.7",
+        "@babel/plugin-transform-literals": "^7.25.7",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.25.7",
+        "@babel/plugin-transform-modules-amd": "^7.25.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.7",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.7",
+        "@babel/plugin-transform-modules-umd": "^7.25.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.7",
+        "@babel/plugin-transform-new-target": "^7.25.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.7",
+        "@babel/plugin-transform-numeric-separator": "^7.25.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.7",
+        "@babel/plugin-transform-object-super": "^7.25.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.7",
+        "@babel/plugin-transform-optional-chaining": "^7.25.7",
+        "@babel/plugin-transform-parameters": "^7.25.7",
+        "@babel/plugin-transform-private-methods": "^7.25.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.7",
+        "@babel/plugin-transform-property-literals": "^7.25.7",
+        "@babel/plugin-transform-regenerator": "^7.25.7",
+        "@babel/plugin-transform-reserved-words": "^7.25.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.25.7",
+        "@babel/plugin-transform-spread": "^7.25.7",
+        "@babel/plugin-transform-sticky-regex": "^7.25.7",
+        "@babel/plugin-transform-template-literals": "^7.25.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.25.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.25.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.25.7",
+        "@babel/plugin-transform-unicode-regex": "^7.25.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.7",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.38.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/preset-env/node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/preset-env/node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "core-js-compat": "^3.38.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@wordpress/babel-preset-default/node_modules/@babel/preset-typescript": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.25.7.tgz",
+      "integrity": "sha512-rkkpaXJZOFN45Fb+Gki0c+KMIglk4+zZXOoMJuyEK8y8Kkc8Jd3BDmP7qPsz0zQMJj+UD7EprF+AqAXcILnexw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/plugin-syntax-jsx": "^7.25.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.7",
+        "@babel/plugin-transform-typescript": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@wordpress/base-styles": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-6.18.0.tgz",
+      "integrity": "sha512-c9C8gE49uFsR6S8zmfhH8xFR8FrrkpO289sscv5jRABHeH21irwP/yGuEbkJiUqIqV9Rm2+HbQay4+F5M8DYfA==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/blob": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-4.42.0.tgz",
+      "integrity": "sha512-UwUUrdmjEJTgvelFdVg7c7s/240Siv6bFIurv0o9XY4Bu46z4NHJI96nUiziKRNTRm0lcvzS6CZxeRTT/m1Fig==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/block-editor": {
+      "version": "14.21.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-14.21.0.tgz",
+      "integrity": "sha512-twVFO5I+go/S2a6xxuxxrWlC9G3AZKiLtSgeZ+R0kuCfeyZgw49vCwQixDzJWBmpCagAYTEeakFv3PAkbMLaMA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/runtime": "7.25.7",
+        "@emotion/react": "^11.7.1",
+        "@emotion/styled": "^11.6.0",
+        "@react-spring/web": "^9.4.5",
+        "@wordpress/a11y": "^4.26.0",
+        "@wordpress/api-fetch": "^7.26.0",
+        "@wordpress/blob": "^4.26.0",
+        "@wordpress/block-serialization-default-parser": "^5.26.0",
+        "@wordpress/blocks": "^14.15.0",
+        "@wordpress/commands": "^1.26.0",
+        "@wordpress/components": "^29.12.0",
+        "@wordpress/compose": "^7.26.0",
+        "@wordpress/data": "^10.26.0",
+        "@wordpress/date": "^5.26.0",
+        "@wordpress/deprecated": "^4.26.0",
+        "@wordpress/dom": "^4.26.0",
+        "@wordpress/element": "^6.26.0",
+        "@wordpress/escape-html": "^3.26.0",
+        "@wordpress/hooks": "^4.26.0",
+        "@wordpress/html-entities": "^4.26.0",
+        "@wordpress/i18n": "^5.26.0",
+        "@wordpress/icons": "^10.26.0",
+        "@wordpress/is-shallow-equal": "^5.26.0",
+        "@wordpress/keyboard-shortcuts": "^5.26.0",
+        "@wordpress/keycodes": "^4.26.0",
+        "@wordpress/notices": "^5.26.0",
+        "@wordpress/preferences": "^4.26.0",
+        "@wordpress/priority-queue": "^3.26.0",
+        "@wordpress/private-apis": "^1.26.0",
+        "@wordpress/rich-text": "^7.26.0",
+        "@wordpress/style-engine": "^2.26.0",
+        "@wordpress/token-list": "^3.26.0",
+        "@wordpress/upload-media": "^0.11.0",
+        "@wordpress/url": "^4.26.0",
+        "@wordpress/warning": "^3.26.0",
+        "@wordpress/wordcount": "^4.26.0",
+        "change-case": "^4.1.2",
+        "clsx": "^2.1.1",
+        "colord": "^2.7.0",
+        "deepmerge": "^4.3.0",
+        "diff": "^4.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "memize": "^2.1.0",
+        "parsel-js": "^1.1.2",
+        "postcss": "^8.4.21",
+        "postcss-prefix-selector": "^1.16.0",
+        "postcss-urlrebase": "^1.4.0",
+        "react-autosize-textarea": "^7.1.0",
+        "react-easy-crop": "^5.0.6",
+        "remove-accents": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/block-editor/node_modules/@types/gradient-parser": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@types/gradient-parser/-/gradient-parser-0.1.3.tgz",
+      "integrity": "sha512-XDbrTSBlQV9nxE1GiDL3FaOPy4G/KaJkhDutBX48Kg8CYZMBARyyDFGCWfWJn4pobmInmwud1xxH7VJMAr0CKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@wordpress/block-editor/node_modules/@wordpress/components": {
+      "version": "29.12.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-29.12.0.tgz",
+      "integrity": "sha512-jE96pUj84OZya54VusRdEIdTiLjbe2Qst3GbHZcQpA5GiSkPBmGjKWpO6FxR7kRDT4GMnZoVxgtV6xJk4IaNQw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@ariakit/react": "^0.4.15",
+        "@babel/runtime": "7.25.7",
+        "@emotion/cache": "^11.7.1",
+        "@emotion/css": "^11.7.1",
+        "@emotion/react": "^11.7.1",
+        "@emotion/serialize": "^1.0.2",
+        "@emotion/styled": "^11.6.0",
+        "@emotion/utils": "^1.0.0",
+        "@floating-ui/react-dom": "^2.0.8",
+        "@types/gradient-parser": "0.1.3",
+        "@types/highlight-words-core": "1.2.1",
+        "@use-gesture/react": "^10.3.1",
+        "@wordpress/a11y": "^4.26.0",
+        "@wordpress/compose": "^7.26.0",
+        "@wordpress/date": "^5.26.0",
+        "@wordpress/deprecated": "^4.26.0",
+        "@wordpress/dom": "^4.26.0",
+        "@wordpress/element": "^6.26.0",
+        "@wordpress/escape-html": "^3.26.0",
+        "@wordpress/hooks": "^4.26.0",
+        "@wordpress/html-entities": "^4.26.0",
+        "@wordpress/i18n": "^5.26.0",
+        "@wordpress/icons": "^10.26.0",
+        "@wordpress/is-shallow-equal": "^5.26.0",
+        "@wordpress/keycodes": "^4.26.0",
+        "@wordpress/primitives": "^4.26.0",
+        "@wordpress/private-apis": "^1.26.0",
+        "@wordpress/rich-text": "^7.26.0",
+        "@wordpress/warning": "^3.26.0",
+        "change-case": "^4.1.2",
+        "clsx": "^2.1.1",
+        "colord": "^2.7.0",
+        "date-fns": "^3.6.0",
+        "deepmerge": "^4.3.0",
+        "fast-deep-equal": "^3.1.3",
+        "framer-motion": "^11.1.9",
+        "gradient-parser": "1.0.2",
+        "highlight-words-core": "^1.2.2",
+        "is-plain-object": "^5.0.0",
+        "memize": "^2.1.0",
+        "path-to-regexp": "^6.2.1",
+        "re-resizable": "^6.4.0",
+        "react-colorful": "^5.3.1",
+        "remove-accents": "^0.5.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/block-editor/node_modules/gradient-parser": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/gradient-parser/-/gradient-parser-1.0.2.tgz",
+      "integrity": "sha512-gR6nY33xC9yJoH4wGLQtZQMXDi6RI3H37ERu7kQCVUzlXjNedpZM7xcA489Opwbq0BSGohtWGsWsntupmxelMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@wordpress/block-serialization-default-parser": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-5.42.0.tgz",
+      "integrity": "sha512-XcX6gOeQOuG0RrUqJV1dadPBUi77uhLhpGfQH/s8vmAEGSWqgJAbjWwUKD8RP6wCGY+IE3Gayd5zu48aVRlB4A==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/blocks": {
+      "version": "14.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-14.15.0.tgz",
+      "integrity": "sha512-Esy7gM2HG3iimcFHFnwtXnIw0TLcSxT8bAe/S48wxZCIqM3++xoRgrEGe55u/d6Oj0mRM9HRFdp9et92nEsGBQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/runtime": "7.25.7",
+        "@wordpress/autop": "^4.26.0",
+        "@wordpress/blob": "^4.26.0",
+        "@wordpress/block-serialization-default-parser": "^5.26.0",
+        "@wordpress/data": "^10.26.0",
+        "@wordpress/deprecated": "^4.26.0",
+        "@wordpress/dom": "^4.26.0",
+        "@wordpress/element": "^6.26.0",
+        "@wordpress/hooks": "^4.26.0",
+        "@wordpress/html-entities": "^4.26.0",
+        "@wordpress/i18n": "^5.26.0",
+        "@wordpress/is-shallow-equal": "^5.26.0",
+        "@wordpress/private-apis": "^1.26.0",
+        "@wordpress/rich-text": "^7.26.0",
+        "@wordpress/shortcode": "^4.26.0",
+        "@wordpress/warning": "^3.26.0",
+        "change-case": "^4.1.2",
+        "colord": "^2.7.0",
+        "fast-deep-equal": "^3.1.3",
+        "hpq": "^1.3.0",
+        "is-plain-object": "^5.0.0",
+        "memize": "^2.1.0",
+        "react-is": "^18.3.0",
+        "remove-accents": "^0.5.0",
+        "showdown": "^1.9.1",
+        "simple-html-tokenizer": "^0.5.7",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/browserslist-config": {
+      "version": "6.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.42.0.tgz",
+      "integrity": "sha512-nof8KS4I8lqopdIaAa+Cqz6UtM3x09MpeAH2JWsP2GcczPudClCju67unQGVgsHKXJqAjYtFpx4GfVYn+Rtr/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/commands": {
+      "version": "1.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/commands/-/commands-1.42.0.tgz",
+      "integrity": "sha512-Zwymss3A13V9slFzawklm73ixx7yUS7d/73v3qIlmUAnlF//SobXr/NIc+Dr8uk7ChJmWhY1ySow1FCBKwChqw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/base-styles": "^6.18.0",
+        "@wordpress/components": "^32.4.0",
+        "@wordpress/data": "^10.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/icons": "^12.0.0",
+        "@wordpress/keyboard-shortcuts": "^5.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "@wordpress/warning": "^3.42.0",
+        "clsx": "^2.1.1",
+        "cmdk": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/commands/node_modules/@wordpress/components": {
+      "version": "32.4.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-32.4.0.tgz",
+      "integrity": "sha512-aGXtHZbrvA2upy/Qwti1lFjt0BPqezoYx2Le5x/0P841Ss4O/9XtAvJGg99hityIugbzEdDzkWKcdoBRwa2FBQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@ariakit/react": "^0.4.22",
+        "@date-fns/utc": "^2.1.1",
+        "@emotion/cache": "^11.14.0",
+        "@emotion/css": "^11.13.5",
+        "@emotion/react": "^11.14.0",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/styled": "^11.14.1",
+        "@emotion/utils": "^1.4.2",
+        "@floating-ui/react-dom": "2.0.8",
+        "@types/gradient-parser": "1.1.0",
+        "@types/highlight-words-core": "1.2.1",
+        "@types/react": "^18.3.27",
+        "@use-gesture/react": "^10.3.1",
+        "@wordpress/a11y": "^4.42.0",
+        "@wordpress/base-styles": "^6.18.0",
+        "@wordpress/compose": "^7.42.0",
+        "@wordpress/date": "^5.42.0",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/dom": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/escape-html": "^3.42.0",
+        "@wordpress/hooks": "^4.42.0",
+        "@wordpress/html-entities": "^4.42.0",
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/icons": "^12.0.0",
+        "@wordpress/is-shallow-equal": "^5.42.0",
+        "@wordpress/keycodes": "^4.42.0",
+        "@wordpress/primitives": "^4.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "@wordpress/rich-text": "^7.42.0",
+        "@wordpress/warning": "^3.42.0",
+        "change-case": "^4.1.2",
+        "clsx": "^2.1.1",
+        "colord": "^2.7.0",
+        "csstype": "^3.2.3",
+        "date-fns": "^3.6.0",
+        "deepmerge": "^4.3.0",
+        "fast-deep-equal": "^3.1.3",
+        "framer-motion": "^11.15.0",
+        "gradient-parser": "1.1.1",
+        "highlight-words-core": "^1.2.2",
+        "is-plain-object": "^5.0.0",
+        "memize": "^2.1.0",
+        "path-to-regexp": "^6.2.1",
+        "re-resizable": "^6.4.0",
+        "react-colorful": "^5.6.1",
+        "react-day-picker": "^9.7.0",
+        "remove-accents": "^0.5.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/commands/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/commands/node_modules/@wordpress/icons": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-12.0.0.tgz",
+      "integrity": "sha512-bDYsBGb1Ig/HWMt7aNrFWeABrD2wbReMazn9cZxUnXTf9ZFFrmG8PEdwmmJErDiEH9MvvAzLxadcNylWNNgeZA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/primitives": "^4.42.0",
+        "change-case": "4.1.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/components": {
+      "version": "30.9.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-30.9.0.tgz",
+      "integrity": "sha512-mx0df0TjChmpCtqQn3iFHphqaLQVNk5Yprs+3NJSfm1kWuZPKfVys6AtmhfBgXs/VrrJk34Z+1N+nqXovHuXnw==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@ariakit/react": "^0.4.15",
+        "@date-fns/utc": "^2.1.1",
+        "@emotion/cache": "^11.7.1",
+        "@emotion/css": "^11.7.1",
+        "@emotion/react": "^11.7.1",
+        "@emotion/serialize": "^1.0.2",
+        "@emotion/styled": "^11.6.0",
+        "@emotion/utils": "^1.0.0",
+        "@floating-ui/react-dom": "2.0.8",
+        "@types/gradient-parser": "1.1.0",
+        "@types/highlight-words-core": "1.2.1",
+        "@use-gesture/react": "^10.3.1",
+        "@wordpress/a11y": "^4.36.0",
+        "@wordpress/base-styles": "^6.12.0",
+        "@wordpress/compose": "^7.36.0",
+        "@wordpress/date": "^5.36.0",
+        "@wordpress/deprecated": "^4.36.0",
+        "@wordpress/dom": "^4.36.0",
+        "@wordpress/element": "^6.36.0",
+        "@wordpress/escape-html": "^3.36.0",
+        "@wordpress/hooks": "^4.36.0",
+        "@wordpress/html-entities": "^4.36.0",
+        "@wordpress/i18n": "^6.9.0",
+        "@wordpress/icons": "^11.3.0",
+        "@wordpress/is-shallow-equal": "^5.36.0",
+        "@wordpress/keycodes": "^4.36.0",
+        "@wordpress/primitives": "^4.36.0",
+        "@wordpress/private-apis": "^1.36.0",
+        "@wordpress/rich-text": "^7.36.0",
+        "@wordpress/warning": "^3.36.0",
+        "change-case": "^4.1.2",
+        "clsx": "^2.1.1",
+        "colord": "^2.7.0",
+        "date-fns": "^3.6.0",
+        "deepmerge": "^4.3.0",
+        "fast-deep-equal": "^3.1.3",
+        "framer-motion": "^11.15.0",
+        "gradient-parser": "1.1.1",
+        "highlight-words-core": "^1.2.2",
+        "is-plain-object": "^5.0.0",
+        "memize": "^2.1.0",
+        "path-to-regexp": "^6.2.1",
+        "re-resizable": "^6.4.0",
+        "react-colorful": "^5.3.1",
+        "react-day-picker": "^9.7.0",
+        "remove-accents": "^0.5.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/components/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/components/node_modules/@wordpress/icons": {
+      "version": "11.8.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-11.8.0.tgz",
+      "integrity": "sha512-ZMNHApHMmPLpNnNLfPLRf6XWoPhZFNKFKdpMlhA6Lx04J1hLVyLRz8PuM+1o3ByxD2ZiExfSRhdmI+7VvEg6DA==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/element": "^6.41.0",
+        "@wordpress/primitives": "^4.41.0",
+        "change-case": "4.1.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/compose": {
+      "version": "7.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-7.42.0.tgz",
+      "integrity": "sha512-SME943pAezFMmC/KRXE2VVrc4zGawLjIo4Bv1b6KN6f5M40ni7l3Us7vmuzDFuiX3wQubdi7XEFmrDr/jiDrsA==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@types/mousetrap": "^1.6.8",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/dom": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/is-shallow-equal": "^5.42.0",
+        "@wordpress/keycodes": "^4.42.0",
+        "@wordpress/priority-queue": "^3.42.0",
+        "@wordpress/undo-manager": "^1.42.0",
+        "change-case": "^4.1.2",
+        "mousetrap": "^1.6.5",
+        "use-memo-one": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/data": {
+      "version": "10.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-10.42.0.tgz",
+      "integrity": "sha512-YHBnNmMSclYvCS6QjwmbtdpGVbN4v0VZIq25n4a6HxG0Co6LTnvhAvgtnw+NZpEiDHibH8JcSjbCQEBtToWSFQ==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/compose": "^7.42.0",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/is-shallow-equal": "^5.42.0",
+        "@wordpress/priority-queue": "^3.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "@wordpress/redux-routine": "^5.42.0",
+        "deepmerge": "^4.3.0",
+        "equivalent-key-map": "^0.2.2",
+        "is-plain-object": "^5.0.0",
+        "is-promise": "^4.0.0",
+        "redux": "^5.0.1",
+        "rememo": "^4.0.2",
+        "use-memo-one": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/date": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/date/-/date-5.42.0.tgz",
+      "integrity": "sha512-iTzp5vkJm3lX2V2vRdu1PK/Z9LNREWGSic5yYNKTxmOXd7FUu93hCb4hfxYReJHRqSq8lQORbvxxF/b3JeM3yA==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/deprecated": "^4.42.0",
+        "moment": "^2.29.4",
+        "moment-timezone": "^0.5.40"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/dependency-extraction-webpack-plugin": {
+      "version": "6.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-6.42.0.tgz",
+      "integrity": "sha512-C00CqmuCHbKRsh7zXD0jlSnPhuW6nVF02xxkqXXX9AEo1FkvYhaBdQ1Plas1V+fuk47+lIktPg04FiaX6J4Tlg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "json2php": "^0.0.7"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@wordpress/dependency-extraction-webpack-plugin/node_modules/json2php": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.7.tgz",
+      "integrity": "sha512-dnSoUiLAoVaMXxFsVi4CrPVYMKOuDBXTghXSmMINX44RZ8WM9cXlY7UqrQnlAcODCVO7FV3+8t/5nDKAjimLfg==",
+      "dev": true,
+      "license": "BSD"
+    },
+    "node_modules/@wordpress/deprecated": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-4.42.0.tgz",
+      "integrity": "sha512-p0MjfkaworM9gYrab7JYwikGnQw88PaISdxVI3TiSyloRdlYU1p8UXSGHwn0vk55ty32YhSsPqtr0xMTgtW1xw==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/hooks": "^4.42.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/dom": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-4.42.0.tgz",
+      "integrity": "sha512-LRyfQEkAcDyVvFt7pMO9jOVE1X32N9Kef/WBUFfdT0NjPPLHG/iYIDmiyXNrvpxcLrBPxWZqr0jvuFEudlrwXw==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/deprecated": "^4.42.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/dom-ready": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-4.42.0.tgz",
+      "integrity": "sha512-ujShJCmo9Y6yqX9tD7100M7MwiEPiDsaN2OQzX1vA+2lp099muq73376zv9ISBkK0C8uUbMZzw2B+JTmBiyGtw==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/e2e-test-utils-playwright": {
+      "version": "1.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils-playwright/-/e2e-test-utils-playwright-1.42.0.tgz",
+      "integrity": "sha512-IN5OK4QTymZxnUzOswK52y/YfHecmiMh+09LcVglxfqHecFgRqd40j1BcNv/7oFIlah6jRO74zC0bqKXX5fw/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "change-case": "^4.1.2",
+        "get-port": "^5.1.1",
+        "lighthouse": "^12.2.2",
+        "mime": "^3.0.0",
+        "web-vitals": "^4.2.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "@playwright/test": ">=1",
+        "@types/node": "^20.17.10"
+      }
+    },
+    "node_modules/@wordpress/element": {
+      "version": "6.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-6.42.0.tgz",
+      "integrity": "sha512-aSuifJL9MF0xrAynWSWxIuhgagJcVwSWrqIpLwX0DZasQ0LKsJe08SmuDe/z3sgOymGG6cOd/GHv0fLwQe8VFQ==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@types/react": "^18.3.27",
+        "@types/react-dom": "^18.3.1",
+        "@wordpress/escape-html": "^3.42.0",
+        "change-case": "^4.1.2",
+        "is-plain-object": "^5.0.0",
+        "react": "^18.3.0",
+        "react-dom": "^18.3.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/env": {
+      "version": "10.39.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-10.39.0.tgz",
+      "integrity": "sha512-Hgl2RQAAzXFMqkpegGWT1/KkX88OVikRroPidWkij1WtU8p+AZniTcncWmlWqbdLdfGbPqQS5ZkqDZCzrQjgnA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@inquirer/prompts": "^7.2.0",
+        "@wp-playground/cli": "^3.0.0",
+        "chalk": "^4.0.0",
+        "copy-dir": "^1.3.0",
+        "cross-spawn": "^7.0.6",
+        "docker-compose": "^0.24.3",
+        "extract-zip": "^1.6.7",
+        "got": "^11.8.5",
+        "js-yaml": "^3.13.1",
+        "ora": "^4.0.2",
+        "rimraf": "^5.0.10",
+        "simple-git": "^3.5.0",
+        "terminal-link": "^2.0.0",
+        "yargs": "^17.3.0"
+      },
+      "bin": {
+        "wp-env": "bin/wp-env"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/escape-html": {
+      "version": "3.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-3.42.0.tgz",
+      "integrity": "sha512-dykrMeKAxhwfEImrXfTqKREYGJP2qVIU8q3daUNyNLzrOdwhulAlBzUWXH9zYyY5qEQWrWsnjq4M9f77dO0p4w==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/eslint-plugin": {
+      "version": "22.22.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-22.22.0.tgz",
+      "integrity": "sha512-DLGm5i8Gn0vjkZGKF49U2pYME5Jl9AvmoMJB2G508d+sB/oTSkPmM0baUP7G5zxbd1aqfNTaD0KjdyGyWFFKOA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/eslint-parser": "7.25.7",
+        "@typescript-eslint/eslint-plugin": "^6.4.1",
+        "@typescript-eslint/parser": "^6.4.1",
+        "@wordpress/babel-preset-default": "^8.36.0",
+        "@wordpress/prettier-config": "^4.36.0",
+        "cosmiconfig": "^7.0.0",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-import-resolver-typescript": "^4.4.4",
+        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-jest": "^27.4.3",
+        "eslint-plugin-jsdoc": "^46.4.6",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-playwright": "^0.15.3",
+        "eslint-plugin-prettier": "^5.0.0",
+        "eslint-plugin-react": "^7.27.0",
+        "eslint-plugin-react-hooks": "^4.3.0",
+        "globals": "^13.12.0",
+        "requireindex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7",
+        "eslint": ">=8",
+        "prettier": ">=3",
+        "typescript": ">=5"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wordpress/eslint-plugin/node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wordpress/eslint-plugin/node_modules/yaml": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@wordpress/hooks": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.42.0.tgz",
+      "integrity": "sha512-isdznPKo+LEAGrP/o6SnWjxKYKn4KNzb5dmpnYPTbLh13gE/p8KctpLyzMsgR2GBXF8soAL+hpXMxxKoTQSabA==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/html-entities": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.42.0.tgz",
+      "integrity": "sha512-uI1vF5+KCdxQiPY4rzkaM1oZY5SX1lvSB+Uxndv2WCmc3lvTwabYos7wfXVYySxHRMOrG6KsqOWDzaK7h/b3NQ==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/i18n": {
+      "version": "5.26.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.26.0.tgz",
+      "integrity": "sha512-YHzaUWlCuN2ynl47qbsdMkTGtP52+E1giDOdWBgUaSexUYjbeFxKFUzRMB0Wuh1psL80+VzvJOH/mU440KAJnA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/runtime": "7.25.7",
+        "@wordpress/hooks": "^4.26.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "sprintf-js": "^1.1.1",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/icons": {
+      "version": "10.32.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.32.0.tgz",
+      "integrity": "sha512-1WvJdT361X1LnetYBpBWUjAVXZzl+pBdIwHbYRAp8ej47EI/igPmNxmq81nFd40s8fer/9qtipielcqSI6H2rA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/runtime": "7.25.7",
+        "@wordpress/element": "^6.32.0",
+        "@wordpress/primitives": "^4.32.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/is-shallow-equal": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.42.0.tgz",
+      "integrity": "sha512-o2nEnBeUvGv5vT6uV2ed/7UcFWlSMFmRRtcDqQomPledVOHpAZfrRWawuSFEC61PMFqclp7kGfNLSHfhoG1J+A==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/jest-console": {
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-8.42.0.tgz",
+      "integrity": "sha512-eLU7HO5VMt5LEIL+fTkuF8mcbLVNtTa0WXWZDcTPnPv4PSDH/QUGEJZ7QccF+cJ0Xj8np6G/xZWRs7VXlJYycg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "jest-matcher-utils": "^29.6.2",
+        "jest-mock": "^29.6.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "jest": ">=29"
+      }
+    },
+    "node_modules/@wordpress/jest-preset-default": {
+      "version": "12.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-12.42.0.tgz",
+      "integrity": "sha512-yTFeblOQORtQ77T4l2LqWf2IO4j65rpX2ekaQTR7cWKCbA/HOpuwK3LYHPN8Pq2gfXrCoNC68QEgGoi4i2oHAw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/jest-console": "^8.42.0",
+        "babel-jest": "29.7.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7",
+        "jest": ">=29"
+      }
+    },
+    "node_modules/@wordpress/keyboard-shortcuts": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-5.42.0.tgz",
+      "integrity": "sha512-UZ9HFbcFMP95O9fco2ECK2zmHqvwod/2T5ft7o4yNV6Tw/j1e1lRkQRYWljIddJKm++D7c9KtMTAx98KhGyI+Q==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/data": "^10.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/keycodes": "^4.42.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/keycodes": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.42.0.tgz",
+      "integrity": "sha512-QV82RsOYL3qWXxVTU7T6zk5LU1ad4YP6DDH4czQR8mJECoDsblf2gSjYcGDHkPUK30SXJ7/x/ZOnhGkyJSVaKw==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/i18n": "^6.15.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/keycodes/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/notices": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-5.42.0.tgz",
+      "integrity": "sha512-wWdaojBUvI8TzL7uJJG7nXkzxl57sh9AwV9fpfOqwE4kQkXkDZ1kwJozSN2Rm/3eLMBqQxLjKf4OlOttgmvROg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/a11y": "^4.42.0",
+        "@wordpress/components": "^32.4.0",
+        "@wordpress/data": "^10.42.0",
+        "clsx": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/notices/node_modules/@wordpress/components": {
+      "version": "32.4.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-32.4.0.tgz",
+      "integrity": "sha512-aGXtHZbrvA2upy/Qwti1lFjt0BPqezoYx2Le5x/0P841Ss4O/9XtAvJGg99hityIugbzEdDzkWKcdoBRwa2FBQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@ariakit/react": "^0.4.22",
+        "@date-fns/utc": "^2.1.1",
+        "@emotion/cache": "^11.14.0",
+        "@emotion/css": "^11.13.5",
+        "@emotion/react": "^11.14.0",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/styled": "^11.14.1",
+        "@emotion/utils": "^1.4.2",
+        "@floating-ui/react-dom": "2.0.8",
+        "@types/gradient-parser": "1.1.0",
+        "@types/highlight-words-core": "1.2.1",
+        "@types/react": "^18.3.27",
+        "@use-gesture/react": "^10.3.1",
+        "@wordpress/a11y": "^4.42.0",
+        "@wordpress/base-styles": "^6.18.0",
+        "@wordpress/compose": "^7.42.0",
+        "@wordpress/date": "^5.42.0",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/dom": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/escape-html": "^3.42.0",
+        "@wordpress/hooks": "^4.42.0",
+        "@wordpress/html-entities": "^4.42.0",
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/icons": "^12.0.0",
+        "@wordpress/is-shallow-equal": "^5.42.0",
+        "@wordpress/keycodes": "^4.42.0",
+        "@wordpress/primitives": "^4.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "@wordpress/rich-text": "^7.42.0",
+        "@wordpress/warning": "^3.42.0",
+        "change-case": "^4.1.2",
+        "clsx": "^2.1.1",
+        "colord": "^2.7.0",
+        "csstype": "^3.2.3",
+        "date-fns": "^3.6.0",
+        "deepmerge": "^4.3.0",
+        "fast-deep-equal": "^3.1.3",
+        "framer-motion": "^11.15.0",
+        "gradient-parser": "1.1.1",
+        "highlight-words-core": "^1.2.2",
+        "is-plain-object": "^5.0.0",
+        "memize": "^2.1.0",
+        "path-to-regexp": "^6.2.1",
+        "re-resizable": "^6.4.0",
+        "react-colorful": "^5.6.1",
+        "react-day-picker": "^9.7.0",
+        "remove-accents": "^0.5.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/notices/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/notices/node_modules/@wordpress/icons": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-12.0.0.tgz",
+      "integrity": "sha512-bDYsBGb1Ig/HWMt7aNrFWeABrD2wbReMazn9cZxUnXTf9ZFFrmG8PEdwmmJErDiEH9MvvAzLxadcNylWNNgeZA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/primitives": "^4.42.0",
+        "change-case": "4.1.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/npm-package-json-lint-config": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-5.42.0.tgz",
+      "integrity": "sha512-Kjvf5M0NNwuAwsxKRY2hB16QJ7BPfd+NjDyYMlSCpzUXtg94Eo8DdzNnKcyZXVIQynKdQCDGLx84DN2wr60K3A==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "npm-package-json-lint": ">=6.0.0"
+      }
+    },
+    "node_modules/@wordpress/postcss-plugins-preset": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-5.42.0.tgz",
+      "integrity": "sha512-hXCJdLX3R9bWp11DE90ZzTE+1jf/J9KlFkP3qHwZSY+5TP3hWb4HEvdnWSFkWDiBqlzFZK2SEvzheyMjPsq+3g==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/base-styles": "^6.18.0",
+        "autoprefixer": "^10.4.20",
+        "postcss-import": "^16.1.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/@wordpress/preferences": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/preferences/-/preferences-4.42.0.tgz",
+      "integrity": "sha512-WjCfTsUWJL2TfBrS4YPrdUveiTNCQLvpcYNhp9FcNgUk0YFY7DjGVUB/z4TiyDN4jCZP9vdg0FmQpTl0knqqVQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/a11y": "^4.42.0",
+        "@wordpress/base-styles": "^6.18.0",
+        "@wordpress/components": "^32.4.0",
+        "@wordpress/compose": "^7.42.0",
+        "@wordpress/data": "^10.42.0",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/icons": "^12.0.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "clsx": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/preferences/node_modules/@wordpress/components": {
+      "version": "32.4.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-32.4.0.tgz",
+      "integrity": "sha512-aGXtHZbrvA2upy/Qwti1lFjt0BPqezoYx2Le5x/0P841Ss4O/9XtAvJGg99hityIugbzEdDzkWKcdoBRwa2FBQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@ariakit/react": "^0.4.22",
+        "@date-fns/utc": "^2.1.1",
+        "@emotion/cache": "^11.14.0",
+        "@emotion/css": "^11.13.5",
+        "@emotion/react": "^11.14.0",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/styled": "^11.14.1",
+        "@emotion/utils": "^1.4.2",
+        "@floating-ui/react-dom": "2.0.8",
+        "@types/gradient-parser": "1.1.0",
+        "@types/highlight-words-core": "1.2.1",
+        "@types/react": "^18.3.27",
+        "@use-gesture/react": "^10.3.1",
+        "@wordpress/a11y": "^4.42.0",
+        "@wordpress/base-styles": "^6.18.0",
+        "@wordpress/compose": "^7.42.0",
+        "@wordpress/date": "^5.42.0",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/dom": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/escape-html": "^3.42.0",
+        "@wordpress/hooks": "^4.42.0",
+        "@wordpress/html-entities": "^4.42.0",
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/icons": "^12.0.0",
+        "@wordpress/is-shallow-equal": "^5.42.0",
+        "@wordpress/keycodes": "^4.42.0",
+        "@wordpress/primitives": "^4.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "@wordpress/rich-text": "^7.42.0",
+        "@wordpress/warning": "^3.42.0",
+        "change-case": "^4.1.2",
+        "clsx": "^2.1.1",
+        "colord": "^2.7.0",
+        "csstype": "^3.2.3",
+        "date-fns": "^3.6.0",
+        "deepmerge": "^4.3.0",
+        "fast-deep-equal": "^3.1.3",
+        "framer-motion": "^11.15.0",
+        "gradient-parser": "1.1.1",
+        "highlight-words-core": "^1.2.2",
+        "is-plain-object": "^5.0.0",
+        "memize": "^2.1.0",
+        "path-to-regexp": "^6.2.1",
+        "re-resizable": "^6.4.0",
+        "react-colorful": "^5.6.1",
+        "react-day-picker": "^9.7.0",
+        "remove-accents": "^0.5.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/preferences/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/preferences/node_modules/@wordpress/icons": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-12.0.0.tgz",
+      "integrity": "sha512-bDYsBGb1Ig/HWMt7aNrFWeABrD2wbReMazn9cZxUnXTf9ZFFrmG8PEdwmmJErDiEH9MvvAzLxadcNylWNNgeZA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/primitives": "^4.42.0",
+        "change-case": "4.1.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/prettier-config": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.42.0.tgz",
+      "integrity": "sha512-YoOlVxDMZ02+Eg8N9OVItikOLnpLd6C4mi/QwJvlKS7b9sKAQe+ekBugj6y/9w1PkODhMM+Dvxj+dGWq/8TTyA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "prettier": ">=3"
+      }
+    },
+    "node_modules/@wordpress/primitives": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-4.42.0.tgz",
+      "integrity": "sha512-kXqtXZcLNfMR3EiGm5XBilsDIf5+hmiQ+xPpJjYqcN7HHcyeE5+TwIzeuSdO2i8RnKnRYKV7yhj6EmmZr6ldYQ==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/element": "^6.42.0",
+        "clsx": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/priority-queue": {
+      "version": "3.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-3.42.0.tgz",
+      "integrity": "sha512-XNi5PWOCz6Y8YSNl7PDNx+CPoADxzRvYhfxCdzJbX4Za5HZi7/qfrIIUI6GIETRPRvWSCI9TZmctRFjBg1mq3Q==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "requestidlecallback": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/private-apis": {
+      "version": "1.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/private-apis/-/private-apis-1.42.0.tgz",
+      "integrity": "sha512-IDpyCszdnBECvkejn2vyGPHn4aWtROFq0yFaVGPAvYCadnlpWsQC0oJodppBOE7sftYiIDnTw6/rnv+mp29/Kg==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/redux-routine": {
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-5.42.0.tgz",
+      "integrity": "sha512-rT81HPHH8USZHUYb6slGawmhZN71iBB6ACSDK+hWc3PxApTPlOYcc7MzfTEiOzYPGolWfm+NamBNgks9YISEhg==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "is-plain-object": "^5.0.0",
+        "is-promise": "^4.0.0",
+        "rungen": "^0.3.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "redux": ">=4"
+      }
+    },
+    "node_modules/@wordpress/rich-text": {
+      "version": "7.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-7.42.0.tgz",
+      "integrity": "sha512-BmX2JZd5a53/FdAjuHJDswQD1YEmHrx8fhf921K8YbP/h043qwfjTPp1FVBxAmXP02QWGrgE2iSZEZWzbG+ACw==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/a11y": "^4.42.0",
+        "@wordpress/compose": "^7.42.0",
+        "@wordpress/data": "^10.42.0",
+        "@wordpress/deprecated": "^4.42.0",
+        "@wordpress/dom": "^4.42.0",
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/escape-html": "^3.42.0",
+        "@wordpress/i18n": "^6.15.0",
+        "@wordpress/keycodes": "^4.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "colord": "2.9.3",
+        "memize": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/rich-text/node_modules/@wordpress/i18n": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-6.15.0.tgz",
+      "integrity": "sha512-ZkGJbZIRhtcQmynb1jb+rRXrw9+SSV0y6KE2R4eex6MzFN0PoNKJcjlOtMLiyMsXd5KFYzfzVj14EGsx5XgG/w==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@tannin/sprintf": "^1.3.2",
+        "@wordpress/hooks": "^4.42.0",
+        "gettext-parser": "^1.3.1",
+        "memize": "^2.1.0",
+        "tannin": "^1.2.0"
+      },
+      "bin": {
+        "pot-to-php": "tools/pot-to-php.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/scripts": {
+      "version": "30.27.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-30.27.0.tgz",
+      "integrity": "sha512-gXGptazCxAaR7g8kcN5joj7B5fCm0VeBHOmnDBs2dbQ4W4F3tfzdg6CTEj8LonF9bWQXlSy3ku8EqWCdkSG9Xw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/core": "7.25.7",
+        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+        "@svgr/webpack": "^8.0.1",
+        "@wordpress/babel-preset-default": "^8.34.0",
+        "@wordpress/browserslist-config": "^6.34.0",
+        "@wordpress/dependency-extraction-webpack-plugin": "^6.34.0",
+        "@wordpress/e2e-test-utils-playwright": "^1.34.0",
+        "@wordpress/eslint-plugin": "^22.20.0",
+        "@wordpress/jest-preset-default": "^12.34.0",
+        "@wordpress/npm-package-json-lint-config": "^5.34.0",
+        "@wordpress/postcss-plugins-preset": "^5.34.0",
+        "@wordpress/prettier-config": "^4.34.0",
+        "@wordpress/stylelint-config": "^23.26.0",
+        "adm-zip": "^0.5.9",
+        "babel-jest": "29.7.0",
+        "babel-loader": "9.2.1",
+        "browserslist": "^4.21.10",
+        "chalk": "^4.0.0",
+        "check-node-version": "^4.1.0",
+        "copy-webpack-plugin": "^10.2.0",
+        "cross-spawn": "^7.0.6",
+        "css-loader": "^6.2.0",
+        "cssnano": "^6.0.1",
+        "cwd": "^0.10.0",
+        "dir-glob": "^3.0.1",
+        "eslint": "^8.3.0",
+        "expect-puppeteer": "^4.4.0",
+        "fast-glob": "^3.2.7",
+        "filenamify": "^4.2.0",
+        "jest": "^29.6.2",
+        "jest-dev-server": "^10.1.4",
+        "jest-environment-jsdom": "^29.6.2",
+        "jest-environment-node": "^29.6.2",
+        "json2php": "^0.0.9",
+        "markdownlint-cli": "^0.31.1",
+        "merge-deep": "^3.0.3",
+        "mini-css-extract-plugin": "^2.9.2",
+        "minimist": "^1.2.0",
+        "npm-package-json-lint": "^6.4.0",
+        "npm-packlist": "^3.0.0",
+        "postcss": "^8.4.5",
+        "postcss-loader": "^6.2.1",
+        "prettier": "npm:wp-prettier@3.0.3",
+        "puppeteer-core": "^23.10.1",
+        "react-refresh": "^0.14.0",
+        "read-pkg-up": "^7.0.1",
+        "resolve-bin": "^0.4.0",
+        "rtlcss": "^4.3.0",
+        "sass": "^1.54.0",
+        "sass-loader": "^16.0.3",
+        "schema-utils": "^4.2.0",
+        "source-map-loader": "^3.0.0",
+        "stylelint": "^16.8.2",
+        "terser-webpack-plugin": "^5.3.10",
+        "url-loader": "^4.1.1",
+        "webpack": "^5.97.0",
+        "webpack-bundle-analyzer": "^4.9.1",
+        "webpack-cli": "^5.1.4",
+        "webpack-dev-server": "^4.15.1"
+      },
+      "bin": {
+        "wp-scripts": "bin/wp-scripts.js"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "@playwright/test": "^1.56.1",
+        "@wordpress/env": "^10.0.0",
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@wordpress/env": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wordpress/shortcode": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-4.42.0.tgz",
+      "integrity": "sha512-vaXEGjis5IqvPtSMYZgrT2zg5HwjePrs5fgWCwYfX5r/uiizfkeOSedpTBSH/FLpQQTMMeFsr22DLcuF0qdyeA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "memize": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/style-engine": {
+      "version": "2.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/style-engine/-/style-engine-2.42.0.tgz",
+      "integrity": "sha512-mrqmz7Ldp5d150oIQdoMvMRFtWXHZbkoeOYKpxPOeo2EwNldkU5zQSkU196/Z7nFvMNKr9yMt+OgnpWTIZvpcg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "change-case": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/stylelint-config": {
+      "version": "23.34.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-23.34.0.tgz",
+      "integrity": "sha512-4WetpbMeyq27h1233huk12Jv5xthc4KDKMOZfDXKQl8wS6FX1NUlhEOxbe7k1u20ZQd2AvR71ucp3hOjnSw74A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@stylistic/stylelint-plugin": "^3.0.1",
+        "@wordpress/theme": "^0.9.0",
+        "stylelint-config-recommended": "^14.0.1",
+        "stylelint-config-recommended-scss": "^14.1.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "stylelint": "^16.8.2",
+        "stylelint-scss": "^6.4.0"
+      }
+    },
+    "node_modules/@wordpress/theme": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/theme/-/theme-0.9.0.tgz",
+      "integrity": "sha512-jxskNZVvWHIswQvWvswaNIAkBpXwdFcocBYxTWQnYgvb0QAEYsKsnqYMulZPrz/Dk4c+GF7ptwdLxb3rry9tcg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/element": "^6.42.0",
+        "@wordpress/private-apis": "^1.42.0",
+        "colorjs.io": "^0.6.0",
+        "memize": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0",
+        "stylelint": "^16.8.2"
+      },
+      "peerDependenciesMeta": {
+        "stylelint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wordpress/token-list": {
+      "version": "3.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-3.42.0.tgz",
+      "integrity": "sha512-s7fdwYf+1CRQfBHWzpb56wGWEMjF/EQW/c7k7imuPURhjXfOHDD7R7zESiLt0q6hovOJPFialZJcrKXi/KNLJw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/undo-manager": {
+      "version": "1.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-1.42.0.tgz",
+      "integrity": "sha512-FczZFHqFY0R5z2PyYEa/Dsc7mR2PhWAX05at274m0Z/wlPeOx2VnZn0L5Vs4mDEOlF13r17Mn+7VRLtjm5lxTQ==",
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wordpress/is-shallow-equal": "^5.42.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/upload-media": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/upload-media/-/upload-media-0.11.0.tgz",
+      "integrity": "sha512-bzgwuupDWhx6mU93ShYTmFCTD2rhjHeHAJB5p/slx/sfEA13BxAYG7ZCKSKDNWrwxbA4i669BnhjW3h7PsGklg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@babel/runtime": "7.25.7",
+        "@wordpress/api-fetch": "^7.26.0",
+        "@wordpress/blob": "^4.26.0",
+        "@wordpress/compose": "^7.26.0",
+        "@wordpress/data": "^10.26.0",
+        "@wordpress/element": "^6.26.0",
+        "@wordpress/i18n": "^5.26.0",
+        "@wordpress/preferences": "^4.26.0",
+        "@wordpress/private-apis": "^1.26.0",
+        "@wordpress/url": "^4.26.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@wordpress/url": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-4.42.0.tgz",
+      "integrity": "sha512-Y1aeKxfTBOt6yvu5ZbqBAyYm6vgxVcjWpLrqiLGg7qpbZuti+Ixcmlj2p67glodfHMx1/eA/BOpfRas3Y/huzA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "remove-accents": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/warning": {
+      "version": "3.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.42.0.tgz",
+      "integrity": "sha512-LMsbWI57IkVRoco+HTQezSzf3FW97AJH3QllwQdk+Ge5y2mJ2jkfIgwZP7uDeMozA1HVUAW+TgmybLloS9xHzg==",
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wordpress/wordcount": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-4.42.0.tgz",
+      "integrity": "sha512-H27okPtQPwgvuLNijYBRjFTbPx9ogSCKvly1/Ps/FFJ8xv1YCL/fPcSFwQ5limXikX0gr4o5DN9PbF22jvUe8A==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "engines": {
+        "node": ">=18.12.0",
+        "npm": ">=8.19.2"
+      }
+    },
+    "node_modules/@wp-playground/blueprints": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@wp-playground/blueprints/-/blueprints-3.1.15.tgz",
+      "integrity": "sha512-Kp5roiVBib3Ldr+exsD6pLPRtCEiZOXD6YKjU8aHioNp9yAQuXAu2ygGt8dX9/jieC4SrAO7Gtz7EGCSkZ9QBA==",
+      "dev": true,
+      "dependencies": {
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node": "3.1.15",
+        "@php-wasm/node-polyfills": "3.1.15",
+        "@php-wasm/progress": "3.1.15",
+        "@php-wasm/scopes": "3.1.15",
+        "@php-wasm/stream-compression": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "@php-wasm/web-service-worker": "3.1.15",
+        "@wp-playground/common": "3.1.15",
+        "@wp-playground/storage": "3.1.15",
+        "@wp-playground/wordpress": "3.1.15",
+        "@zip.js/zip.js": "2.7.57",
+        "ajv": "8.12.0",
+        "async-lock": "1.4.1",
+        "clean-git-ref": "2.0.1",
+        "crc-32": "1.2.2",
+        "diff3": "0.0.4",
+        "express": "4.22.0",
+        "fast-xml-parser": "^5.5.1",
+        "fs-ext-extra-prebuilt": "2.2.7",
+        "ignore": "5.3.2",
+        "ini": "4.1.2",
+        "jsonc-parser": "3.3.1",
+        "minimisted": "2.0.1",
+        "octokit": "3.1.2",
+        "pako": "1.0.10",
+        "pify": "2.3.0",
+        "readable-stream": "3.6.2",
+        "sha.js": "2.4.12",
+        "simple-get": "4.0.1",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3",
+        "yargs": "17.7.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@wp-playground/cli": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@wp-playground/cli/-/cli-3.1.15.tgz",
+      "integrity": "sha512-PLZE6xxOzb1fGvhQmeKSsmUrr2S0PKwq0BuHOQAG5cVY/gjZv9HFVDYqCvWcFYOLl1t3k3uBIo4aW4H04jqUTQ==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/cli-util": "3.1.15",
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node": "3.1.15",
+        "@php-wasm/progress": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "@php-wasm/xdebug-bridge": "3.1.15",
+        "@wp-playground/blueprints": "3.1.15",
+        "@wp-playground/common": "3.1.15",
+        "@wp-playground/storage": "3.1.15",
+        "@wp-playground/tools": "3.1.15",
+        "@wp-playground/wordpress": "3.1.15",
+        "@zip.js/zip.js": "2.7.57",
+        "ajv": "8.12.0",
+        "async-lock": "1.4.1",
+        "clean-git-ref": "2.0.1",
+        "crc-32": "1.2.2",
+        "diff3": "0.0.4",
+        "express": "4.22.0",
+        "fast-xml-parser": "^5.5.1",
+        "fs-ext-extra-prebuilt": "2.2.7",
+        "fs-extra": "11.1.1",
+        "ignore": "5.3.2",
+        "ini": "4.1.2",
+        "jsonc-parser": "3.3.1",
+        "minimisted": "2.0.1",
+        "octokit": "3.1.2",
+        "pako": "1.0.10",
+        "pify": "2.3.0",
+        "readable-stream": "3.6.2",
+        "sha.js": "2.4.12",
+        "simple-get": "4.0.1",
+        "tmp-promise": "3.0.3",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3",
+        "xml2js": "0.6.2",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "wp-playground-cli": "wp-playground.js"
+      }
+    },
+    "node_modules/@wp-playground/common": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@wp-playground/common/-/common-3.1.15.tgz",
+      "integrity": "sha512-U/8ReVqCh0Ceh0rWMCvTHUmqF9/O6EpvPZEXkq27nTTE7dha08cUYmw/PX61vbLZ9O0RXRqXf036vR03r3gTwg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/universal": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "ini": "4.1.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@wp-playground/storage": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@wp-playground/storage/-/storage-3.1.15.tgz",
+      "integrity": "sha512-QEaI4pA4O0gPJiYInpoSYMIwTacGyfmW0Onj+HT0Tf8Vw+GWe8Z85nyGZDbZEo0zBLUYOSAIeyfc/vgXKVdLcg==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/stream-compression": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "@zip.js/zip.js": "2.7.57",
+        "async-lock": "^1.4.1",
+        "clean-git-ref": "^2.0.1",
+        "crc-32": "^1.2.0",
+        "diff3": "0.0.3",
+        "ignore": "^5.1.4",
+        "ini": "4.1.2",
+        "minimisted": "^2.0.0",
+        "octokit": "3.1.2",
+        "pako": "^1.0.10",
+        "pify": "^4.0.1",
+        "readable-stream": "^3.4.0",
+        "sha.js": "^2.4.9",
+        "simple-get": "^4.0.1"
+      }
+    },
+    "node_modules/@wp-playground/storage/node_modules/diff3": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/diff3/-/diff3-0.0.3.tgz",
+      "integrity": "sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@wp-playground/storage/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@wp-playground/tools": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@wp-playground/tools/-/tools-3.1.15.tgz",
+      "integrity": "sha512-f5sozYKd+K+f8MMCJjKnyMMSbHY9r6mc6/8/iSNaQGSRlreDWjZ/UeV1Ukp9EhOLYriCe7vRnuXj1bWrhVIIzw==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@wp-playground/blueprints": "3.1.15",
+        "@zip.js/zip.js": "2.7.57",
+        "ajv": "8.12.0",
+        "async-lock": "1.4.1",
+        "clean-git-ref": "2.0.1",
+        "crc-32": "1.2.2",
+        "diff3": "0.0.4",
+        "express": "4.22.0",
+        "fast-xml-parser": "^5.5.1",
+        "fs-ext-extra-prebuilt": "2.2.7",
+        "ignore": "5.3.2",
+        "ini": "4.1.2",
+        "jsonc-parser": "3.3.1",
+        "minimisted": "2.0.1",
+        "octokit": "3.1.2",
+        "pako": "1.0.10",
+        "pify": "2.3.0",
+        "readable-stream": "3.6.2",
+        "sha.js": "2.4.12",
+        "simple-get": "4.0.1",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3",
+        "yargs": "17.7.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@wp-playground/wordpress": {
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/@wp-playground/wordpress/-/wordpress-3.1.15.tgz",
+      "integrity": "sha512-wbX827Lv3EDoM6/+QzY/c2X893waLPnhaidmriSSmlw3g9s2f5/zg0JIyiBSFdc+uuvJ0YqybMJSrr4a4cLIIA==",
+      "dev": true,
+      "license": "GPL-2.0-or-later",
+      "dependencies": {
+        "@php-wasm/logger": "3.1.15",
+        "@php-wasm/node": "3.1.15",
+        "@php-wasm/universal": "3.1.15",
+        "@php-wasm/util": "3.1.15",
+        "@wp-playground/common": "3.1.15",
+        "express": "4.22.0",
+        "fast-xml-parser": "^5.5.1",
+        "fs-ext-extra-prebuilt": "2.2.7",
+        "ini": "4.1.2",
+        "jsonc-parser": "3.3.1",
+        "wasm-feature-detect": "1.8.0",
+        "ws": "8.18.3",
+        "yargs": "17.7.2"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@zip.js/zip.js": {
+      "version": "2.7.57",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.57.tgz",
+      "integrity": "sha512-BtonQ1/jDnGiMed6OkV6rZYW78gLmLswkHOzyMrMb+CAR7CZO8phOHO6c2qw6qb1g1betN7kwEHhhZk30dv+NA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "bun": ">=0.7.0",
+        "deno": ">=1.0.0",
+        "node": ">=16.5.0"
+      }
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
+      }
+    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+      "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/adm-zip": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz",
+      "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": ">=5.0.0"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-html": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz",
+      "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "license": "Apache-2.0",
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "license": "Apache-2.0",
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/argparse/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/aria-hidden": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+      "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/aria-query": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-shim-unscopables": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ast-types-flow": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
+      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/async-lock": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.1.tgz",
+      "integrity": "sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/atomically": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atomically/-/atomically-2.1.1.tgz",
+      "integrity": "sha512-P4w9o2dqARji6P7MHprklbfiArZAWvo07yW7qs3pdljb3BWr12FIB7W+p0zJiuiVsUpRO0iZn1kFFcpPegg0tQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "stubborn-fs": "^2.0.0",
+        "when-exit": "^2.1.4"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.27",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.27.tgz",
+      "integrity": "sha512-NP9APE+tO+LuJGn7/9+cohklunJsXWiaWEfV3si4Gi/XHDwVNgkwr1J3RQYFIvPy76GmJ9/bW8vyoU1LcxwKHA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.28.1",
+        "caniuse-lite": "^1.0.30001774",
+        "fraction.js": "^5.3.4",
+        "picocolors": "^1.1.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/autosize": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.4.tgz",
+      "integrity": "sha512-5yxLQ22O0fCRGoxGfeLSNt3J8LB1v+umtpMnPW6XjkTWXKoN0AmXAIhelJcDtFT/Y/wYWmfE+oqU10Q0b8FhaQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/axe-core": {
+      "version": "4.11.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.2.tgz",
+      "integrity": "sha512-byD6KPdvo72y/wj2T/4zGEvvlis+PsZsn/yPS3pEO+sFpcrqRpX/TJCxvVaEsNeMrfQbCr7w163YqoD9IYwHXw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/axios": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.14.0.tgz",
+      "integrity": "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.11",
+        "form-data": "^4.0.5",
+        "proxy-from-env": "^2.1.0"
+      }
+    },
+    "node_modules/axios/node_modules/proxy-from-env": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/axobject-query": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+      "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-cache-dir": "^4.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0",
+        "webpack": ">=5"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/babel-plugin-macros/node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/babel-plugin-macros/node_modules/yaml": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.17.tgz",
+      "integrity": "sha512-aTyf30K/rqAsNwN76zYrdtx8obu0E4KoUME29B1xj+B3WxgvWkp943vYQ+z8Mv3lw9xHXMHpvSPOBxzAkIa94w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.8",
+        "semver": "^6.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.2.tgz",
+      "integrity": "sha512-coWpDLJ410R781Npmn/SIBZEsAetR4xVi0SxLMXPaMO4lSf1MwnkGYMtkFxew0Dn8B3/CpbpYxN0JCgg8mn67g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.8",
+        "core-js-compat": "^3.48.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.8.tgz",
+      "integrity": "sha512-M762rNHfSF1EV3SLtnCJXFoQbbIIz0OyRwnCmV0KPC7qosSfCO0QLTSuJX3ayAebubhE6oYBAYPrBA5ljowaZg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.8"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bare-events": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "bare-abort-controller": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-abort-controller": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-fs": {
+      "version": "4.5.6",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.6.tgz",
+      "integrity": "sha512-1QovqDrR80Pmt5HPAsMsXTCFcDYr+NSUKW6nd6WO5v0JBmnItc/irNRzm2KOQ5oZ69P37y+AMujNyNtG+1Rggw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.5.4",
+        "bare-path": "^3.0.0",
+        "bare-stream": "^2.6.4",
+        "bare-url": "^2.2.2",
+        "fast-fifo": "^1.3.2"
+      },
+      "engines": {
+        "bare": ">=1.16.0"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "3.8.6",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.8.6.tgz",
+      "integrity": "sha512-l8xaNWWb/bXuzgsrlF5jaa5QYDJ9S0ddd54cP6CH+081+5iPrbJiCfBWQqrWYzmUhCbsH+WR6qxo9MeHVCr0MQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "bare": ">=1.14.0"
+      }
+    },
+    "node_modules/bare-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-os": "^3.0.1"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.12.0.tgz",
+      "integrity": "sha512-w28i8lkBgREV3rPXGbgK+BO66q+ZpKqRWrZLiCdmmUlLPrQ45CzkvRhN+7lnv00Gpi2zy5naRxnUFAxCECDm9g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "streamx": "^2.25.0",
+        "teex": "^1.0.1"
+      },
+      "peerDependencies": {
+        "bare-abort-controller": "*",
+        "bare-buffer": "*",
+        "bare-events": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-abort-controller": {
+          "optional": true
+        },
+        "bare-buffer": {
+          "optional": true
+        },
+        "bare-events": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-url": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.0.tgz",
+      "integrity": "sha512-NSTU5WN+fy/L0DDenfE8SXQna4voXuW0FHM7wH8i3/q9khUSchfPbPezO4zSFMnDGIf9YE+mt/RWhZgNRKRIXA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-path": "^3.0.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.10.13",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.13.tgz",
+      "integrity": "sha512-BL2sTuHOdy0YT1lYieUxTw/QMtPBC3pmlJC6xk8BBYVv6vcw3SGdKemQ+Xsx9ik2F/lYDO9tqsFQH1r9PFuHKw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/basic-ftp": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.2.0.tgz",
+      "integrity": "sha512-VoMINM2rqJwJgfdHq6RiUudKt2BV+FY5ZFezP/ypmwayk68+NzzAQy4XXLlqsGD4MCzq3DrmNFD/uUmBJuGoXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
+      "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "~3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "~1.2.0",
+        "http-errors": "~2.0.1",
+        "iconv-lite": "~0.4.24",
+        "on-finished": "~2.4.1",
+        "qs": "~6.14.0",
+        "raw-body": "~2.5.3",
+        "type-is": "~1.6.18",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/bottleneck": {
+      "version": "2.19.5",
+      "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz",
+      "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.28.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
+      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.10.12",
+        "caniuse-lite": "^1.0.30001782",
+        "electron-to-chromium": "^1.5.328",
+        "node-releases": "^2.0.36",
+        "update-browserslist-db": "^1.2.3"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/btoa-lite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
+      "integrity": "sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacheable": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.3.4.tgz",
+      "integrity": "sha512-djgxybDbw9fL/ZWMI3+CE8ZilNxcwFkVtDc1gJ+IlOSSWkSMPQabhV/XCHTQ6pwwN6aivXPZ43omTooZiX06Ew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/memory": "^2.0.8",
+        "@cacheable/utils": "^2.4.0",
+        "hookified": "^1.15.0",
+        "keyv": "^5.6.0",
+        "qified": "^0.9.0"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
+      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "license": "MIT",
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/camelcase-keys/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys/node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001782",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001782.tgz",
+      "integrity": "sha512-dZcaJLJeDMh4rELYFw1tvSn1bhZWYFOt468FcbHHxx/Z/dFidd1I6ciyFdi3iwfQCyOjqo9upF6lGQYtMiJWxw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/capital-case": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
+      "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3",
+        "upper-case-first": "^2.0.2"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/change-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
+      "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==",
+      "license": "MIT",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "capital-case": "^1.0.4",
+        "constant-case": "^3.0.4",
+        "dot-case": "^3.0.4",
+        "header-case": "^2.0.4",
+        "no-case": "^3.0.4",
+        "param-case": "^3.0.4",
+        "pascal-case": "^3.1.2",
+        "path-case": "^3.0.4",
+        "sentence-case": "^3.0.4",
+        "snake-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.1.tgz",
+      "integrity": "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/check-node-version": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.2.1.tgz",
+      "integrity": "sha512-YYmFYHV/X7kSJhuN/QYHUu998n/TRuDe8UenM3+m5NrkiH670lb9ILqHIvBencvJc4SDh+XcbXMR4b+TtubJiw==",
+      "dev": true,
+      "license": "Unlicense",
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "map-values": "^1.0.1",
+        "minimist": "^1.2.0",
+        "object-filter": "^1.0.2",
+        "run-parallel": "^1.1.4",
+        "semver": "^6.3.0"
+      },
+      "bin": {
+        "check-node-version": "bin.js"
+      },
+      "engines": {
+        "node": ">=8.3.0"
+      }
+    },
+    "node_modules/check-node-version/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/chrome-launcher": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.2.1.tgz",
+      "integrity": "sha512-qmFR5PLMzHyuNJHwOloHPAHhbaNglkfeV/xDtt5b7xiFFyU1I+AZZX0PYseMuhenJSSirgxELYIbswcoc+5H4A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^2.0.1"
+      },
+      "bin": {
+        "print-chrome-path": "bin/print-chrome-path.cjs"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/chromium-bidi": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.11.0.tgz",
+      "integrity": "sha512-6CJWHkNRoyZyjV9Rwv2lYONZf1Xm0IuDyNq97nwSsxxP3wf5Bwy15K5rOvVKMtJ127jJBmxFUanSAOjgFRxgrA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "mitt": "3.0.1",
+        "zod": "3.23.8"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/clean-git-ref": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-2.0.1.tgz",
+      "integrity": "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+      "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-own": "^0.1.3",
+        "is-plain-object": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "lazy-cache": "^1.0.3",
+        "shallow-clone": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cmdk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz",
+      "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "^1.1.1",
+        "@radix-ui/react-dialog": "^1.1.6",
+        "@radix-ui/react-id": "^1.1.0",
+        "@radix-ui/react-primitive": "^2.0.2"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19 || ^19.0.0-rc",
+        "react-dom": "^18 || ^19 || ^19.0.0-rc"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz",
+      "integrity": "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorjs.io": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.6.1.tgz",
+      "integrity": "sha512-8lyR2wHzuIykCpqHKgluGsqQi5iDm3/a2IgP2GBZrasn2sBRkE4NOGsglZxWLs/jZQoNkmA/KM/8NV16rLUdBg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/color"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/comment-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
+        "debug": "2.6.9",
+        "negotiator": "~0.6.4",
+        "on-headers": "~1.1.0",
+        "safe-buffer": "5.2.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/compression/node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/computed-style": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz",
+      "integrity": "sha512-WpAmaKbMNmS3OProfHIdJiNleNJdgUrJfbKArXua28QF7+0CoZjlLn0lp6vlc+dl5r2/X9GQiQRQQU4BzSa69w==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/configstore": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-7.1.0.tgz",
+      "integrity": "sha512-N4oog6YJWbR9kGyXvS7jEykLDXIE2C0ILYqNBZBp9iwiJpoCBWYsuAdW6PPFn6w06jjnC+3JstVvWHO4cZqvRg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "atomically": "^2.0.3",
+        "dot-prop": "^9.0.0",
+        "graceful-fs": "^4.2.11",
+        "xdg-basedir": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/constant-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz",
+      "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3",
+        "upper-case": "^2.0.2"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/copy-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/copy-dir/-/copy-dir-1.3.0.tgz",
+      "integrity": "sha512-Q4+qBFnN4bwGwvtXXzbp4P/4iNk0MaiGAzvQ8OiMtlLjkIKjmNN689uVzShSM0908q7GoFHXIPx4zi75ocoaHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
+      "integrity": "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-glob": "^3.2.7",
+        "glob-parent": "^6.0.1",
+        "globby": "^12.0.2",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 12.20.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/array-union": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
+      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
+      "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-union": "^3.0.1",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.7",
+        "ignore": "^5.1.9",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.49.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz",
+      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.49.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.49.0.tgz",
+      "integrity": "sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.28.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.49.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.49.0.tgz",
+      "integrity": "sha512-XM4RFka59xATyJv/cS3O3Kml72hQXUeGRuuTmMYFxwzc9/7C8OYTaIR/Ji+Yt8DXzsFLNhat15cE/JP15HrCgw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cosmiconfig": {
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/csp_evaluator": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/csp_evaluator/-/csp_evaluator-1.1.5.tgz",
+      "integrity": "sha512-EL/iN9etCTzw/fBnp0/uj0f5BOOGvZut2mzsiiBZ/FdT6gFQCKRO/tmcKOxn5drWZ2Ndm/xBb1SI4zwWbGtmIw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/css-declaration-sorter": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.3.1.tgz",
+      "integrity": "sha512-gz6x+KkgNCjxq3Var03pRYLhyNfwhkKF1g/yoLgDNtFvVu0/fOLV9C8fFEZRjACp/XQLumjAYo7JVjzH3wLbxA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.3.3.tgz",
+      "integrity": "sha512-8HFEBPKhOpJPEPu70wJJetjKta86Gw9+CCyCnB3sui2qQfOvRyqBy4IKLKKAwdMpWb2lHXWk9Wb4Z6AmaUT1Pg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
+      "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
+      "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.27.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
+      "integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-preset-default": "^6.1.2",
+        "lilconfig": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
+      "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "css-declaration-sorter": "^7.2.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-calc": "^9.0.1",
+        "postcss-colormin": "^6.1.0",
+        "postcss-convert-values": "^6.1.0",
+        "postcss-discard-comments": "^6.0.2",
+        "postcss-discard-duplicates": "^6.0.3",
+        "postcss-discard-empty": "^6.0.3",
+        "postcss-discard-overridden": "^6.0.2",
+        "postcss-merge-longhand": "^6.0.5",
+        "postcss-merge-rules": "^6.1.1",
+        "postcss-minify-font-values": "^6.1.0",
+        "postcss-minify-gradients": "^6.0.3",
+        "postcss-minify-params": "^6.1.0",
+        "postcss-minify-selectors": "^6.0.4",
+        "postcss-normalize-charset": "^6.0.2",
+        "postcss-normalize-display-values": "^6.0.2",
+        "postcss-normalize-positions": "^6.0.2",
+        "postcss-normalize-repeat-style": "^6.0.2",
+        "postcss-normalize-string": "^6.0.2",
+        "postcss-normalize-timing-functions": "^6.0.2",
+        "postcss-normalize-unicode": "^6.1.0",
+        "postcss-normalize-url": "^6.0.2",
+        "postcss-normalize-whitespace": "^6.0.2",
+        "postcss-ordered-values": "^6.0.2",
+        "postcss-reduce-initial": "^6.1.0",
+        "postcss-reduce-transforms": "^6.0.2",
+        "postcss-svgo": "^6.0.3",
+        "postcss-unique-selectors": "^6.0.4"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-utils": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
+      "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-tree": "~2.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "license": "MIT"
+    },
+    "node_modules/cwd": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
+      "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-pkg": "^0.1.2",
+        "fs-exists-sync": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/date-fns": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
+    "node_modules/date-fns-jalali": {
+      "version": "4.1.0-0",
+      "resolved": "https://registry.npmjs.org/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz",
+      "integrity": "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==",
+      "license": "MIT"
+    },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/dedent": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
+      "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/detect-node-es": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.1507524",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1507524.tgz",
+      "integrity": "sha512-OjaNE7qpk6GRTXtqQjAE5bGx6+c4F1zZH0YXtpZQLM92HNXx4zMAaqlKhP4T52DosG6hDW8gPMNhGOF8xbwk/w==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/diff": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
+      "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/diff3": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/diff3/-/diff3-0.0.4.tgz",
+      "integrity": "sha512-f1rQ7jXDn/3i37hdwRk9ohqcvLRH3+gEIgmA6qEM280WUOh7cOr3GXV8Jm5sPwUs46Nzl48SE8YNLGJoaLuodg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/docker-compose": {
+      "version": "0.24.8",
+      "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.8.tgz",
+      "integrity": "sha512-plizRs/Vf15H+GCVxq2EUvyPK7ei9b/cVesHvjnX4xaXjM9spHe2Ytq0BitndFgvTJ3E3NljPNUEl7BAN43iZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yaml": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dot-prop": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-9.0.0.tgz",
+      "integrity": "sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^4.18.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/dot-prop/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.329",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.329.tgz",
+      "integrity": "sha512-/4t+AS1l4S3ZC0Ja7PHFIWeBIxGA3QGqV8/yKsP36v7NcyUCl+bIcmw6s5zVuMIECWwBrAK/6QLzTmbJChBboQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.20.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",
+      "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.21.0.tgz",
+      "integrity": "sha512-Lw7I8Zp5YKHFCXL7+Dz95g4CcbMEpgvqZNNq3AmlT5XAV6CgAAk6gyAMqn2zjw08K9BHfcNuKrMiCPLByGafow==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/equivalent-key-map": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/equivalent-key-map/-/equivalent-key-map-0.2.2.tgz",
+      "integrity": "sha512-xvHeyCDbZzkpN4VHQj/n+j2lOwL0VWszG30X4cOrc9Y7Tuo2qCdZK/0AMod23Z5dCtNUbaju6p0rwOhHUk05ew==",
+      "license": "MIT"
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "stackframe": "^1.3.4"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.24.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
+      "integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.1",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.4",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.4",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.19"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-iterator-helpers": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.3.1.tgz",
+      "integrity": "sha512-zWwRvqWiuBPr0muUG/78cW3aHROFCNIQ3zpmYDpwdbnt2m+xlNyRWpHBpa2lJjSBit7BQ+RXA1iwbSmu5yJ/EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.24.1",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.1.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.3.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "iterator.prototype": "^1.1.5",
+        "math-intrinsics": "^1.1.0",
+        "safe-array-concat": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.2.tgz",
+      "integrity": "sha512-/IGJ6+Dka158JnP5n5YFMOszjDWrXggGz1LaK/guZq9vZTmniaKlHcsscvkAhn9y4U+BU3JuUdYvtAMcv30y4A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-import-context": {
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.9.tgz",
+      "integrity": "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-tsconfig": "^4.10.1",
+        "stable-hash-x": "^0.2.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-import-context"
+      },
+      "peerDependencies": {
+        "unrs-resolver": "^1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "unrs-resolver": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.4.tgz",
+      "integrity": "sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "debug": "^4.4.1",
+        "eslint-import-context": "^0.1.8",
+        "get-tsconfig": "^4.10.1",
+        "is-bun-module": "^2.0.0",
+        "stable-hash-x": "^0.2.0",
+        "tinyglobby": "^0.2.14",
+        "unrs-resolver": "^1.7.11"
+      },
+      "engines": {
+        "node": "^16.17.0 || >=18.6.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-import-resolver-typescript"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*",
+        "eslint-plugin-import-x": "*"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-import": {
+          "optional": true
+        },
+        "eslint-plugin-import-x": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.1",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.16.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.1",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.9",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint-plugin-jest": {
+      "version": "27.9.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz",
+      "integrity": "sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.10.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.0.0 || ^6.0.0 || ^7.0.0",
+        "eslint": "^7.0.0 || ^8.0.0",
+        "jest": "*"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jest/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "46.10.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.10.1.tgz",
+      "integrity": "sha512-x8wxIpv00Y50NyweDUpa+58ffgSAI5sqe+zcZh33xphD0AVh+1kqr1ombaTRb7Fhpove1zfUuujlX9DWWBP5ag==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.41.0",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "is-builtin-module": "^3.2.1",
+        "semver": "^7.5.4",
+        "spdx-expression-parse": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
+      "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aria-query": "^5.3.2",
+        "array-includes": "^3.1.8",
+        "array.prototype.flatmap": "^1.3.2",
+        "ast-types-flow": "^0.0.8",
+        "axe-core": "^4.10.0",
+        "axobject-query": "^4.1.0",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^3.3.5",
+        "language-tags": "^1.0.9",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.includes": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint-plugin-playwright": {
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.15.3.tgz",
+      "integrity": "sha512-LQMW5y0DLK5Fnpya7JR1oAYL2/7Y9wDiYw6VZqlKqcRGSgjbVKNqxraphk7ra1U3Bb5EK444xMgUlQPbMg2M1g==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "eslint": ">=7",
+        "eslint-plugin-jest": ">=25"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-jest": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.5.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
+      "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.1",
+        "synckit": "^0.11.12"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.37.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
+      "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.3",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.2.1",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.9",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.1",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.12",
+        "string.prototype.repeat": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.6",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.6.tgz",
+      "integrity": "sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "is-core-module": "^2.16.1",
+        "node-exports-info": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/eslint/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+      "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/events-universal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.7.0"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execa/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+      "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "os-homedir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/expect-puppeteer": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz",
+      "integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/express": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.22.0.tgz",
+      "integrity": "sha512-c2iPh3xp5vvCLgaHK03+mWLFPhox7j1LwyxcZwFVApEv5i0X+IjPpbT50SJJwwLpdBVfp45AkK/v+AFgv/XlfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "~1.20.3",
+        "content-disposition": "~0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "~0.7.1",
+        "cookie-signature": "~1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.3.1",
+        "fresh": "~0.5.2",
+        "http-errors": "~2.0.0",
+        "merge-descriptors": "1.0.3",
+        "methods": "~1.1.2",
+        "on-finished": "~2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "~0.1.12",
+        "proxy-addr": "~2.0.7",
+        "qs": "~6.14.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "~0.19.0",
+        "serve-static": "~1.16.2",
+        "setprototypeof": "1.2.0",
+        "statuses": "~2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/express/node_modules/path-to-regexp": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
+      "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/extract-zip": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      }
+    },
+    "node_modules/extract-zip/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/extract-zip/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
+    },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-xml-builder": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
+      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "path-expression-matcher": "^1.1.3"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.5.9",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.9.tgz",
+      "integrity": "sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.1.4",
+        "path-expression-matcher": "^1.2.0",
+        "strnum": "^2.2.2"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.9.1"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/filenamify": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
+      "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "filename-reserved-regex": "^2.0.0",
+        "strip-outer": "^1.0.1",
+        "trim-repeated": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
+      "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "~2.0.2",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/find-cache-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-file-up": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
+      "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fs-exists-sync": "^0.1.0",
+        "resolve-dir": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/find-parent-dir": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
+      "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/find-pkg": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
+      "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-file-up": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/find-process": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.11.tgz",
+      "integrity": "sha512-mAOh9gGk9WZ4ip5UjV0o6Vb4SrfnAmtsFNzkMRH9HQiFXVQnDyQFrSHTK5UoG6E+KV+s+cIznbtwpfN41l2nFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "~4.1.2",
+        "commander": "^12.1.0",
+        "loglevel": "^1.9.2"
+      },
+      "bin": {
+        "find-process": "bin/find-process.js"
+      }
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "license": "MIT"
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/forwarded-parse": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded-parse/-/forwarded-parse-2.1.2.tgz",
+      "integrity": "sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fraction.js": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
+      "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/framer-motion": {
+      "version": "11.18.2",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.2.tgz",
+      "integrity": "sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==",
+      "license": "MIT",
+      "dependencies": {
+        "motion-dom": "^11.18.1",
+        "motion-utils": "^11.18.1",
+        "tslib": "^2.4.0"
+      },
+      "peerDependencies": {
+        "@emotion/is-prop-valid": "*",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@emotion/is-prop-valid": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-exists-sync": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+      "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-ext-extra-prebuilt": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/fs-ext-extra-prebuilt/-/fs-ext-extra-prebuilt-2.2.7.tgz",
+      "integrity": "sha512-Q7rayYRBDIvDF01HWOwSSjoaP+05N1g+o3BXL1Zf8Frw2JkjSmi4EtvCBITuW30l6hB2m2TW1pehdh8wyU/+gw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "nan": "^2.24.0"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.1.0.tgz",
+      "integrity": "sha512-QMUezzXWII9EV5aTFXW1UBVUO77wYPpjqIF8/AviUCThNeSYZykpoTixUeaNNBwmCev0AMDWMAni+f8Hxb1IFw==",
+      "dev": true,
+      "license": "Unlicense"
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/generator-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-nonce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+      "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-port": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
+      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
+      "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-tsconfig": {
+      "version": "4.13.7",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.7.tgz",
+      "integrity": "sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
+    "node_modules/get-uri": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",
+      "integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/gettext-parser": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
+      "integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
+      "license": "MIT",
+      "dependencies": {
+        "encoding": "^0.1.12",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+      "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-prefix": "^0.1.4",
+        "is-windows": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+      "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.0",
+        "ini": "^1.3.4",
+        "is-windows": "^0.2.0",
+        "which": "^1.2.12"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/gradient-parser": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/gradient-parser/-/gradient-parser-1.1.1.tgz",
+      "integrity": "sha512-Hu0YfNU+38EsTmnUfLXUKFMXq9yz7htGYpF4x+dlbBhUCvIvzLt0yVLT/gJRmvLKFJdqNFrz4eKkIUjIXSr7Tw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hashery": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.1.tgz",
+      "integrity": "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/header-case": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz",
+      "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==",
+      "license": "MIT",
+      "dependencies": {
+        "capital-case": "^1.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/highlight-words-core": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.3.tgz",
+      "integrity": "sha512-m1O9HW3/GNHxzSIXWw1wCNXXsgLlxrP0OI6+ycGUhiUHkikqW3OrwVHz+lxeNBe5yqLESdIcj8PowHQ2zLvUvQ==",
+      "license": "MIT"
+    },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hookified": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz",
+      "integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hpack.js/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hpack.js/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hpack.js/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/hpq": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/hpq/-/hpq-1.4.0.tgz",
+      "integrity": "sha512-ycJQMRaRPBcfnoT1gS5I1XCvbbw9KO94Y0vkwksuOjcJMqNZtb03MF2tCItLI2mQbkZWSSeFinoRDPmjzv4tKg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/html-tags": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~2.0.0",
+        "inherits": "~2.0.4",
+        "setprototypeof": "~1.2.0",
+        "statuses": "~2.0.2",
+        "toidentifier": "~1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/http-link-header": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-1.1.3.tgz",
+      "integrity": "sha512-3cZ0SRL8fb9MUlU3mKM61FcQvPfXx2dBrZW3Vbg5CXa8jFlK8OaEpePenLe1oEXQduhz8b0QjsqfS59QP4AJDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
+      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
+      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ignore-walk": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
+      "integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/image-ssim": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/image-ssim/-/image-ssim-0.2.0.tgz",
+      "integrity": "sha512-W7+sO6/yhxy83L0G7xR8YAc5Z5QFtYEXXRV6EaE8tuYBZJnA3gVgp3q7X7muhLZVodeb9UfvjSbwt9VJwjIYAg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/immutable": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
+      "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-in-the-middle": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.15.0.tgz",
+      "integrity": "sha512-bpQy+CrsRmYmoPMAE/0G33iwRqwW4ouqdRg8jgbH3aKuCtOc8lxgmYXg2dMM92CRiGP660EtBcymH/eVUpCSaA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "acorn-import-attributes": "^1.9.5",
+        "cjs-module-lexer": "^1.2.2",
+        "module-details-from-path": "^1.0.3"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/ini": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
+      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/internal-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/intl-messageformat": {
+      "version": "10.7.18",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.18.tgz",
+      "integrity": "sha512-m3Ofv/X/tV8Y3tHXLohcuVuhWKo7BBq62cqY15etqmLxg2DZ34AGGgQDeR+SCta2+zICb1NX83af0GJmbQ1++g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "2.3.6",
+        "@formatjs/fast-memoize": "2.2.7",
+        "@formatjs/icu-messageformat-parser": "2.11.4",
+        "tslib": "^2.8.0"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/irregular-plurals": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+      "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "license": "MIT"
+    },
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-bun-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz",
+      "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.7.1"
+      }
+    },
+    "node_modules/is-bun-module/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.4",
+        "generator-function": "^2.0.0",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
+      "license": "MIT"
+    },
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+      "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "get-proto": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-dev-server": {
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-10.1.4.tgz",
+      "integrity": "sha512-bGQ6sedNGtT6AFHhCVqGTXMPz7UyJi/ZrhNBgyqsP0XU9N8acCEIfqZEA22rOaZ+NdEVsaltk6tL7UT6aXfI7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "cwd": "^0.10.0",
+        "find-process": "^1.4.7",
+        "prompts": "^2.4.2",
+        "spawnd": "^10.1.4",
+        "tree-kill": "^1.2.2",
+        "wait-on": "^8.0.1"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/joi": {
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-18.1.2.tgz",
+      "integrity": "sha512-rF5MAmps5esSlhCA+N1b6IYHDw9j/btzGaqfgie522jS02Ju/HXBxamlXVlKEHAxoMKQL77HWI8jlqWsFuekZA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/address": "^5.1.1",
+        "@hapi/formula": "^3.0.2",
+        "@hapi/hoek": "^11.0.7",
+        "@hapi/pinpoint": "^2.0.1",
+        "@hapi/tlds": "^1.1.1",
+        "@hapi/topo": "^6.0.2",
+        "@standard-schema/spec": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/jpeg-js": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
+      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/js-library-detector": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/js-library-detector/-/js-library-detector-6.7.0.tgz",
+      "integrity": "sha512-c80Qupofp43y4cJ7+8TTDN/AsDwLi5oOm/plBrWI+iQt485vKXCco+yVmOwEgdo9VOdsYTuV0UlTeetVPTriXA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "license": "MIT"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json2php": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.9.tgz",
+      "integrity": "sha512-fQMYwvPsQt8hxRnCGyg1r2JVi6yL8Um0DIIawiKiMK9yhAAkcRNj5UsBWoaFvFzPpcWbgw9L6wzj+UMYA702Mw==",
+      "dev": true,
+      "license": "BSD"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz",
+      "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jws": "^4.0.1",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "^1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/known-css-properties": {
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.37.0.tgz",
+      "integrity": "sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.23",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
+      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/language-tags": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
+      "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "language-subtag-registry": "^0.3.20"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.13.2.tgz",
+      "integrity": "sha512-4VVDnbOpLXy/s8rdRCSXb+zfMeFR0WlJWpET1iA9CQdlZDfwyLjUuGQzXU4VeOoey6AicSAluWan7Etga6Kcmg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picocolors": "^1.1.1",
+        "shell-quote": "^1.8.3"
+      }
+    },
+    "node_modules/lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/legacy-javascript": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/legacy-javascript/-/legacy-javascript-0.0.1.tgz",
+      "integrity": "sha512-lPyntS4/aS7jpuvOlitZDFifBCb4W8L/3QU0PLbUTUj+zYah8rfVjYic88yG7ZKTxhS5h9iz7duT8oUXKszLhg==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lighthouse": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-12.8.2.tgz",
+      "integrity": "sha512-+5SKYzVaTFj22MgoYDPNrP9tlD2/Ay7j3SxPSFD9FpPyVxGr4UtOQGKyrdZ7wCmcnBaFk0mCkPfARU3CsE0nvA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@paulirish/trace_engine": "0.0.59",
+        "@sentry/node": "^9.28.1",
+        "axe-core": "^4.10.3",
+        "chrome-launcher": "^1.2.0",
+        "configstore": "^7.0.0",
+        "csp_evaluator": "1.1.5",
+        "devtools-protocol": "0.0.1507524",
+        "enquirer": "^2.3.6",
+        "http-link-header": "^1.1.1",
+        "intl-messageformat": "^10.5.3",
+        "jpeg-js": "^0.4.4",
+        "js-library-detector": "^6.7.0",
+        "lighthouse-logger": "^2.0.2",
+        "lighthouse-stack-packs": "1.12.2",
+        "lodash-es": "^4.17.21",
+        "lookup-closest-locale": "6.2.0",
+        "metaviewport-parser": "0.3.0",
+        "open": "^8.4.0",
+        "parse-cache-control": "1.0.1",
+        "puppeteer-core": "^24.17.1",
+        "robots-parser": "^3.0.1",
+        "speedline-core": "^1.4.3",
+        "third-party-web": "^0.27.0",
+        "tldts-icann": "^7.0.12",
+        "ws": "^7.0.0",
+        "yargs": "^17.3.1",
+        "yargs-parser": "^21.0.0"
+      },
+      "bin": {
+        "chrome-debug": "core/scripts/manual-chrome-launcher.js",
+        "lighthouse": "cli/index.js",
+        "smokehouse": "cli/test/smokehouse/frontends/smokehouse-bin.js"
+      },
+      "engines": {
+        "node": ">=18.16"
+      }
+    },
+    "node_modules/lighthouse-logger": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.2.tgz",
+      "integrity": "sha512-vWl2+u5jgOQuZR55Z1WM0XDdrJT6mzMP8zHUct7xTlWhuQs+eV0g+QL0RQdFjT54zVmbhLCP8vIVpy1wGn/gCg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "debug": "^4.4.1",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/lighthouse-stack-packs": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/lighthouse-stack-packs/-/lighthouse-stack-packs-1.12.2.tgz",
+      "integrity": "sha512-Ug8feS/A+92TMTCK6yHYLwaFMuelK/hAKRMdldYkMNwv+d9PtWxjXEg6rwKtsUXTADajhdrhXyuNCJ5/sfmPFw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/lighthouse/node_modules/@puppeteer/browsers": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.13.0.tgz",
+      "integrity": "sha512-46BZJYJjc/WwmKjsvDFykHtXrtomsCIrwYQPOP7VfMJoZY2bsDF9oROBABR3paDjDcmkUye1Pb1BqdcdiipaWA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "debug": "^4.4.3",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.5.0",
+        "semver": "^7.7.4",
+        "tar-fs": "^3.1.1",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/lighthouse/node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/lighthouse/node_modules/puppeteer-core": {
+      "version": "24.40.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.40.0.tgz",
+      "integrity": "sha512-MWL3XbUCfVgGR0gRsidzT6oKJT2QydPLhMITU6HoVWiiv4gkb6gJi3pcdAa8q4HwjBTbqISOWVP4aJiiyUJvag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@puppeteer/browsers": "2.13.0",
+        "chromium-bidi": "14.0.0",
+        "debug": "^4.4.3",
+        "devtools-protocol": "0.0.1581282",
+        "typed-query-selector": "^2.12.1",
+        "webdriver-bidi-protocol": "0.4.1",
+        "ws": "^8.19.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/lighthouse/node_modules/puppeteer-core/node_modules/chromium-bidi": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-14.0.0.tgz",
+      "integrity": "sha512-9gYlLtS6tStdRWzrtXaTMnqcM4dudNegMXJxkR0I/CXObHalYeYcAMPrL19eroNZHtJ8DQmu1E+ZNOYu/IXMXw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "mitt": "^3.0.1",
+        "zod": "^3.24.1"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
+    "node_modules/lighthouse/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.1581282",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1581282.tgz",
+      "integrity": "sha512-nv7iKtNZQshSW2hKzYNr46nM/Cfh5SEvE2oV0/SEGgc9XupIY5ggf84Cz8eJIkBce7S3bmTAauFD6aysMpnqsQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/lighthouse/node_modules/puppeteer-core/node_modules/ws": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lighthouse/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lighthouse/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lighthouse/node_modules/zod": {
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
+    "node_modules/line-height": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/line-height/-/line-height-0.3.1.tgz",
+      "integrity": "sha512-YExecgqPwnp5gplD2+Y8e8A5+jKpr25+DzMbFdI1/1UAr0FJrTFv4VkHLf8/6B590i1wUPJWMKKldkd/bdQ//w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "computed-style": "~0.1.3"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "license": "MIT"
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
+      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/loglevel": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz",
+      "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/loglevel"
+      }
+    },
+    "node_modules/lookup-closest-locale": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.2.0.tgz",
+      "integrity": "sha512-/c2kL+Vnp1jnV6K6RpDTHK3dgg0Tu2VVp+elEiJpjfS1UyY7AjOYHohRug6wT0OpoX2qFgNORndE9RqesfVxWQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/map-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-values/-/map-values-1.0.1.tgz",
+      "integrity": "sha512-BbShUnr5OartXJe1GeccAWtfro11hhgNJg6G9/UtWKjVGvV5U4C09cg5nk8JUevhXODaXY+hQ3xxMUKSs62ONQ==",
+      "dev": true,
+      "license": "Public Domain"
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/markdownlint": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.25.1.tgz",
+      "integrity": "sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "markdown-it": "12.3.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/markdownlint-cli": {
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz",
+      "integrity": "sha512-keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "commander": "~9.0.0",
+        "get-stdin": "~9.0.0",
+        "glob": "~7.2.0",
+        "ignore": "~5.2.0",
+        "js-yaml": "^4.1.0",
+        "jsonc-parser": "~3.0.0",
+        "markdownlint": "~0.25.1",
+        "markdownlint-rule-helpers": "~0.16.0",
+        "minimatch": "~3.0.5",
+        "run-con": "~1.2.10"
+      },
+      "bin": {
+        "markdownlint": "markdownlint.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/markdownlint-cli/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/markdownlint-cli/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/markdownlint-cli/node_modules/commander": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz",
+      "integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/markdownlint-cli/node_modules/ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/markdownlint-cli/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/markdownlint-cli/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/markdownlint-cli/node_modules/minimatch": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/markdownlint-rule-helpers": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.16.0.tgz",
+      "integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/marky": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.3.0.tgz",
+      "integrity": "sha512-ocnPZQLNpvbedwTy9kNrQEsknEfgvcLMvOtz3sFeWApDq1MXH1TqkCIx58xlpESsfwQOnuBO9beyQuNGzVvuhQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dev": true,
+      "license": "Unlicense",
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/memize": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/memize/-/memize-2.1.1.tgz",
+      "integrity": "sha512-8Nl+i9S5D6KXnruM03Jgjb+LwSupvR13WBr4hJegaaEyobvowCVupi79y2WSiWvO1mzBWxPwEYE5feCe8vyA5w==",
+      "license": "MIT"
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge-deep": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
+      "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "clone-deep": "^0.2.4",
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/metaviewport-parser": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/metaviewport-parser/-/metaviewport-parser-0.3.0.tgz",
+      "integrity": "sha512-EoYJ8xfjQ6kpe9VbVHvZTZHiOl4HL1Z18CrZ+qahvLXT7ZO4YTC2JMyt5FaUp9JJp6J4Ybb/z7IsCXZt86/QkQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.10.2.tgz",
+      "integrity": "sha512-AOSS0IdEB95ayVkxn5oGzNQwqAi2J0Jb/kKm43t7H73s8+f5873g0yuj0PNvK4dO75mu5DHg4nlgp4k6Kga8eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/minimist-options/node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/minimist-options/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/minimisted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minimisted/-/minimisted-2.0.1.tgz",
+      "integrity": "sha512-1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-object/node_modules/for-in": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+      "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/module-details-from-path": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz",
+      "integrity": "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.48",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz",
+      "integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==",
+      "license": "MIT",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/motion-dom": {
+      "version": "11.18.1",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.18.1.tgz",
+      "integrity": "sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==",
+      "license": "MIT",
+      "dependencies": {
+        "motion-utils": "^11.18.1"
+      }
+    },
+    "node_modules/motion-utils": {
+      "version": "11.18.1",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.18.1.tgz",
+      "integrity": "sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA==",
+      "license": "MIT"
+    },
+    "node_modules/mousetrap": {
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
+      "integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==",
+      "license": "Apache-2.0 WITH LLVM-exception"
+    },
+    "node_modules/mrmime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
+      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.26.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
+      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/napi-postinstall": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
+      "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "napi-postinstall": "lib/cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/napi-postinstall"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "license": "MIT",
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/node-exports-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.0.tgz",
+      "integrity": "sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array.prototype.flatmap": "^1.3.3",
+        "es-errors": "^1.3.0",
+        "object.entries": "^1.1.9",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
+      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
+      "dev": true,
+      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.36.tgz",
+      "integrity": "sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/npm-bundled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/npm-package-json-lint": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-6.4.0.tgz",
+      "integrity": "sha512-cuXAJJB1Rdqz0UO6w524matlBqDBjcNt7Ru+RDIu4y6RI1gVqiWBnylrK8sPRk81gGBA0X8hJbDXolVOoTc+sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.6",
+        "ajv-errors": "^1.0.1",
+        "chalk": "^4.1.2",
+        "cosmiconfig": "^8.0.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "ignore": "^5.2.0",
+        "is-plain-obj": "^3.0.0",
+        "jsonc-parser": "^3.2.0",
+        "log-symbols": "^4.1.0",
+        "meow": "^9.0.0",
+        "plur": "^4.0.0",
+        "semver": "^7.3.8",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1",
+        "type-fest": "^3.2.0",
+        "validate-npm-package-name": "^5.0.0"
+      },
+      "bin": {
+        "npmPkgJsonLint": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/npm-package-json-lint/node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/npm-package-json-lint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/npm-package-json-lint/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-package-json-lint/node_modules/type-fest": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-packlist": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz",
+      "integrity": "sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.6",
+        "ignore-walk": "^4.0.1",
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "npm-packlist": "bin/index.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.23",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
+      "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-filter": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz",
+      "integrity": "sha512-NahvP2vZcy1ZiiYah30CEPw0FpDcSkSePJBMpzl5EQgCmISijiGuJm3SPYp7U+Lf2TljyaIw3E5EgkEx/TNEVA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
+      "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/octokit": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/octokit/-/octokit-3.1.2.tgz",
+      "integrity": "sha512-MG5qmrTL5y8KYwFgE1A4JWmgfQBaIETE/lOlfwNYx1QOtCQHGVxkRJmdUJltFc1HVn73d61TlMhMyNTOtMl+ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/app": "^14.0.2",
+        "@octokit/core": "^5.0.0",
+        "@octokit/oauth-app": "^6.0.0",
+        "@octokit/plugin-paginate-graphql": "^4.0.0",
+        "@octokit/plugin-paginate-rest": "^9.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^10.0.0",
+        "@octokit/plugin-retry": "^6.0.0",
+        "@octokit/plugin-throttling": "^8.0.0",
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^12.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "dev": true,
+      "license": "(WTFPL OR MIT)",
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz",
+      "integrity": "sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.2.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^3.0.0",
+        "mute-stream": "0.0.8",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/ora/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ora/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ora/node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
+      "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true,
+      "license": "(MIT AND Zlib)"
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "license": "MIT",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-cache-control": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
+      "integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==",
+      "dev": true
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
+      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "entities": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5/node_modules/entities": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/parsel-js": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/parsel-js/-/parsel-js-1.2.2.tgz",
+      "integrity": "sha512-AVJMlwQ4bL2Y0VvYJGk+Fp7eX4SCH2uFoNApmn4yKWACUewZ+alwW3tyoe1r5Z3aLYQTuAuPZIyGghMfO/Tlxw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/LeaVerou"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/leaverou"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz",
+      "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==",
+      "license": "MIT",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-expression-matcher": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz",
+      "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "license": "MIT"
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pg-int8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pg-protocol": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
+      "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/yocto-queue": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz",
+      "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
+      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "playwright-core": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
+      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/plur": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+      "integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "irregular-plurals": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.8",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
+      "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.2"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
+      "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.9.3",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
+      "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
+      "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
+      "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
+      "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
+      "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "16.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.1.tgz",
+      "integrity": "sha512-2xVS1NCZAfjtVdvXiyegxzJ447GyqCeEI5V7ApgQVOWnros1p5lGNovJNapwPpMombyFBfqDwt7AD3n2l0KOfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/yaml": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/postcss-merge-longhand": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
+      "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^6.1.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
+      "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
+      "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
+      "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "colord": "^2.9.3",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
+      "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
+      "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-normalize-charset": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
+      "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
+      "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
+      "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
+      "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
+      "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
+      "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
+      "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
+      "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
+      "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
+      "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-prefix-selector": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/postcss-prefix-selector/-/postcss-prefix-selector-1.16.1.tgz",
+      "integrity": "sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": ">4 <9"
+      }
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
+      "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
+      "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
+      "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz",
+      "integrity": "sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-scss": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.29"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
+      "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^3.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >= 18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
+      "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-urlrebase": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/postcss-urlrebase/-/postcss-urlrebase-1.4.0.tgz",
+      "integrity": "sha512-rRaxMmWvXrn8Rk1PqsxmaJwldRHsr0WbbASKKCZYxXwotHkM/5X/6IrwaEe8pdzpbNGCEY86yhYMN0MhgOkADA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.0"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postgres-bytea": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz",
+      "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "name": "wp-prettier",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz",
+      "integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
+      "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/psl": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
+      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/puppeteer-core": {
+      "version": "23.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.11.1.tgz",
+      "integrity": "sha512-3HZ2/7hdDKZvZQ7dhhITOUg4/wOrDRjyK2ZBllRB0ZCOi9u0cwq1ACHDjBB+nX+7+kltHjQvBRdeY7+W0T+7Gg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@puppeteer/browsers": "2.6.1",
+        "chromium-bidi": "0.11.0",
+        "debug": "^4.4.0",
+        "devtools-protocol": "0.0.1367902",
+        "typed-query-selector": "^2.12.0",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.1367902",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz",
+      "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/qified": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/qified/-/qified-0.9.1.tgz",
+      "integrity": "sha512-n7mar4T0xQ+39dE2vGTAlbxUEpndwPANH0kDef1/MYsB8Bba9wshkybIRx74qgcvKQPEWErf9AqAdYjhzY2Ilg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/qified/node_modules/hookified": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-2.1.1.tgz",
+      "integrity": "sha512-AHb76R16GB5EsPBE2J7Ko5kiEyXwviB9P5SMrAKcuAu4vJPZttViAbj9+tZeaQE5zjDme+1vcHP78Yj/WoAveA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/qs": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
+      "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "~3.1.2",
+        "http-errors": "~2.0.1",
+        "iconv-lite": "~0.4.24",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/re-resizable": {
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.11.2.tgz",
+      "integrity": "sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-autosize-textarea": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/react-autosize-textarea/-/react-autosize-textarea-7.1.0.tgz",
+      "integrity": "sha512-BHpjCDkuOlllZn3nLazY2F8oYO1tS2jHnWhcjTWQdcKiiMU6gHLNt/fzmqMSyerR0eTdKtfSIqtSeTtghNwS+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "autosize": "^4.0.2",
+        "line-height": "^0.3.1",
+        "prop-types": "^15.5.6"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0 || ^16.0.0",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/react-colorful": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz",
+      "integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/react-day-picker": {
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.14.0.tgz",
+      "integrity": "sha512-tBaoDWjPwe0M5pGrum4H0SR6Lyk+BO9oHnp9JbKpGKW2mlraNPgP9BMfsg5pWpwrssARmeqk7YBl2oXutZTaHA==",
+      "license": "MIT",
+      "dependencies": {
+        "@date-fns/tz": "^1.4.1",
+        "@tabby_ai/hijri-converter": "1.0.5",
+        "date-fns": "^4.1.0",
+        "date-fns-jalali": "4.1.0-0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/gpbl"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/react-day-picker/node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.2"
+      },
+      "peerDependencies": {
+        "react": "^18.3.1"
+      }
+    },
+    "node_modules/react-easy-crop": {
+      "version": "5.5.7",
+      "resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-5.5.7.tgz",
+      "integrity": "sha512-kYo4NtMeXFQB7h1U+h5yhUkE46WQbQdq7if54uDlbMdZHdRgNehfvaFrXnFw5NR1PNoUOJIfTwLnWmEx/MaZnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "normalize-wheel": "^1.0.1",
+        "tslib": "^2.0.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.4.0",
+        "react-dom": ">=16.4.0"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-refresh": {
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-remove-scroll": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
+      "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "react-remove-scroll-bar": "^2.3.7",
+        "react-style-singleton": "^2.2.3",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.3",
+        "use-sidecar": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-remove-scroll-bar": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
+      "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "react-style-singleton": "^2.2.2",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-style-singleton": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
+      "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-nonce": "^1.0.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "license": "MIT"
+    },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz",
+      "integrity": "sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz",
+      "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.2.2",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.13.0",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regjsparser": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz",
+      "integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "jsesc": "~3.1.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/rememo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/rememo/-/rememo-4.0.2.tgz",
+      "integrity": "sha512-NVfSP9NstE3QPNs/TnegQY0vnJnstKQSpcrsI2kBTB3dB2PkdfKdTa+abbjMIDqpc63fE5LfjLgfMst0ULMFxQ==",
+      "license": "MIT"
+    },
+    "node_modules/remove-accents": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
+      "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
+      "license": "MIT"
+    },
+    "node_modules/requestidlecallback": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/requestidlecallback/-/requestidlecallback-0.3.0.tgz",
+      "integrity": "sha512-TWHFkT7S9p7IxLC5A1hYmAYQx2Eb9w1skrXmQ+dS1URyvR8tenMLl4lHbqEOUnpEYxNKpkVMXUgknVpBZWXXfQ==",
+      "license": "MIT"
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-in-the-middle": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.5.2.tgz",
+      "integrity": "sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.5",
+        "module-details-from-path": "^1.0.3",
+        "resolve": "^1.22.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/requireindex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.5"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve-bin": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.3.tgz",
+      "integrity": "sha512-9u8TMpc+SEHXxQXblXHz5yRvRZERkCZimFN9oz85QI3uhkh7nqfjm6OGTLg+8vucpXGcY4jLK6WkylPmt7GSvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-parent-dir": "~0.3.0"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
+      "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^1.2.2",
+        "global-modules": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/robots-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-3.0.1.tgz",
+      "integrity": "sha512-s+pyvQeIKIZ0dx5iJiQk1tPLJAWln39+MI5jtM8wnyws+G5azk+dMnMX0qfbqNetKKNgcWWOdi0sfm+FbQbgdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/rtlcss": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.3.0.tgz",
+      "integrity": "sha512-FI+pHEn7Wc4NqKXMXFM+VAYKEj/mRIcW4h24YVwVtyjI+EqGrLc2Hx/Ny0lrZ21cBWU2goLy36eqMcNj3AQJig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.21",
+        "strip-json-comments": "^3.1.1"
+      },
+      "bin": {
+        "rtlcss": "bin/rtlcss.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/run-con": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.12.tgz",
+      "integrity": "sha512-5257ILMYIF4RztL9uoZ7V9Q97zHtNHn5bN3NobeAnzB1P3ASLgg8qocM2u+R18ttp+VEM78N2LK8XcNVtnSRrg==",
+      "dev": true,
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~3.0.0",
+        "minimist": "^1.2.8",
+        "strip-json-comments": "~3.1.1"
+      },
+      "bin": {
+        "run-con": "cli.js"
+      }
+    },
+    "node_modules/run-con/node_modules/ini": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rungen": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/rungen/-/rungen-0.3.2.tgz",
+      "integrity": "sha512-zWl10xu2D7zoR8zSC2U6bg5bYF6T/Wk7rxwp8IPaJH7f0Ge21G03kNHVgHR7tyVkSSfAOG0Rqf/Cl38JftSmtw==",
+      "license": "MIT"
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/sass": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.98.0.tgz",
+      "integrity": "sha512-+4N/u9dZ4PrgzGgPlKnaaRQx64RO0JBKs9sDhQ2pLgN6JQZ25uPQZKQYaBJU48Kd5BxgXoJ4e09Dq7nMcOUW3A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": "^4.0.0",
+        "immutable": "^5.1.5",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "16.0.7",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.7.tgz",
+      "integrity": "sha512-w6q+fRHourZ+e+xA1kcsF27iGM6jdB8teexYCfdUw0sYgcDNeZESnDNT9sUmmPm3ooziwUJXGwZJSTF3kOdBfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
+      "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=11.0.0"
+      }
+    },
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=v12.22.7"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/selfsigned": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node-forge": "^1.3.0",
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
+      "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "~0.5.2",
+        "http-errors": "~2.0.1",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "~2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "~2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sentence-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz",
+      "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3",
+        "upper-case-first": "^2.0.2"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.2.tgz",
+      "integrity": "sha512-KDj11HScOaLmrPxl70KYNW1PksP4Nb/CLL2yvC+Qd2kHMPEEpfc4Re2e4FOay+bC/+XQl/7zAcWON3JVo5v3KQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.8.0",
+        "mime-types": "~2.1.35",
+        "parseurl": "~1.3.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.16.3",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
+      "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "~0.19.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.12",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz",
+      "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==",
+      "dev": true,
+      "license": "(MIT AND BSD-3-Clause)",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1",
+        "to-buffer": "^1.2.0"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+      "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^2.0.1",
+        "lazy-cache": "^0.2.3",
+        "mixin-object": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shallow-clone/node_modules/kind-of": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+      "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shallow-clone/node_modules/lazy-cache": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+      "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/shimmer": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
+      "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/showdown": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
+      "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "yargs": "^14.2"
+      },
+      "bin": {
+        "showdown": "bin/showdown.js"
+      }
+    },
+    "node_modules/showdown/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/showdown/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/showdown/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/showdown/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/showdown/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/showdown/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/showdown/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/showdown/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/showdown/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/showdown/node_modules/yargs": {
+      "version": "14.2.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+      "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^15.0.1"
+      }
+    },
+    "node_modules/showdown/node_modules/yargs-parser": {
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz",
+      "integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/simple-git": {
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.33.0.tgz",
+      "integrity": "sha512-D4V/tGC2sjsoNhoMybKyGoE+v8A60hRawKQ1iFRA1zwuDgGZCBJ4ByOzZ5J8joBbi4Oam0qiPH+GhzmSBwbJng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@kwsites/file-exists": "^1.1.1",
+        "@kwsites/promise-deferred": "^1.1.1",
+        "debug": "^4.4.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/steveukx/git-js?sponsor=1"
+      }
+    },
+    "node_modules/simple-html-tokenizer": {
+      "version": "0.5.11",
+      "resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz",
+      "integrity": "sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sirv": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/snake-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
+      "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==",
+      "license": "MIT",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/sockjs/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^10.0.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "iconv-lite": "^0.6.3",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spawnd": {
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-10.1.4.tgz",
+      "integrity": "sha512-drqHc0mKJmtMsiGMOCwzlc5eZ0RPtRvT7tQAluW2A0qUc0G7TQ8KLcn3E6K5qzkLkH2UkS3nYQiVGULvvsD9dw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "signal-exit": "^4.1.0",
+        "tree-kill": "^1.2.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-correct/node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true,
+      "license": "CC-BY-3.0"
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz",
+      "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/speedline-core": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/speedline-core/-/speedline-core-1.4.3.tgz",
+      "integrity": "sha512-DI7/OuAUD+GMpR6dmu8lliO2Wg5zfeh+/xsdyJZCzd8o5JgFUjCeLsBDuZjIQJdwXS3J0L/uZYrELKYqx+PXog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "image-ssim": "^0.2.0",
+        "jpeg-js": "^0.4.1"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/stable-hash-x": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/stable-hash-x/-/stable-hash-x-0.2.0.tgz",
+      "integrity": "sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/statuses": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/streamx": {
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.25.0.tgz",
+      "integrity": "sha512-0nQuG6jf1w+wddNEEXCF4nTg3LtufWINB5eFEN+5TNZW7KWJp6x87+JFL43vaAUPyCfH1wID+mNVyW6OHtFamg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "events-universal": "^1.0.0",
+        "fast-fifo": "^1.3.2",
+        "text-decoder": "^1.1.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string.prototype.includes": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
+      "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
+      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "regexp.prototype.flags": "^1.5.3",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-outer/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/strnum": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz",
+      "integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/stubborn-fs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-2.0.0.tgz",
+      "integrity": "sha512-Y0AvSwDw8y+nlSNFXMm2g6L51rBGdAQT20J3YSOqxC53Lo3bjWRtr2BKcfYoAf352WYpsZSTURrA0tqhfgudPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "stubborn-utils": "^1.0.1"
+      }
+    },
+    "node_modules/stubborn-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stubborn-utils/-/stubborn-utils-1.0.2.tgz",
+      "integrity": "sha512-zOh9jPYI+xrNOyisSelgym4tolKTJCQd5GBhK0+0xJvcYDcwlOoxF/rnFKQ2KRZknXSG9jWAp66fwP6AxN9STg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/style-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz",
+      "integrity": "sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.27.0"
+      }
+    },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/stylehacks": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
+      "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/stylelint": {
+      "version": "16.26.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.26.1.tgz",
+      "integrity": "sha512-v20V59/crfc8sVTAtge0mdafI3AdnzQ2KsWe6v523L4OA1bJO02S7MO2oyXDCS6iWb9ckIPnqAFVItqSBQr7jw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/stylelint"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/stylelint"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-syntax-patches-for-csstree": "^1.0.19",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3",
+        "@csstools/selector-specificity": "^5.0.0",
+        "@dual-bundle/import-meta-resolve": "^4.2.1",
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^9.0.0",
+        "css-functions-list": "^3.2.3",
+        "css-tree": "^3.1.0",
+        "debug": "^4.4.3",
+        "fast-glob": "^3.3.3",
+        "fastest-levenshtein": "^1.0.16",
+        "file-entry-cache": "^11.1.1",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.3.1",
+        "ignore": "^7.0.5",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.37.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^13.2.0",
+        "micromatch": "^4.0.8",
+        "normalize-path": "^3.0.0",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.5.6",
+        "postcss-resolve-nested-selector": "^0.1.6",
+        "postcss-safe-parser": "^7.0.1",
+        "postcss-selector-parser": "^7.1.0",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "string-width": "^4.2.3",
+        "supports-hyperlinks": "^3.2.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.9.0",
+        "write-file-atomic": "^5.0.1"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.mjs"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz",
+      "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/stylelint"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/stylelint"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^16.1.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.1.0.tgz",
+      "integrity": "sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-scss": "^4.0.9",
+        "stylelint-config-recommended": "^14.0.1",
+        "stylelint-scss": "^6.4.0"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3",
+        "stylelint": "^16.6.1"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/stylelint-scss": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.14.0.tgz",
+      "integrity": "sha512-ZKmHMZolxeuYsnB+PCYrTpFce0/QWX9i9gh0hPXzp73WjuIMqUpzdQaBCrKoLWh6XtCFSaNDErkMPqdjy1/8aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-tree": "^3.0.1",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.37.0",
+        "mdn-data": "^2.25.0",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.6",
+        "postcss-selector-parser": "^7.1.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^16.8.2"
+      }
+    },
+    "node_modules/stylelint-scss/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint/node_modules/@csstools/media-query-list-parser": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
+      "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/stylelint/node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/stylelint/node_modules/cosmiconfig": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz",
+      "integrity": "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/stylelint/node_modules/file-entry-cache": {
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.2.tgz",
+      "integrity": "sha512-N2WFfK12gmrK1c1GXOqiAJ1tc5YE+R53zvQ+t5P8S5XhnmKYVB5eZEiLNZKDSmoG8wqqbF9EXYBBW/nef19log==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^6.1.20"
+      }
+    },
+    "node_modules/stylelint/node_modules/flat-cache": {
+      "version": "6.1.22",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.22.tgz",
+      "integrity": "sha512-N2dnzVJIphnNsjHcrxGW7DePckJ6haPrSFqpsBUhHYgwtKGVq4JrBGielEGD2fCVnsGm1zlBVZ8wGhkyuetgug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cacheable": "^2.3.4",
+        "flatted": "^3.4.2",
+        "hookified": "^1.15.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stylelint/node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stylelint/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/stylelint/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/stylelint/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/stylelint/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/meow": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
+      "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/stylelint/node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/stylis": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
+      "license": "MIT"
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz",
+      "integrity": "sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-hyperlinks?sponsor=1"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-parser": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
+      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+      "dev": true
+    },
+    "node_modules/svgo": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
+      "integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^7.2.0",
+        "css-select": "^5.1.0",
+        "css-tree": "^2.3.1",
+        "css-what": "^6.1.0",
+        "csso": "^5.0.5",
+        "picocolors": "^1.0.0",
+        "sax": "^1.5.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/svgo"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/svgo/node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/synckit": {
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.9"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz",
+      "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/tannin": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tannin/-/tannin-1.2.0.tgz",
+      "integrity": "sha512-U7GgX/RcSeUETbV7gYgoz8PD7Ni4y95pgIP/Z6ayI3CfhSujwKEBlGFTCRN+Aqnuyf4AN2yHL+L8x+TCGjb9uA==",
+      "license": "MIT",
+      "dependencies": {
+        "@tannin/plural-forms": "^1.1.0"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.2.tgz",
+      "integrity": "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.2.tgz",
+      "integrity": "sha512-QGxxTxxyleAdyM3kpFs14ymbYmNFrfY+pHj7Z8FgtbZ7w2//VAgLMac7sT6nRpIHjppXO2AwwEOg0bPFVRcmXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^4.0.1",
+        "bare-path": "^3.0.0"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
+      "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "bare-fs": "^4.5.5",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/tar-stream/node_modules/b4a": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
+      "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "react-native-b4a": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-b4a": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/teex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
+      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "streamx": "^2.12.5"
+      }
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link/node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.46.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz",
+      "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.15.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
+      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^4.3.0",
+        "terser": "^5.31.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/text-decoder": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
+      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
+    "node_modules/text-decoder/node_modules/b4a": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
+      "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "react-native-b4a": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-b4a": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/third-party-web": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.27.0.tgz",
+      "integrity": "sha512-h0JYX+dO2Zr3abCQpS6/uFjujaOjA1DyDzGQ41+oFn9VW/ARiq9g5ln7qEP9+BTzDpOMyIfsfj4OvfgXAsMUSA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.27.tgz",
+      "integrity": "sha512-YQ7uPjgWUibIK6DW5lrKujGwUKhLevU4hcGbP5O6TcIUb+oTjJYJVWPS4nZsIHrEEEG6myk/oqAJUEQmpZrHsg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tldts-icann": {
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/tldts-icann/-/tldts-icann-7.0.27.tgz",
+      "integrity": "sha512-eSnMd1x/x/E/kRNyjP0wLmzxg0lcfBqPhKLAxtQ6Kd3pqZ0CM0Ty6K8HSFWXSSKokiGFzzdrypxgWOYiXDLwFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^7.0.27"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/tmp-promise": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz",
+      "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tmp": "^0.2.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/to-buffer": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.2.tgz",
+      "integrity": "sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "^2.0.5",
+        "safe-buffer": "^5.2.1",
+        "typed-array-buffer": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/trim-repeated/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ts-api-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-query-selector": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.1.tgz",
+      "integrity": "sha512-uzR+FzI8qrUEIu96oaeBJmd9E7CFEiQ3goA5qCVgc4s5llSubcfGHq9yUstZx/k4s9dXHVKsE35YWoFyvEqEHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/typescript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/uglify-js": {
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz",
+      "integrity": "sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/universal-github-app-jwt": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-1.2.0.tgz",
+      "integrity": "sha512-dncpMpnsKBk0eetwfN8D8OUHGfiDhhJ+mtsbMl+7PfW7mYjiH8LIcqRmYMtzYLgSh47HjfdBtrBwIQ/gizKR3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/jsonwebtoken": "^9.0.0",
+        "jsonwebtoken": "^9.0.2"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/unrs-resolver": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "napi-postinstall": "^0.3.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unrs-resolver"
+      },
+      "optionalDependencies": {
+        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+        "@unrs/resolver-binding-android-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-x64": "1.11.1",
+        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/upper-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz",
+      "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/upper-case-first": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
+      "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url-loader": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
+      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.27",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "file-loader": "*",
+        "webpack": "^4.0.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "file-loader": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/url-loader/node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/url-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/url-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/url-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/use-callback-ref": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
+      "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-memo-one": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
+      "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/use-sidecar": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
+      "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/wait-on": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.5.tgz",
+      "integrity": "sha512-J3WlS0txVHkhLRb2FsmRg3dkMTCV1+M6Xra3Ho7HzZDHpE7DCOnoSoCJsZotrmW3uRMhvIJGSKUKrh/MeF4iag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "axios": "^1.12.1",
+        "joi": "^18.0.1",
+        "lodash": "^4.17.21",
+        "minimist": "^1.2.8",
+        "rxjs": "^7.8.2"
+      },
+      "bin": {
+        "wait-on": "bin/wait-on"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/wasm-feature-detect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.8.0.tgz",
+      "integrity": "sha512-zksaLKM2fVlnB5jQQDqKXXwYHLQUVH9es+5TOOHwGOVJOCeRBCiPjwSg+3tN2AdTCzjgli4jijCH290kXb/zWQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/watchpack": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
+      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/web-vitals": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz",
+      "integrity": "sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/webdriver-bidi-protocol": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.4.1.tgz",
+      "integrity": "sha512-ARrjNjtWRRs2w4Tk7nqrf2gBI0QXWuOmMCx2hU+1jUt6d00MjMxURrhxhGbrsoiZKJrhTSTzbIrc554iKI10qw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.105.4",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.4.tgz",
+      "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.8",
+        "@types/json-schema": "^7.0.15",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.16.0",
+        "acorn-import-phases": "^1.0.3",
+        "browserslist": "^4.28.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.20.0",
+        "es-module-lexer": "^2.0.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.3.1",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^4.3.3",
+        "tapable": "^2.3.0",
+        "terser-webpack-plugin": "^5.3.17",
+        "watchpack": "^2.5.1",
+        "webpack-sources": "^3.3.4"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-bundle-analyzer": {
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@discoveryjs/json-ext": "0.5.7",
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
+        "gzip-size": "^6.0.0",
+        "html-escaper": "^2.0.2",
+        "opener": "^1.5.2",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
+        "ws": "^7.3.1"
+      },
+      "bin": {
+        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^2.1.1",
+        "@webpack-cli/info": "^2.0.2",
+        "@webpack-cli/serve": "^2.0.5",
+        "colorette": "^2.0.14",
+        "commander": "^10.0.1",
+        "cross-spawn": "^7.0.3",
+        "envinfo": "^7.7.3",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^3.1.1",
+        "rechoir": "^0.8.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.5",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.4",
+        "ws": "^8.13.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.3.0.tgz",
+      "integrity": "sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-merge/node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-merge/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-merge/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-merge/node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",
+      "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/when-exit": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/when-exit/-/when-exit-2.1.5.tgz",
+      "integrity": "sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.20",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
+      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/write-file-atomic/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/ws": {
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+      "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xml2js": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yaml": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz",
+      "integrity": "sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    }
+  }
+}

From 96b4376e96d4cb75f3093e4215dad7952f1a5e79 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 Apr 2026 22:51:11 -0400
Subject: [PATCH 394/423] Code review

---
 src/TouchPoint-WP/Api.php                    | 22 +++++++-------------
 src/TouchPoint-WP/StatusWidget.php           | 14 ++++++-------
 src/TouchPoint-WP/TouchPointWP_AdminAPI.php  |  2 +-
 src/TouchPoint-WP/TouchPointWP_Exception.php |  9 ++++----
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/TouchPoint-WP/Api.php b/src/TouchPoint-WP/Api.php
index 82f095e5..824b8f72 100644
--- a/src/TouchPoint-WP/Api.php
+++ b/src/TouchPoint-WP/Api.php
@@ -129,20 +129,14 @@ public function uGet(string $command, array $parameters = [], array $headers = [
 			$url .= (!str_contains($url, '?') ? '?' : '&') . http_build_query($parameters);
 		}
 
-		for ($attempt = 0; $attempt < 2; $attempt++) {
-			$r   = $this->getHttpClient()->request(
-				$url,
-				[
-					'method'  => 'GET',
-					'headers' => $headers,
-					'timeout' => $timeout
-				]
-			);
-
-			if ($r instanceof WP_Error) {
-				return $r;
-			}
-		}
+		$r   = $this->getHttpClient()->request(
+			$url,
+			[
+				'method'  => 'GET',
+				'headers' => $headers,
+				'timeout' => $timeout
+			]
+		);
 
 		$timeTaken = microtime(true) - $tik;
 
diff --git a/src/TouchPoint-WP/StatusWidget.php b/src/TouchPoint-WP/StatusWidget.php
index a4a373b9..d7e5ae49 100644
--- a/src/TouchPoint-WP/StatusWidget.php
+++ b/src/TouchPoint-WP/StatusWidget.php
@@ -50,7 +50,7 @@ public static function dashboardSetup(): void
 	 *
 	 * @return string The formatted string.
 	 */
-	protected static function timestampToFormated(mixed $timestamp): string
+	protected static function timestampToFormatted(mixed $timestamp): string
 	{
 		if (!is_numeric($timestamp)) {
 			try {
@@ -99,17 +99,17 @@ public static function render(): void
 		echo "<th>" . __("Last Updated", "TouchPoint-WP") . "</th></tr>";
 
 		$label = __("People", "TouchPoint-WP");
-		$ts = self::timestampToFormated($settings->person_cron_last_run);
+		$ts = self::timestampToFormatted($settings->person_cron_last_run);
 		echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->people</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 		if ($settings->enable_involvements === "on") {
 			$label = __('Involvements', 'TouchPoint-WP');
-			$ts = self::timestampToFormated($settings->inv_cron_last_run);
+			$ts = self::timestampToFormatted($settings->inv_cron_last_run);
 			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->involvementPosts</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 			foreach (Involvement::allTypeSettings() as $type) {
 				$count = $stats->involvementCounts[$type->postTypeWithPrefix()] ?? 0;
-				$ts = self::timestampToFormated($settings->inv_cron_last_run); // TODO
+				$ts = self::timestampToFormatted($settings->inv_cron_last_run); // TODO
 				echo "<tr><th style=\"text-align:left; padding-left:1em;\">$type->namePlural</th><td style=\"text-align:center;\">$count</td><td style=\"text-align:center;\">$ts</td></tr>";
 			}
 		}
@@ -117,18 +117,18 @@ public static function render(): void
 		if ($settings->enable_meeting_cal === "on") {
 			$label = __('Meetings', 'TouchPoint-WP');
 			// TODO replace timestamp with event-type timestamp
-			$ts = self::timestampToFormated($settings->inv_cron_last_run);
+			$ts = self::timestampToFormatted($settings->inv_cron_last_run);
 			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->meetings</td><td style=\"text-align:center;\">$ts</td></tr>";
 		}
 
 		if ($settings->enable_global === "on") {
 			$label = __('Partners', 'TouchPoint-WP');
-			$ts = self::timestampToFormated($settings->global_cron_last_run);
+			$ts = self::timestampToFormatted($settings->global_cron_last_run);
 			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->partnerPosts</td><td style=\"text-align:center;\">$ts</td></tr>";
 		}
 
 		$label = __('Reports', 'TouchPoint-WP');
-		$ts = self::timestampToFormated($reportData->ts);
+		$ts = self::timestampToFormatted($reportData->ts);
 		echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$reportData->cnt</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 		echo "</table>";
diff --git a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
index babe0910..e5c77784 100644
--- a/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
+++ b/src/TouchPoint-WP/TouchPointWP_AdminAPI.php
@@ -534,7 +534,7 @@ private static function getTpFilenameForRepoFilename(string $fn): string
 	 * @param string $message
 	 * @param ?mixed $devDetail
 	 */
-	public static function showError(string $message, $devDetail = null): void
+	public static function showError(string $message, mixed $devDetail = null): void
 	{
 		add_action('admin_notices',
 			function () use ($message, $devDetail) {
diff --git a/src/TouchPoint-WP/TouchPointWP_Exception.php b/src/TouchPoint-WP/TouchPointWP_Exception.php
index f86c99ea..1c4b743f 100644
--- a/src/TouchPoint-WP/TouchPointWP_Exception.php
+++ b/src/TouchPoint-WP/TouchPointWP_Exception.php
@@ -28,7 +28,7 @@ class TouchPointWP_Exception extends Exception
 	 * @param ?Throwable $previous
 	 * @param mixed      $devDetail
 	 */
-	public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null, $devDetail = null)
+	public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null, mixed $devDetail = null)
 	{
 		parent::__construct($message, $code, $previous);
 		if (is_admin() && TouchPointWP::currentUserIsAdmin()) {
@@ -37,7 +37,7 @@ public function __construct(string $message = "", int $code = 0, ?Throwable $pre
 				$message .= "<br />" . $this->getFile() . " @ " . $this->getLine() . "<br />";
 				$message .= str_replace("\n", "<br />", esc_html($this->getTraceAsString()));
 			}
-			self::showAdminError($message);
+			self::showAdminError($message, $devDetail);
 		}
 		error_log("TouchPoint-WP: " . $message);
 		self::debugLog($this->getCode(), $this->getFile(), $this->getLine(), $this->getMessage() . " " . $this->getTraceAsString());
@@ -46,11 +46,12 @@ public function __construct(string $message = "", int $code = 0, ?Throwable $pre
 	/**
 	 * Shows an admin error if and only if admin is loaded.
 	 *
-	 * @param $message
+	 * @param string $message
+	 * @param mixed  $devDetail
 	 *
 	 * @return void
 	 */
-	protected static function showAdminError($message): void
+	protected static function showAdminError(string $message, mixed $devDetail = null): void
 	{
 		if (is_admin() && TouchPointWP::currentUserIsAdmin()) {
 			if ( ! TOUCHPOINT_COMPOSER_ENABLED) {

From 5bd7eb1ef52a7ae5f5bed6d16c2da72d458b2432 Mon Sep 17 00:00:00 2001
From: "James K." <jkurtz@tenth.org>
Date: Wed, 8 Apr 2026 22:56:18 -0400
Subject: [PATCH 395/423] Update .github/workflows/releases.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/releases.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 67751958..ac753180 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -45,10 +45,27 @@ jobs:
   docs:
     name: Update Documentation
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          tools: composer
+
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --prefer-dist
+        shell: bash
+
+      - name: Configure git identity
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        shell: bash
       - name: Generate Docs
         run: php ./generateDocs.php
         shell: bash
\ No newline at end of file

From fc99a63fa86ddb39aabee0a0e8b9c91251d750b8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 8 Apr 2026 23:39:59 -0400
Subject: [PATCH 396/423] Code review

---
 blocks/inv-list/index.js                    |  2 +-
 buildPipeline/versionUpdate.js              |  2 +-
 i18n/TouchPoint-WP-es_ES.po                 |  4 +--
 src/TouchPoint-WP/Partner.php               |  4 +--
 src/TouchPoint-WP/PostTypeCapable.php       |  2 +-
 src/TouchPoint-WP/Settings.php              |  4 +--
 src/TouchPoint-WP/Stats.php                 |  4 +--
 src/TouchPoint-WP/StatusWidget.php          | 27 +++++++++------------
 src/TouchPoint-WP/Taxonomies.php            | 25 +++++++------------
 src/TouchPoint-WP/Utilities/DateFormats.php | 17 +++++++++++++
 10 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index 8c65be51..fb16cc7c 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -3,7 +3,7 @@
  */
 import metadata from './block.json';
 import {__} from "@wordpress/i18n";
-import { generateUniqueId } from '../common';
+import { generateUniqueId } from '../common.js';
 
 /**
  * Every block starts by registering a new block type definition.
diff --git a/buildPipeline/versionUpdate.js b/buildPipeline/versionUpdate.js
index ab82b6f2..7ec139b8 100644
--- a/buildPipeline/versionUpdate.js
+++ b/buildPipeline/versionUpdate.js
@@ -24,7 +24,7 @@ blockFiles.forEach((blockFile) => {
     const blockAssetPath = `./blocks/${blockFile}/block.asset.php`;
     if (fs.existsSync(blockAssetPath)) {
         let blockAssetContent = fs.readFileSync(blockAssetPath, 'utf8');
-        blockAssetContent.replaceAll("\"VERSION\"", `"${version}"`);
+        blockAssetContent = blockAssetContent.replaceAll("\"VERSION\"", `"${version}"`);
         fs.writeFileSync(blockAssetPath, blockAssetContent);
     }
 });
\ No newline at end of file
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 5a8af191..649b130b 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -497,7 +497,7 @@ msgid "Extra Values to Import"
 msgstr "Valor Adicional para importar"
 
 #: src/TouchPoint-WP/Settings.php:569
-msgid "Import People Extra Value fields as User Meta data."
+msgid "Import People Extra Value fields as User Metadata."
 msgstr "Importe campos de valor extra de personas como metadatos de usuario."
 
 #: src/TouchPoint-WP/Settings.php:585
@@ -650,7 +650,7 @@ msgid "Designate a text Family Extra Value that will contain the partner's locat
 msgstr "Designe un Valor Adicional Familiar de texto que contendrá la ubicación del socio, como desea que se enumere públicamente. Para los socios que tienen DecoupleLocation habilitado, este campo se asociará con el punto del mapa, no con la entrada de la lista."
 
 #: src/TouchPoint-WP/Settings.php:807
-msgid "Import Family Extra Value fields as Meta data on the partner's post"
+msgid "Import Family Extra Value fields as Metadata on the partner's post"
 msgstr "Importe campos de Valor Adicional Familiar como Metadatos en la publicación del socio"
 
 #: src/TouchPoint-WP/Settings.php:818
diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 1b9b2cf4..55ed3915 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -543,8 +543,8 @@ public static function updateFromTouchPoint(bool $verbose = false)
 			$count++;
 		}
 
-		// Delete terms that are no longer used
-		if (TouchPointWP::instance()->settings->global_primary_tax !== "") {
+		// Delete terms that are no longer used.
+		if (TouchPointWP::instance()->settings->global_primary_tax !== "" && !empty($termsToKeep)) {
 			$terms = get_terms(
 				['taxonomy' => Taxonomies::TAX_GP_CATEGORY, 'hide_empty' => false, 'exclude' => $termsToKeep]
 			);
diff --git a/src/TouchPoint-WP/PostTypeCapable.php b/src/TouchPoint-WP/PostTypeCapable.php
index b66296c9..d5074aab 100644
--- a/src/TouchPoint-WP/PostTypeCapable.php
+++ b/src/TouchPoint-WP/PostTypeCapable.php
@@ -75,7 +75,7 @@ public static function fromPost(WP_Post $post): ?self
 	 */
 	public function permalink(): string
 	{
-		return get_permalink($this->post);
+		return get_permalink($this->post_id);
 	}
 
 	/**
diff --git a/src/TouchPoint-WP/Settings.php b/src/TouchPoint-WP/Settings.php
index 6fecfa6e..8b8cbaad 100644
--- a/src/TouchPoint-WP/Settings.php
+++ b/src/TouchPoint-WP/Settings.php
@@ -567,7 +567,7 @@ private function settingsFields(bool $withStrings, bool|string $includeDetail =
 						'id'          => 'people_ev_custom',
 						'label'       => $this->__('Extra Values to Import', 'TouchPoint-WP'),
 						'description' => $this->__(
-							'Import People Extra Value fields as User Meta data.',
+							'Import People Extra Value fields as User Metadata.',
 							'TouchPoint-WP'
 						),
 						'type'        => 'checkbox_multi',
@@ -805,7 +805,7 @@ private function settingsFields(bool $withStrings, bool|string $includeDetail =
 						'id'          => 'global_fev_custom',
 						'label'       => $this->__('Extra Values to Import', 'TouchPoint-WP'),
 						'description' => $this->__(
-							'Import Family Extra Value fields as Meta data on the partner\'s post',
+							'Import Family Extra Value fields as Metadata on the partner\'s post',
 							'TouchPoint-WP'
 						),
 						'type'        => 'checkbox_multi',
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index c3daa026..10df608f 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -290,7 +290,8 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 	/**
 	 * Submit stats to Tenth.
 	 *
-	 * @param bool $blocking If true, will wait for the response from the server before returning and the method will print a status.
+	 * @param bool $blocking If true, will wait for the response from the server before returning and the method will
+	 * print a status.  If false, no status prints.
 	 *
 	 * @return void
 	 */
@@ -339,7 +340,6 @@ protected function submitStats(bool $blocking = false): void
 					echo "ok";
 				}
 			}
-
 		}
 	}
 
diff --git a/src/TouchPoint-WP/StatusWidget.php b/src/TouchPoint-WP/StatusWidget.php
index d7e5ae49..bf260c27 100644
--- a/src/TouchPoint-WP/StatusWidget.php
+++ b/src/TouchPoint-WP/StatusWidget.php
@@ -56,24 +56,19 @@ protected static function timestampToFormatted(mixed $timestamp): string
 			try {
 				$timestamp = new DateTime($timestamp, wp_timezone());
 			} catch (Exception) {
-				return 'Never';
+				return esc_html__('Never', "TouchPoint-WP");
 			}
 		} else {
 			try {
 				$timestamp = new DateTime('@' . $timestamp, Utilities::utcTimeZone());
 
 			} catch (Exception) {
-				return 'Never';
+				return esc_html__('Never', "TouchPoint-WP");
 			}
 		}
 		$timestamp->setTimezone(wp_timezone());
 
-		return wp_sprintf(
-			// translators: %1$s is the date(s), %2$s is the time(s).
-			__('%1$s at %2$s', 'TouchPoint-WP'),
-			DateFormats::DateStringFormattedShort($timestamp),
-			DateFormats::TimeStringFormatted($timestamp)
-		);
+		return esc_html(DateFormats::DateAndTimeStringFormatted($timestamp));
 	}
 
 	/**
@@ -95,15 +90,15 @@ public static function render(): void
 
 		echo "<tr><td></td>";
 
-		echo "<th>" . __("Imported", "TouchPoint-WP") . "</th>";
-		echo "<th>" . __("Last Updated", "TouchPoint-WP") . "</th></tr>";
+		echo "<th>" . esc_html__("Imported", "TouchPoint-WP") . "</th>";
+		echo "<th>" . esc_html__("Last Updated", "TouchPoint-WP") . "</th></tr>";
 
-		$label = __("People", "TouchPoint-WP");
+		$label = esc_html__("People", "TouchPoint-WP");
 		$ts = self::timestampToFormatted($settings->person_cron_last_run);
 		echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->people</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 		if ($settings->enable_involvements === "on") {
-			$label = __('Involvements', 'TouchPoint-WP');
+			$label = esc_html__('Involvements', 'TouchPoint-WP');
 			$ts = self::timestampToFormatted($settings->inv_cron_last_run);
 			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->involvementPosts</td><td style=\"text-align:center;\">$ts</td></tr>";
 
@@ -115,26 +110,26 @@ public static function render(): void
 		}
 
 		if ($settings->enable_meeting_cal === "on") {
-			$label = __('Meetings', 'TouchPoint-WP');
+			$label = esc_html__('Meetings', 'TouchPoint-WP');
 			// TODO replace timestamp with event-type timestamp
 			$ts = self::timestampToFormatted($settings->inv_cron_last_run);
 			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->meetings</td><td style=\"text-align:center;\">$ts</td></tr>";
 		}
 
 		if ($settings->enable_global === "on") {
-			$label = __('Partners', 'TouchPoint-WP');
+			$label = esc_html__('Partners', 'TouchPoint-WP');
 			$ts = self::timestampToFormatted($settings->global_cron_last_run);
 			echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$stats->partnerPosts</td><td style=\"text-align:center;\">$ts</td></tr>";
 		}
 
-		$label = __('Reports', 'TouchPoint-WP');
+		$label = esc_html__('Reports', 'TouchPoint-WP');
 		$ts = self::timestampToFormatted($reportData->ts);
 		echo "<tr><th style=\"text-align:left;\">$label</th><td style=\"text-align:center;\">$reportData->cnt</td><td style=\"text-align:center;\">$ts</td></tr>";
 
 		echo "</table>";
 
 		// Translators: %s is the current version number.
-		$label = __("Version: %s", "TouchPoint-WP");
+		$label = esc_html__("Version: %s", "TouchPoint-WP");
 		$label = wp_sprintf($label, TouchPointWP::VERSION);
 		echo "<div style=\"text-align: right;\">$label</div>";
 
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 6fe6e212..6604d3be 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -45,8 +45,8 @@ abstract class Taxonomies
 	protected static function getLabels(string $singular, string $plural): array
 	{
 		return [
-			'name'          => $singular,
-			'singular_name' => $plural,
+			'name'          => $plural,
+			'singular_name' => $singular,
 			/* translators: %s: taxonomy name, plural */
 			'search_items'  => sprintf(__('Search %s', 'TouchPoint-WP'), $plural),
 			/* translators: %s: taxonomy name, plural */
@@ -226,27 +226,20 @@ public static function getTermsClauses($clauses, $taxonomy, $args): array
 		if (isset($args[TouchPointWP::HOOK_PREFIX . 'post_type']) && ! empty($args[TouchPointWP::HOOK_PREFIX . 'post_type']) && $args['fields'] !== 'count') {
 			global $wpdb;
 
-			$post_types = [];
-
-			if (is_array($args[TouchPointWP::HOOK_PREFIX . 'post_type'])) {
-				foreach ($args[TouchPointWP::HOOK_PREFIX . 'post_type'] as $cpt) {
-					$post_types[] = "'" . $cpt . "'";
-				}
-			} else {
-				$post_types[] = "'" . $args[TouchPointWP::HOOK_PREFIX . 'post_type'] . "'";
-			}
+			$post_types = is_array($args[TouchPointWP::HOOK_PREFIX . 'post_type'])
+				? array_values($args[TouchPointWP::HOOK_PREFIX . 'post_type'])
+				: [$args[TouchPointWP::HOOK_PREFIX . 'post_type']];
 
 			if ( ! empty($post_types)) {
+				$placeholders = implode(', ', array_fill(0, count($post_types), '%s'));
+				$post_types_in_clause = $wpdb->prepare($placeholders, $post_types);
 				$clauses['fields'] = 'DISTINCT ' . str_replace(
 						'tt.*',
 						'tt.term_taxonomy_id, tt.taxonomy, tt.description, tt.parent',
 						$clauses['fields']
 					) . ', COUNT(p.post_type) AS count';
 				$clauses['join'] .= ' LEFT JOIN ' . $wpdb->term_relationships . ' AS r ON r.term_taxonomy_id = tt.term_taxonomy_id LEFT JOIN ' . $wpdb->posts . ' AS p ON p.ID = r.object_id';
-				$clauses['where'] .= ' AND (p.post_type IN (' . implode(
-						',',
-						$post_types
-					) . ') OR (tt.parent = 0 AND tt.count = 0))';
+				$clauses['where'] .= ' AND (p.post_type IN (' . $post_types_in_clause . ') OR (tt.parent = 0 AND tt.count = 0))';
 				$clauses['orderby'] = 'GROUP BY t.term_id ' . $clauses['orderby'];
 			}
 		}
@@ -911,7 +904,7 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 
 		// Global Partner Category
 		$types = self::getPostTypesForTaxonomy($instance, self::TAX_GP_CATEGORY);
-		if ($types > 0) {
+		if (count($types) > 0) {
 			$tax = $instance->settings->global_primary_tax;
 			if ($tax !== "" &&
 			    is_object($tax) &&
diff --git a/src/TouchPoint-WP/Utilities/DateFormats.php b/src/TouchPoint-WP/Utilities/DateFormats.php
index 557ff63e..a7fd615b 100644
--- a/src/TouchPoint-WP/Utilities/DateFormats.php
+++ b/src/TouchPoint-WP/Utilities/DateFormats.php
@@ -13,6 +13,23 @@
  */
 abstract class DateFormats
 {
+	/**
+	 * Get a single string for a single given DateTime containing both the date and the time.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return string
+	 */
+	public static function DateAndTimeStringFormatted(DateTimeInterface $dt): string
+	{
+		return wp_sprintf(
+		// translators: %1$s is the date(s), %2$s is the time(s).
+			__('%1$s at %2$s', 'TouchPoint-WP'),
+			DateFormats::DateStringFormattedShort($dt),
+			DateFormats::TimeStringFormatted($dt)
+		);
+	}
+
 	/**
 	 * Get a string for a single given DateTime.
 	 *

From 75f53d59439676a38b9f2a6d6c8b2639166e895e Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 9 Apr 2026 22:49:35 -0400
Subject: [PATCH 397/423] Make it easier to tell when redirections are due to
 tpwp.

---
 src/TouchPoint-WP/Auth.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index e8c12461..418a820b 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -270,6 +270,7 @@ public static function preventAdminAccessMaybe(): void
 		$destination = apply_filters('tp_admin_area_redirect', $destination);
 
 		if ($destination) {
+			header("X-Redirected-By: TouchPoint-WP");
 			wp_redirect($destination, Http::SEE_OTHER_TEMP);
 			exit;
 		}

From 08d12192ab7408f18f5f361b6045541cc4cec45c Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 9 Apr 2026 22:51:38 -0400
Subject: [PATCH 398/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 139 +++++++++++++++++-----------------
 i18n/TouchPoint-WP.pot      | 145 +++++++++++++++++++-----------------
 2 files changed, 147 insertions(+), 137 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 649b130b..d8389d1b 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -125,13 +125,13 @@ msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:252
 #: src/TouchPoint-WP/Involvement.php:1929
-#: src/TouchPoint-WP/Taxonomies.php:755
+#: src/TouchPoint-WP/Taxonomies.php:748
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:256
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Taxonomies.php:821
+#: src/TouchPoint-WP/Taxonomies.php:814
 msgid "Time of Day"
 msgstr "Hora del día"
 
@@ -140,7 +140,7 @@ msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
 #: src/templates/admin/invKoForm.php:264
-#: src/TouchPoint-WP/Taxonomies.php:854
+#: src/TouchPoint-WP/Taxonomies.php:847
 msgid "Age Group"
 msgstr "Grupo de edad"
 
@@ -185,8 +185,8 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#: src/TouchPoint-WP/Auth.php:403
-#: src/TouchPoint-WP/Auth.php:411
+#: src/TouchPoint-WP/Auth.php:404
+#: src/TouchPoint-WP/Auth.php:412
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
@@ -329,15 +329,15 @@ msgid "Current Value"
 msgstr "Valor actual"
 
 #: src/TouchPoint-WP/Api.php:107
-#: src/TouchPoint-WP/Api.php:188
-#: src/TouchPoint-WP/Api.php:450
-#: src/TouchPoint-WP/Api.php:584
+#: src/TouchPoint-WP/Api.php:182
+#: src/TouchPoint-WP/Api.php:444
+#: src/TouchPoint-WP/Api.php:578
 msgid "Invalid or incomplete API Settings."
 msgstr "Configuración de API no válida o incompleta."
 
-#: src/TouchPoint-WP/Api.php:204
-#: src/TouchPoint-WP/Api.php:251
-#: src/TouchPoint-WP/Api.php:526
+#: src/TouchPoint-WP/Api.php:198
+#: src/TouchPoint-WP/Api.php:245
+#: src/TouchPoint-WP/Api.php:520
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
@@ -459,7 +459,7 @@ msgid "Upload the package to {tpName} here"
 msgstr "Sube el paquete a {tpName} aquí"
 
 #: src/TouchPoint-WP/Settings.php:529
-#: src/TouchPoint-WP/StatusWidget.php:101
+#: src/TouchPoint-WP/StatusWidget.php:96
 msgid "People"
 msgstr "Gente"
 
@@ -541,7 +541,7 @@ msgid "By enabling this option, users who can't edit anything won't see the Admi
 msgstr "Al habilitar esta opción, los usuarios que no pueden editar nada no verán la barra de administración."
 
 #: src/TouchPoint-WP/Settings.php:642
-#: src/TouchPoint-WP/StatusWidget.php:106
+#: src/TouchPoint-WP/StatusWidget.php:101
 msgid "Involvements"
 msgstr "Involucramientos"
 
@@ -968,7 +968,7 @@ msgstr "Enviar"
 msgid "Nothing to submit."
 msgstr "Nada que enviar."
 
-#: src/TouchPoint-WP/Api.php:656
+#: src/TouchPoint-WP/Api.php:650
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr "Los scripts en TouchPoint que interactúan con este complemento están desactualizados y falló una actualización automática."
 
@@ -1029,7 +1029,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: src/TouchPoint-WP/Involvement.php:1977
-#: src/TouchPoint-WP/Taxonomies.php:890
+#: src/TouchPoint-WP/Taxonomies.php:883
 msgid "Marital Status"
 msgstr "Estado civil"
 
@@ -1227,9 +1227,9 @@ msgstr "restablecer el mapa"
 #: src/TouchPoint-WP/Involvement.php:1061
 #: src/TouchPoint-WP/Involvement.php:1154
 #: src/TouchPoint-WP/Involvement.php:1178
-#: src/TouchPoint-WP/StatusWidget.php:73
-#: src/TouchPoint-WP/Utilities/DateFormats.php:288
-#: src/TouchPoint-WP/Utilities/DateFormats.php:352
+#: src/TouchPoint-WP/Utilities/DateFormats.php:27
+#: src/TouchPoint-WP/Utilities/DateFormats.php:305
+#: src/TouchPoint-WP/Utilities/DateFormats.php:369
 #, php-format
 msgid "%1$s at %2$s"
 msgstr "%1$s a las %2$s"
@@ -1326,65 +1326,65 @@ msgstr "Tipo de publicación no válida."
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/Taxonomies.php:651
+#: src/TouchPoint-WP/Taxonomies.php:644
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/Taxonomies.php:684
+#: src/TouchPoint-WP/Taxonomies.php:677
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:719
+#: src/TouchPoint-WP/Taxonomies.php:712
 #, php-format
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/Taxonomies.php:754
+#: src/TouchPoint-WP/Taxonomies.php:747
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:755
+#: src/TouchPoint-WP/Taxonomies.php:748
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/Taxonomies.php:785
+#: src/TouchPoint-WP/Taxonomies.php:778
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/Taxonomies.php:789
+#: src/TouchPoint-WP/Taxonomies.php:782
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/Taxonomies.php:789
+#: src/TouchPoint-WP/Taxonomies.php:782
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/Taxonomies.php:816
+#: src/TouchPoint-WP/Taxonomies.php:809
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:822
+#: src/TouchPoint-WP/Taxonomies.php:815
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/Taxonomies.php:852
+#: src/TouchPoint-WP/Taxonomies.php:845
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/Taxonomies.php:855
+#: src/TouchPoint-WP/Taxonomies.php:848
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/Taxonomies.php:885
+#: src/TouchPoint-WP/Taxonomies.php:878
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/Taxonomies.php:891
+#: src/TouchPoint-WP/Taxonomies.php:884
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:928
+#: src/TouchPoint-WP/Taxonomies.php:921
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1595,18 +1595,18 @@ msgstr "Seleccione los tipos de publicaciones que deberían tener Divisiones dis
 msgid "Select post types which should have Resident Codes available as a native taxonomy."
 msgstr "Seleccione los tipos de publicaciones que deberían tener códigos de residente disponibles como taxonomía nativa."
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:119
-#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+#: src/TouchPoint-WP/Utilities/DateFormats.php:136
+#: src/TouchPoint-WP/Utilities/DateFormats.php:211
 msgid "Tonight"
 msgstr "este noche"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:121
-#: src/TouchPoint-WP/Utilities/DateFormats.php:196
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:213
 msgid "Today"
 msgstr "hoy"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:128
-#: src/TouchPoint-WP/Utilities/DateFormats.php:203
+#: src/TouchPoint-WP/Utilities/DateFormats.php:145
+#: src/TouchPoint-WP/Utilities/DateFormats.php:220
 msgid "Tomorrow"
 msgstr "mañana"
 
@@ -1623,28 +1623,28 @@ msgid "Scheduled"
 msgstr "Programado"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#: src/TouchPoint-WP/Utilities/DateFormats.php:164
 #, php-format
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:153
+#: src/TouchPoint-WP/Utilities/DateFormats.php:170
 #, php-format
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#: src/TouchPoint-WP/Utilities/DateFormats.php:176
 #, php-format
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr "el proximo %1$s %2$s"
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:164
+#: src/TouchPoint-WP/Utilities/DateFormats.php:181
 #, php-format
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
@@ -1682,7 +1682,7 @@ msgstr "Lo que llamas Reuniones en tu iglesia"
 
 #: src/TouchPoint-WP/Settings.php:906
 #: src/TouchPoint-WP/Settings.php:908
-#: src/TouchPoint-WP/StatusWidget.php:118
+#: src/TouchPoint-WP/StatusWidget.php:113
 msgid "Meetings"
 msgstr "Reuniones"
 
@@ -1709,22 +1709,22 @@ msgstr "Reunión"
 msgid "Event"
 msgstr "Evento"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+#: src/TouchPoint-WP/Utilities/DateFormats.php:154
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:155
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr "j F"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:140
+#: src/TouchPoint-WP/Utilities/DateFormats.php:157
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr "l"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:141
+#: src/TouchPoint-WP/Utilities/DateFormats.php:158
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr "j F Y"
@@ -1750,61 +1750,61 @@ msgid "Creating a Meeting object from an object without a post_id is not yet sup
 msgstr "Aún no se admite la creación de un objeto de reunión a partir de un objeto sin post_id."
 
 #. translators: %1$s is the start date/time, %2$s is the end date/time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:89
-#: src/TouchPoint-WP/Utilities/DateFormats.php:331
+#: src/TouchPoint-WP/Utilities/DateFormats.php:106
+#: src/TouchPoint-WP/Utilities/DateFormats.php:348
 #, php-format
 msgid "%1$s &ndash; %2$s"
 msgstr "%1$s &ndash; %2$s"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:211
+#: src/TouchPoint-WP/Utilities/DateFormats.php:228
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:212
+#: src/TouchPoint-WP/Utilities/DateFormats.php:229
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr "j M"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:214
+#: src/TouchPoint-WP/Utilities/DateFormats.php:231
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr "D"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+#: src/TouchPoint-WP/Utilities/DateFormats.php:232
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr "j M Y"
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:364
+#: src/TouchPoint-WP/Utilities/DateFormats.php:381
 #, php-format
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr "%1$s a %2$s &ndash; %3$s a %4$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#: src/TouchPoint-WP/Utilities/DateFormats.php:238
 #, php-format
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr "el pasado %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#: src/TouchPoint-WP/Utilities/DateFormats.php:244
 #, php-format
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr "este %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#: src/TouchPoint-WP/Utilities/DateFormats.php:250
 #, php-format
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr "proximo %1$s %2$s"
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:238
+#: src/TouchPoint-WP/Utilities/DateFormats.php:255
 #, php-format
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
@@ -1896,16 +1896,16 @@ msgstr "(Sin campus)"
 msgid "TouchPoint-WP Status"
 msgstr "Estado de TouchPoint-WP"
 
-#: src/TouchPoint-WP/StatusWidget.php:98
+#: src/TouchPoint-WP/StatusWidget.php:93
 msgid "Imported"
 msgstr "Importadas"
 
-#: src/TouchPoint-WP/StatusWidget.php:99
+#: src/TouchPoint-WP/StatusWidget.php:94
 msgid "Last Updated"
 msgstr "Actualizada"
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:130
-#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+#: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#: src/TouchPoint-WP/Utilities/DateFormats.php:222
 msgid "Yesterday"
 msgstr "Ayer"
 
@@ -1927,7 +1927,7 @@ msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
-#: src/TouchPoint-WP/Auth.php:442
+#: src/TouchPoint-WP/Auth.php:443
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
@@ -2097,16 +2097,16 @@ msgstr "Esta opción le permite filtrar las personas que se muestran en función
 msgid "Expand"
 msgstr "Expandir"
 
-#: src/TouchPoint-WP/StatusWidget.php:125
+#: src/TouchPoint-WP/StatusWidget.php:120
 msgid "Partners"
 msgstr "Misioneros"
 
-#: src/TouchPoint-WP/StatusWidget.php:130
+#: src/TouchPoint-WP/StatusWidget.php:125
 msgid "Reports"
 msgstr "Informes"
 
 #. Translators: %s is the current version number.
-#: src/TouchPoint-WP/StatusWidget.php:137
+#: src/TouchPoint-WP/StatusWidget.php:132
 #, php-format
 msgid "Version: %s"
 msgstr "versión: %s"
@@ -2116,3 +2116,8 @@ msgstr "versión: %s"
 #, php-format
 msgid "Profile in %s"
 msgstr "Perfil en %s"
+
+#: src/TouchPoint-WP/StatusWidget.php:59
+#: src/TouchPoint-WP/StatusWidget.php:66
+msgid "Never"
+msgstr "nunca"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index a4234883..30bed946 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-09T02:32:47+00:00\n"
+"POT-Creation-Date: 2026-04-10T02:50:48+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -218,13 +218,13 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:252
 #: src/TouchPoint-WP/Involvement.php:1929
-#: src/TouchPoint-WP/Taxonomies.php:755
+#: src/TouchPoint-WP/Taxonomies.php:748
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:256
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Taxonomies.php:821
+#: src/TouchPoint-WP/Taxonomies.php:814
 msgid "Time of Day"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgid "Prevailing Marital Status"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:264
-#: src/TouchPoint-WP/Taxonomies.php:854
+#: src/TouchPoint-WP/Taxonomies.php:847
 msgid "Age Group"
 msgstr ""
 
@@ -345,19 +345,19 @@ msgid "%2.1fmi"
 msgstr ""
 
 #: src/TouchPoint-WP/Api.php:107
-#: src/TouchPoint-WP/Api.php:188
-#: src/TouchPoint-WP/Api.php:450
-#: src/TouchPoint-WP/Api.php:584
+#: src/TouchPoint-WP/Api.php:182
+#: src/TouchPoint-WP/Api.php:444
+#: src/TouchPoint-WP/Api.php:578
 msgid "Invalid or incomplete API Settings."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:204
-#: src/TouchPoint-WP/Api.php:251
-#: src/TouchPoint-WP/Api.php:526
+#: src/TouchPoint-WP/Api.php:198
+#: src/TouchPoint-WP/Api.php:245
+#: src/TouchPoint-WP/Api.php:520
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr ""
 
-#: src/TouchPoint-WP/Api.php:656
+#: src/TouchPoint-WP/Api.php:650
 msgid "The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed."
 msgstr ""
 
@@ -367,12 +367,12 @@ msgstr ""
 msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:403
-#: src/TouchPoint-WP/Auth.php:411
+#: src/TouchPoint-WP/Auth.php:404
+#: src/TouchPoint-WP/Auth.php:412
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:442
+#: src/TouchPoint-WP/Auth.php:443
 msgid "No user account found."
 msgstr ""
 
@@ -422,9 +422,9 @@ msgstr ""
 #: src/TouchPoint-WP/Involvement.php:1061
 #: src/TouchPoint-WP/Involvement.php:1154
 #: src/TouchPoint-WP/Involvement.php:1178
-#: src/TouchPoint-WP/StatusWidget.php:73
-#: src/TouchPoint-WP/Utilities/DateFormats.php:288
-#: src/TouchPoint-WP/Utilities/DateFormats.php:352
+#: src/TouchPoint-WP/Utilities/DateFormats.php:27
+#: src/TouchPoint-WP/Utilities/DateFormats.php:305
+#: src/TouchPoint-WP/Utilities/DateFormats.php:369
 #, php-format
 msgid "%1$s at %2$s"
 msgstr ""
@@ -496,7 +496,7 @@ msgid "Language"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1977
-#: src/TouchPoint-WP/Taxonomies.php:890
+#: src/TouchPoint-WP/Taxonomies.php:883
 msgid "Marital Status"
 msgstr ""
 
@@ -890,7 +890,7 @@ msgid "Upload the package to {tpName} here"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:529
-#: src/TouchPoint-WP/StatusWidget.php:101
+#: src/TouchPoint-WP/StatusWidget.php:96
 msgid "People"
 msgstr ""
 
@@ -928,7 +928,7 @@ msgid "Extra Values to Import"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:569
-msgid "Import People Extra Value fields as User Meta data."
+msgid "Import People Extra Value fields as User Metadata."
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:585
@@ -980,7 +980,7 @@ msgid "By enabling this option, users who can't edit anything won't see the Admi
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:642
-#: src/TouchPoint-WP/StatusWidget.php:106
+#: src/TouchPoint-WP/StatusWidget.php:101
 msgid "Involvements"
 msgstr ""
 
@@ -1089,7 +1089,7 @@ msgid "Designate a text Family Extra Value that will contain the partner's locat
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:807
-msgid "Import Family Extra Value fields as Meta data on the partner's post"
+msgid "Import Family Extra Value fields as Metadata on the partner's post"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:818
@@ -1162,7 +1162,7 @@ msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:906
 #: src/TouchPoint-WP/Settings.php:908
-#: src/TouchPoint-WP/StatusWidget.php:118
+#: src/TouchPoint-WP/StatusWidget.php:113
 msgid "Meetings"
 msgstr ""
 
@@ -1374,24 +1374,29 @@ msgstr ""
 msgid "TouchPoint-WP Status"
 msgstr ""
 
-#: src/TouchPoint-WP/StatusWidget.php:98
+#: src/TouchPoint-WP/StatusWidget.php:59
+#: src/TouchPoint-WP/StatusWidget.php:66
+msgid "Never"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:93
 msgid "Imported"
 msgstr ""
 
-#: src/TouchPoint-WP/StatusWidget.php:99
+#: src/TouchPoint-WP/StatusWidget.php:94
 msgid "Last Updated"
 msgstr ""
 
-#: src/TouchPoint-WP/StatusWidget.php:125
+#: src/TouchPoint-WP/StatusWidget.php:120
 msgid "Partners"
 msgstr ""
 
-#: src/TouchPoint-WP/StatusWidget.php:130
+#: src/TouchPoint-WP/StatusWidget.php:125
 msgid "Reports"
 msgstr ""
 
 #. Translators: %s is the current version number.
-#: src/TouchPoint-WP/StatusWidget.php:137
+#: src/TouchPoint-WP/StatusWidget.php:132
 #, php-format
 msgid "Version: %s"
 msgstr ""
@@ -1432,65 +1437,65 @@ msgstr ""
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:651
+#: src/TouchPoint-WP/Taxonomies.php:644
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:684
+#: src/TouchPoint-WP/Taxonomies.php:677
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:719
+#: src/TouchPoint-WP/Taxonomies.php:712
 #, php-format
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:754
+#: src/TouchPoint-WP/Taxonomies.php:747
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:755
+#: src/TouchPoint-WP/Taxonomies.php:748
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:785
+#: src/TouchPoint-WP/Taxonomies.php:778
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:789
+#: src/TouchPoint-WP/Taxonomies.php:782
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:789
+#: src/TouchPoint-WP/Taxonomies.php:782
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:816
+#: src/TouchPoint-WP/Taxonomies.php:809
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:822
+#: src/TouchPoint-WP/Taxonomies.php:815
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:852
+#: src/TouchPoint-WP/Taxonomies.php:845
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:855
+#: src/TouchPoint-WP/Taxonomies.php:848
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:885
+#: src/TouchPoint-WP/Taxonomies.php:878
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:891
+#: src/TouchPoint-WP/Taxonomies.php:884
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:928
+#: src/TouchPoint-WP/Taxonomies.php:921
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
@@ -1672,130 +1677,130 @@ msgid "Expand"
 msgstr ""
 
 #. translators: %1$s is the start date/time, %2$s is the end date/time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:89
-#: src/TouchPoint-WP/Utilities/DateFormats.php:331
+#: src/TouchPoint-WP/Utilities/DateFormats.php:106
+#: src/TouchPoint-WP/Utilities/DateFormats.php:348
 #, php-format
 msgid "%1$s &ndash; %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:119
-#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+#: src/TouchPoint-WP/Utilities/DateFormats.php:136
+#: src/TouchPoint-WP/Utilities/DateFormats.php:211
 msgid "Tonight"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:121
-#: src/TouchPoint-WP/Utilities/DateFormats.php:196
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:213
 msgid "Today"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:128
-#: src/TouchPoint-WP/Utilities/DateFormats.php:203
+#: src/TouchPoint-WP/Utilities/DateFormats.php:145
+#: src/TouchPoint-WP/Utilities/DateFormats.php:220
 msgid "Tomorrow"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:130
-#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+#: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#: src/TouchPoint-WP/Utilities/DateFormats.php:222
 msgid "Yesterday"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+#: src/TouchPoint-WP/Utilities/DateFormats.php:154
 msgctxt "Date string for day of the week, when the year is current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+#: src/TouchPoint-WP/Utilities/DateFormats.php:155
 msgctxt "Date string when the year is current."
 msgid "F j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:140
+#: src/TouchPoint-WP/Utilities/DateFormats.php:157
 msgctxt "Date string for day of the week, when the year is not current."
 msgid "l"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:141
+#: src/TouchPoint-WP/Utilities/DateFormats.php:158
 msgctxt "Date string when the year is not current."
 msgid "F j, Y"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#: src/TouchPoint-WP/Utilities/DateFormats.php:164
 #, php-format
 msgctxt "Date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:153
+#: src/TouchPoint-WP/Utilities/DateFormats.php:170
 #, php-format
 msgctxt "Date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#: src/TouchPoint-WP/Utilities/DateFormats.php:176
 #, php-format
 msgctxt "Date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Monday".  %2$s is "January 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:164
+#: src/TouchPoint-WP/Utilities/DateFormats.php:181
 #, php-format
 msgctxt "Date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:211
+#: src/TouchPoint-WP/Utilities/DateFormats.php:228
 msgctxt "Short date string for day of the week, when the year is current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:212
+#: src/TouchPoint-WP/Utilities/DateFormats.php:229
 msgctxt "Short date string when the year is current."
 msgid "M j"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:214
+#: src/TouchPoint-WP/Utilities/DateFormats.php:231
 msgctxt "Short date string for day of the week, when the year is not current."
 msgid "D"
 msgstr ""
 
-#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+#: src/TouchPoint-WP/Utilities/DateFormats.php:232
 msgctxt "Short date string when the year is not current."
 msgid "M j, Y"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#: src/TouchPoint-WP/Utilities/DateFormats.php:238
 #, php-format
 msgctxt "Short date format string"
 msgid "Last %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#: src/TouchPoint-WP/Utilities/DateFormats.php:244
 #, php-format
 msgctxt "Short date format string"
 msgid "This %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#: src/TouchPoint-WP/Utilities/DateFormats.php:250
 #, php-format
 msgctxt "Short date format string"
 msgid "Next %1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is "Mon".  %2$s is "Jan 1".
-#: src/TouchPoint-WP/Utilities/DateFormats.php:238
+#: src/TouchPoint-WP/Utilities/DateFormats.php:255
 #, php-format
 msgctxt "Short date format string"
 msgid "%1$s, %2$s"
 msgstr ""
 
 #. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
-#: src/TouchPoint-WP/Utilities/DateFormats.php:364
+#: src/TouchPoint-WP/Utilities/DateFormats.php:381
 #, php-format
 msgid "%1$s at %2$s &ndash; %3$s at %4$s"
 msgstr ""

From a512f6abff5776a9d1ec9939ef5d2d4e548ffb21 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 10 Apr 2026 00:08:28 -0400
Subject: [PATCH 399/423] FINALLY fixed partner taxonomy

---
 src/TouchPoint-WP/Partner.php    | 2 +-
 src/TouchPoint-WP/Taxonomies.php | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 55ed3915..54dbff48 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -419,7 +419,7 @@ public static function updateFromTouchPoint(bool $verbose = false)
 			$post->post_content = self::getFamEvAsContent($descriptionEv, $f, '');
 
 			// Excerpt / Summary
-			$post->post_excerpt = self::getFamEvAsContent($summaryEv, $f, null);
+			$post->post_excerpt = self::getFamEvAsContent($summaryEv, $f, '');
 
 			// Partner Category  This can't be moved to Taxonomy class because values aren't known.
 			if ($categoryEv !== '') {
diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 6604d3be..08f8614a 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -613,8 +613,7 @@ protected static function getPostTypesForTaxonomy(TouchPointWP $instance, string
 				return $types;
 
 			case self::TAX_GP_CATEGORY:
-				if ($instance->settings->enable_involvements === "on"
-				    && class_exists('\tp\TouchPointWP\Partner', false)) {
+				if ($instance->settings->enable_global === "on") {
 					return [\tp\TouchPointWP\Partner::POST_TYPE];
 				}
 
@@ -907,7 +906,6 @@ public static function registerTaxonomies(TouchPointWP $instance): void
 		if (count($types) > 0) {
 			$tax = $instance->settings->global_primary_tax;
 			if ($tax !== "" &&
-			    is_object($tax) &&
 			    $instance->settings->enable_global === "on" &&
 			    count($instance->getFamilyEvFields([$tax])) > 0) {
 				$tax    = $instance->getFamilyEvFields([$tax])[0];

From 557d7b679c8023c875b51e17808054bc7c09db53 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Fri, 10 Apr 2026 00:08:45 -0400
Subject: [PATCH 400/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 38 +++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 40 ++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index d8389d1b..9edb7250 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -125,13 +125,13 @@ msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:252
 #: src/TouchPoint-WP/Involvement.php:1929
-#: src/TouchPoint-WP/Taxonomies.php:748
+#: src/TouchPoint-WP/Taxonomies.php:747
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:256
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Taxonomies.php:814
+#: src/TouchPoint-WP/Taxonomies.php:813
 msgid "Time of Day"
 msgstr "Hora del día"
 
@@ -140,7 +140,7 @@ msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
 #: src/templates/admin/invKoForm.php:264
-#: src/TouchPoint-WP/Taxonomies.php:847
+#: src/TouchPoint-WP/Taxonomies.php:846
 msgid "Age Group"
 msgstr "Grupo de edad"
 
@@ -1029,7 +1029,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: src/TouchPoint-WP/Involvement.php:1977
-#: src/TouchPoint-WP/Taxonomies.php:883
+#: src/TouchPoint-WP/Taxonomies.php:882
 msgid "Marital Status"
 msgstr "Estado civil"
 
@@ -1326,65 +1326,65 @@ msgstr "Tipo de publicación no válida."
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/Taxonomies.php:644
+#: src/TouchPoint-WP/Taxonomies.php:643
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/Taxonomies.php:677
+#: src/TouchPoint-WP/Taxonomies.php:676
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:712
+#: src/TouchPoint-WP/Taxonomies.php:711
 #, php-format
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/Taxonomies.php:747
+#: src/TouchPoint-WP/Taxonomies.php:746
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:748
+#: src/TouchPoint-WP/Taxonomies.php:747
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/Taxonomies.php:778
+#: src/TouchPoint-WP/Taxonomies.php:777
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/Taxonomies.php:782
+#: src/TouchPoint-WP/Taxonomies.php:781
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/Taxonomies.php:782
+#: src/TouchPoint-WP/Taxonomies.php:781
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/Taxonomies.php:809
+#: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:815
+#: src/TouchPoint-WP/Taxonomies.php:814
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/Taxonomies.php:845
+#: src/TouchPoint-WP/Taxonomies.php:844
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/Taxonomies.php:848
+#: src/TouchPoint-WP/Taxonomies.php:847
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/Taxonomies.php:878
+#: src/TouchPoint-WP/Taxonomies.php:877
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/Taxonomies.php:884
+#: src/TouchPoint-WP/Taxonomies.php:883
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:921
+#: src/TouchPoint-WP/Taxonomies.php:919
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index 30bed946..d855db59 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-10T02:50:48+00:00\n"
+"POT-Creation-Date: 2026-04-10T04:08:37+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -218,13 +218,13 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:252
 #: src/TouchPoint-WP/Involvement.php:1929
-#: src/TouchPoint-WP/Taxonomies.php:748
+#: src/TouchPoint-WP/Taxonomies.php:747
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:256
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Taxonomies.php:814
+#: src/TouchPoint-WP/Taxonomies.php:813
 msgid "Time of Day"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgid "Prevailing Marital Status"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:264
-#: src/TouchPoint-WP/Taxonomies.php:847
+#: src/TouchPoint-WP/Taxonomies.php:846
 msgid "Age Group"
 msgstr ""
 
@@ -496,7 +496,7 @@ msgid "Language"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1977
-#: src/TouchPoint-WP/Taxonomies.php:883
+#: src/TouchPoint-WP/Taxonomies.php:882
 msgid "Marital Status"
 msgstr ""
 
@@ -1437,65 +1437,65 @@ msgstr ""
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:644
+#: src/TouchPoint-WP/Taxonomies.php:643
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:677
+#: src/TouchPoint-WP/Taxonomies.php:676
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:712
+#: src/TouchPoint-WP/Taxonomies.php:711
 #, php-format
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:747
+#: src/TouchPoint-WP/Taxonomies.php:746
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:748
+#: src/TouchPoint-WP/Taxonomies.php:747
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:778
+#: src/TouchPoint-WP/Taxonomies.php:777
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:782
+#: src/TouchPoint-WP/Taxonomies.php:781
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:782
+#: src/TouchPoint-WP/Taxonomies.php:781
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:809
+#: src/TouchPoint-WP/Taxonomies.php:808
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:815
+#: src/TouchPoint-WP/Taxonomies.php:814
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:845
+#: src/TouchPoint-WP/Taxonomies.php:844
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:848
+#: src/TouchPoint-WP/Taxonomies.php:847
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:878
+#: src/TouchPoint-WP/Taxonomies.php:877
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:884
+#: src/TouchPoint-WP/Taxonomies.php:883
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:921
+#: src/TouchPoint-WP/Taxonomies.php:919
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 

From e8521738d34312fd39a8088385696224f55744a6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 16 Apr 2026 16:41:45 -0400
Subject: [PATCH 401/423] Adding x-redirected-by header wherever it wasn't
 already

---
 src/TouchPoint-WP/Auth.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 418a820b..fe2fa4c2 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -104,6 +104,7 @@ public static function logout(): void
 				'a' => "logout"
 			]);
 
+			header("X-Redirected-By: TouchPoint-WP");
 			wp_redirect($redir, Http::SEE_OTHER_TEMP);
 			exit;
 		}
@@ -182,6 +183,7 @@ public static function redirectLoginFormMaybe(): void
 		}
 
 		if (self::wantsToLogin() && $redirect && $_SERVER['REQUEST_METHOD'] === "GET") {
+			header("X-Redirected-By: TouchPoint-WP");
 			wp_redirect(self::getLoginUrl(), Http::SEE_OTHER_TEMP);
 			exit();
 		}
@@ -362,6 +364,7 @@ public static function api(array $uri): bool
 		switch (strtolower($uri['path'][2])) {
 			case "login.js":   // Some hosts bypass PHP for js extensions, so this doesn't work.
 			case "login.jsr":
+				header("X-Redirected-By: TouchPoint-WP");
 				wp_redirect(content_url('/plugins/touchpoint-wp/ext/login.js'), Http::SEE_OTHER_TEMP);
 				exit;
 		}

From 912d135b1f3297dc1b7dff65a00d4da82b8079f6 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Thu, 16 Apr 2026 16:49:46 -0400
Subject: [PATCH 402/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po |  8 ++++----
 i18n/TouchPoint-WP.pot      | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 9edb7250..6afc1abe 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -185,8 +185,8 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#: src/TouchPoint-WP/Auth.php:404
-#: src/TouchPoint-WP/Auth.php:412
+#: src/TouchPoint-WP/Auth.php:407
+#: src/TouchPoint-WP/Auth.php:415
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
@@ -1922,12 +1922,12 @@ msgid "Allow the TouchPoint-WP developers to publicly list your site/church as u
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:139
+#: src/TouchPoint-WP/Auth.php:140
 #, php-format
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
-#: src/TouchPoint-WP/Auth.php:443
+#: src/TouchPoint-WP/Auth.php:446
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index d855db59..ec5d9c98 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-10T04:08:37+00:00\n"
+"POT-Creation-Date: 2026-04-16T20:49:25+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -362,17 +362,17 @@ msgid "The scripts on TouchPoint that interact with this plugin are out-of-date,
 msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:139
+#: src/TouchPoint-WP/Auth.php:140
 #, php-format
 msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:404
-#: src/TouchPoint-WP/Auth.php:412
+#: src/TouchPoint-WP/Auth.php:407
+#: src/TouchPoint-WP/Auth.php:415
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:443
+#: src/TouchPoint-WP/Auth.php:446
 msgid "No user account found."
 msgstr ""
 

From fb719ff0e6c9366b2c76fb73105b71d15e64c707 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 13:18:37 -0400
Subject: [PATCH 403/423] code review

---
 build.sh                     |  2 +-
 src/TouchPoint-WP/Auth.php   |  3 ++-
 src/TouchPoint-WP/Report.php |  5 ++++-
 src/TouchPoint-WP/Stats.php  | 18 ++++++++++++------
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 7d5f9ff9..fccac5a5 100644
--- a/build.sh
+++ b/build.sh
@@ -25,7 +25,7 @@ echo "Update version in various json and js files..."
 node ./buildPipeline/versionUpdate.js
 
 echo "Cleaning up old build directory..."
-rm -r build
+rm -rf build
 if [ -f touchpoint-wp.zip ]; then
   rm touchpoint-wp.zip
 fi
diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index fe2fa4c2..93decf4a 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -340,7 +340,8 @@ public static function getProfileUrl(?int $peopleId = null): ?string
 			$userId   = get_current_user_id();
 			$peopleId = (int)(get_user_meta($userId, Person::META_PEOPLEID, true));
 		}
-		if ($peopleId >= 0) {
+		$peopleId = intval($peopleId);
+		if ($peopleId >= 0) {  // 0 is a valid peopleId for the purpose of this URL, but not elsewhere.
 			return $tpwp->host() . '/Person2/' . $peopleId . "#tab-personal";
 		}
 
diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 873fa36d..19e4c23e 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -312,7 +312,7 @@ public static function api(array $uri): bool
 							break;
 
 						default:
-							header("Content-Type: text/plain");
+							header("Content-Type: text/html");
 							break;
 					}
 
@@ -339,6 +339,7 @@ public static function api(array $uri): bool
 						exit;
 					}
 
+					header("Content-Type: text/html");
 					echo $content;
 					exit;
 			}
@@ -411,6 +412,8 @@ public static function reportShortcode(mixed $params = [], string $content = "")
 		}
 
 		if (self::$_indexingMode) {
+			// TODO issue #247 Interrogate if parent post has limited access permissions and follow that through with report to be applied in API versions.
+
 			// It has been added to the index already, so our work here is done.
 			return $content;
 		}
diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index 10df608f..f5da2f7b 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -291,7 +291,7 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 	 * Submit stats to Tenth.
 	 *
 	 * @param bool $blocking If true, will wait for the response from the server before returning and the method will
-	 * print a status.  If false, no status prints.
+	 * print a status.  If false, nothing prints.
 	 *
 	 * @return void
 	 */
@@ -327,7 +327,7 @@ protected function submitStats(bool $blocking = false): void
 			'blocking' => $blocking,
 		]);
 
-		if (!$blocking) {
+		if ($blocking) {
 			if (is_wp_error($r)) {
 				echo "error";
 				error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . $r->get_error_message());
@@ -488,11 +488,17 @@ public static function handleSubmission(): bool
 		$data = array_intersect_key($data, $s->getStatsForSubmission());
 		$data['updatedDT'] = date('Y-m-d H:i:s');
 
-		// upsert the data into the database into the stats table without destructive replace function
+		// Upsert the data into the stats table without treating a no-op update as a failed write.
 		global $wpdb;
-		$r = $wpdb->update($wpdb->prefix . TouchPointWP::TABLE_STATS, $data, ['installId' => $data['installId']]);
-		if ($r < 1) {
-			$r = $wpdb->insert($wpdb->prefix . TouchPointWP::TABLE_STATS, $data);
+		$table = $wpdb->prefix . TouchPointWP::TABLE_STATS;
+		$existingInstallId = $wpdb->get_var($wpdb->prepare(
+			"SELECT installId FROM {$table} WHERE installId = %s LIMIT 1",
+			$data['installId']
+		));
+		if ($existingInstallId !== null) {
+			$r = $wpdb->update($table, $data, ['installId' => $data['installId']]);
+		} else {
+			$r = $wpdb->insert($table, $data);
 		}
 
 		if ($r === false) {

From 7272bea81a4ed1e833182669d16258133efd6796 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 20 Apr 2026 17:24:09 +0000
Subject: [PATCH 404/423] Fix inv-list preview ID stability and remove invalid
 replace callback

Agent-Logs-Url: https://github.com/TenthPres/TouchPoint-WP/sessions/b63a6894-d4ee-4b86-afe7-15ecb5469e2d

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
---
 blocks/inv-list/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index fb16cc7c..541ef06a 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -30,7 +30,8 @@ wp.blocks.registerBlockType( metadata.name, {
 		const { attributes, setAttributes } = props;
 		const { postType, division } = attributes;
 		const blockProps = wp.blockEditor.useBlockProps();
-		const placeholderId = `tp-inv-list-${generateUniqueId()}`;
+		const placeholderIdRef = wp.element.useRef(generateUniqueId());
+		const placeholderId = `tp-inv-list-${placeholderIdRef.current}`;
 
 		// Per-instance refs for controller/lastPath to avoid cross-block collisions like People List
 		const previewControllerRef = wp.element.useRef(null);
@@ -41,8 +42,6 @@ wp.blocks.registerBlockType( metadata.name, {
 		const [postTypeOptions, setPostTypeOptions] = wp.element.useState([]);
 		const [divisionChildren, setDivisionChildren] = wp.element.useState(null);
 
-		props.onReplace(() => updateListContent())
-
 		wp.element.useEffect(() => {
 			(async () => {
 				try {

From 46733f4d8353b9735606a590bb1d546184518bcf Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 20 Apr 2026 17:44:16 +0000
Subject: [PATCH 405/423] Fix block asset URLs to use plugin file path

Agent-Logs-Url: https://github.com/TenthPres/TouchPoint-WP/sessions/d434e2eb-0e19-416c-a50a-71602ee5fc31

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
---
 src/TouchPoint-WP/Blocks/BlocksController.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index 51311e7d..9dd0339f 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -62,6 +62,7 @@ public static function init(): void
 	public static function enqueueBlockAssets(): void
 	{
 		$blocksRoot = TouchPointWP::$dir . '/blocks/';
+		$pluginFile = TouchPointWP::instance()->file;
 		$manifestPath = $blocksRoot . 'blocks-manifest.php';
 
 		if (!file_exists($manifestPath)) {
@@ -71,13 +72,11 @@ public static function enqueueBlockAssets(): void
 		$manifest_data = require $manifestPath;
 
 		foreach ($manifest_data as $block_name => $block_metadata) {
-			$block_dir = $blocksRoot . $block_name;
-
 			if (isset($block_metadata['editorScript'])) {
 				$fileName = substr($block_metadata['editorScript'], 7);
 				wp_enqueue_script(
 					"{$block_name}-editor-script",
-					plugins_url("$block_name/$fileName", $block_dir),
+					plugins_url("blocks/$block_name/$fileName", $pluginFile),
 					['wp-blocks', 'wp-element', 'wp-editor'],
 					TouchPointWP::VERSION
 				);
@@ -87,7 +86,7 @@ public static function enqueueBlockAssets(): void
 				$fileName = substr($block_metadata['editorStyle'], 7);
 				wp_enqueue_style(
 					"{$block_name}-editor-style",
-					plugins_url("$block_name/$fileName", $block_dir),
+					plugins_url("blocks/$block_name/$fileName", $pluginFile),
 					[],
 					TouchPointWP::VERSION
 				);
@@ -97,7 +96,7 @@ public static function enqueueBlockAssets(): void
 				$fileName = substr($block_metadata['style'], 7);
 				wp_enqueue_style(
 					"{$block_name}-style",
-					plugins_url("$block_name/$fileName", $block_dir),
+					plugins_url("blocks/$block_name/$fileName", $pluginFile),
 					[],
 					TouchPointWP::VERSION
 				);
@@ -107,7 +106,7 @@ public static function enqueueBlockAssets(): void
 				$fileName = substr($block_metadata['viewScript'], 7);
 				wp_enqueue_script(
 					"{$block_name}-view-script",
-					plugins_url("$block_name/$fileName", $block_dir),
+					plugins_url("blocks/$block_name/$fileName", $pluginFile),
 					[],
 					TouchPointWP::VERSION
 				);
@@ -155,4 +154,3 @@ public static function api(array $uri): bool
 		return false;
 	}
 }
-

From aa6b3b33f9ca1cccab8b764d62faf484cff460ad Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 15:13:52 -0400
Subject: [PATCH 406/423] code review

---
 src/TouchPoint-WP/Taxonomies.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 08f8614a..378c2d20 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -73,13 +73,13 @@ protected static function getLabels(string $singular, string $plural): array
 	 *
 	 * @return void
 	 */
-	public static function insertTermsForArrayBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+	public static function insertTermsForArrayBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate): void
 	{
 		$existingIds = [];
+		$idUpdate = $forceIdUpdate;
 		foreach ($list as $slug => $name) {
 			// In addition to making sure term exists, make sure it has the correct meta id, too.
 			$term = self::termExists($name, $taxonomy);
-			$idUpdate = $forceIdUpdate;
 			if ( ! $term) {
 				$term = self::insertTerm(
 					$name,
@@ -93,14 +93,16 @@ public static function insertTermsForArrayBasedTaxonomy(array $list, string $tax
 					new TouchPointWP_WPError($term);
 					$term = null;
 				}
-				if ($idUpdate) {
-					TouchPointWP::queueFlushRewriteRules();
-				}
+				$idUpdate = true;
+
 			}
 			if ( ! ! $term) {
 				$existingIds[] = $term['term_id'];
 			}
 		}
+		if ($idUpdate) {
+			TouchPointWP::queueFlushRewriteRules();
+		}
 
 		// Delete any terms that are no longer current.
 		$terms = get_terms(['taxonomy' => $taxonomy, 'hide_empty' => false, 'exclude' => $existingIds]);

From 803e783f49488e9da4a1475d7962db4066e8ffa0 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 15:14:16 -0400
Subject: [PATCH 407/423] allow slashes in involvement slugs

---
 src/templates/admin/locationsKoForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/admin/locationsKoForm.php b/src/templates/admin/locationsKoForm.php
index da355d39..f0f88824 100644
--- a/src/templates/admin/locationsKoForm.php
+++ b/src/templates/admin/locationsKoForm.php
@@ -124,7 +124,7 @@ function initLocationVM() {
                 read: target,
                 write: function(newValue) {
                     let current = target();
-                    newValue = newValue.toLowerCase().replaceAll(/([^a-z0-9]+)+/g, '-')
+                    newValue = newValue.toLowerCase().replaceAll(/([^a-z0-9/]+)+/g, '-')
 
                     //only write if it changed
                     if (newValue !== current) {

From d68b28a23bc5d89c83870f252e0db2563f315dc5 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 15:23:46 -0400
Subject: [PATCH 408/423] allow slashes in involvement slugs

---
 src/templates/admin/invKoForm.php       |  2 +-
 src/templates/admin/locationsKoForm.php | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index e2284cfe..2e70e6c8 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -394,7 +394,7 @@ function initInvVm() {
                 read: target,
                 write: function(newValue) {
                     let current = target();
-                    newValue = newValue.toLowerCase().replaceAll(/([^a-z0-9]+)+/g, '-')
+                    newValue = newValue.toLowerCase().replaceAll(/([^a-z0-9/]+)+/g, '-')
 
                     //only write if it changed
                     if (newValue !== current) {
diff --git a/src/templates/admin/locationsKoForm.php b/src/templates/admin/locationsKoForm.php
index f0f88824..9732041b 100644
--- a/src/templates/admin/locationsKoForm.php
+++ b/src/templates/admin/locationsKoForm.php
@@ -118,27 +118,6 @@ function LocationsVM(locationData) {
     }
 
     function initLocationVM() {
-        // noinspection JSUnusedLocalSymbols
-        ko.extenders.slug = function(target, option) {
-            let result = ko.pureComputed({
-                read: target,
-                write: function(newValue) {
-                    let current = target();
-                    newValue = newValue.toLowerCase().replaceAll(/([^a-z0-9/]+)+/g, '-')
-
-                    //only write if it changed
-                    if (newValue !== current) {
-                        target(newValue);
-                    }
-                }
-            }).extend({ notify: 'always' });
-
-            //initialize
-            result(target());
-
-            return result;
-        }
-
         let formElt = document.getElementById('locations_json'),
             locationData = JSON.parse(formElt.innerText);
         tpvm._vmContext.locationsVM = new LocationsVM(locationData)

From 62ae244019c58b59d1f87d107710df1d8e291327 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 16:42:11 -0400
Subject: [PATCH 409/423] Correcting an issue where involvement types could be
 more than 20 chars, breaking things.

---
 src/TouchPoint-WP/Involvement_PostTypeSettings.php | 10 ++++++----
 src/templates/admin/invKoForm.php                  |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/TouchPoint-WP/Involvement_PostTypeSettings.php b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
index aaa53f29..559a6017 100644
--- a/src/TouchPoint-WP/Involvement_PostTypeSettings.php
+++ b/src/TouchPoint-WP/Involvement_PostTypeSettings.php
@@ -249,7 +249,7 @@ public static function validateNewSettings(string $new): string
 		// Validate (or forcibly replace) slugs
 		foreach ($new as $type) {
 			$first = true;
-			$lower = preg_replace('/\W+/', '-', strtolower($type->slug));
+			$lower = preg_replace('/[^\w\/]+/', '-', strtolower($type->slug));
 			if ($lower !== $type->slug) { // force slug to be lowercase
 				$type->slug = $lower;
 				TouchPointWP::queueFlushRewriteRules();
@@ -258,7 +258,7 @@ public static function validateNewSettings(string $new): string
 			while ( // all the conditions in which the post type will need to be regenerated.
 			in_array($type->slug, $postTypesSlugs)
 			) {
-				$name = preg_replace('/\W+/', '-', strtolower($type->namePlural));
+				$name = preg_replace('/[^\w\/]+/', '-', strtolower($type->namePlural));
 				try {
 					$type->slug = $name . ($first ? "" : "-" . bin2hex(random_bytes(1)));
 				} catch (Exception) {
@@ -277,7 +277,7 @@ public static function validateNewSettings(string $new): string
 				$type->postType = null;
 			}
 			if ($type->postType !== null) {
-				$lower = preg_replace('/\W+/', '', strtolower($type->postType));
+				$lower = preg_replace('/[^\w\/]/', '', strtolower($type->postType));
 				if ($lower !== $type->postType) { // force postType to be lowercase
 					$type->postType = $lower;
 					TouchPointWP::queueFlushRewriteRules();
@@ -286,7 +286,8 @@ public static function validateNewSettings(string $new): string
 			$count = 1;
 			while ( // all the conditions in which the post type will need to be regenerated.
 				$type->postType === null ||
-				in_array($type->postType, $postTypeStrings) ||
+				in_array($type->postType, $postTypeStrings) || // duplicate
+				strlen($type->postType) > 17 ||
 				(
 					$type->postType !== "smallgroup" &&
 					$type->postType !== "course" &&
@@ -301,6 +302,7 @@ public static function validateNewSettings(string $new): string
 				}
 				$first          = false;
 				$type->postType = preg_replace('/\W+/', '_', $type->postType);
+				$type->postType = substr($type->postType, 0, 17); // enforce limit of 20 chars (17 after tp_ prefix)
 				TouchPointWP::queueFlushRewriteRules();
 			}
 			$postTypeStrings[] = $type->postType;
diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 2e70e6c8..6ab20f83 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -396,6 +396,9 @@ function initInvVm() {
                     let current = target();
                     newValue = newValue.toLowerCase().replaceAll(/([^a-z0-9/]+)+/g, '-')
 
+                    // force to 20 characters or less (will be shortened to 13 for private post_type field)
+                    newValue = newValue.substring(0, 20);
+
                     //only write if it changed
                     if (newValue !== current) {
                         target(newValue);

From 98afcd1e20e1a1222effbba378165cf1681771e8 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 16:42:33 -0400
Subject: [PATCH 410/423] i18n

---
 i18n/TouchPoint-WP-es_ES.po | 68 +++++++++++++++++------------------
 i18n/TouchPoint-WP.pot      | 70 ++++++++++++++++++-------------------
 2 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 6afc1abe..7923d1a1 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -125,13 +125,13 @@ msgstr "Género"
 
 #: src/templates/admin/invKoForm.php:252
 #: src/TouchPoint-WP/Involvement.php:1929
-#: src/TouchPoint-WP/Taxonomies.php:747
+#: src/TouchPoint-WP/Taxonomies.php:749
 msgid "Weekday"
 msgstr "Día laborable"
 
 #: src/templates/admin/invKoForm.php:256
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Taxonomies.php:813
+#: src/TouchPoint-WP/Taxonomies.php:815
 msgid "Time of Day"
 msgstr "Hora del día"
 
@@ -140,7 +140,7 @@ msgid "Prevailing Marital Status"
 msgstr "Estado civil prevaleciente"
 
 #: src/templates/admin/invKoForm.php:264
-#: src/TouchPoint-WP/Taxonomies.php:846
+#: src/TouchPoint-WP/Taxonomies.php:848
 msgid "Age Group"
 msgstr "Grupo de edad"
 
@@ -168,7 +168,7 @@ msgstr "Grupo Pequeño"
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:458
+#: src/templates/admin/invKoForm.php:461
 msgid "Select..."
 msgstr "Seleccione..."
 
@@ -185,8 +185,8 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#: src/TouchPoint-WP/Auth.php:407
-#: src/TouchPoint-WP/Auth.php:415
+#: src/TouchPoint-WP/Auth.php:408
+#: src/TouchPoint-WP/Auth.php:416
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
@@ -787,7 +787,7 @@ msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
 #: src/TouchPoint-WP/Settings.php:1450
-#: blocks/inv-list/index.js:113
+#: blocks/inv-list/index.js:112
 #: blocks/people-list/index.js:174
 msgid "Settings"
 msgstr "Ajustes"
@@ -1029,7 +1029,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: src/TouchPoint-WP/Involvement.php:1977
-#: src/TouchPoint-WP/Taxonomies.php:882
+#: src/TouchPoint-WP/Taxonomies.php:884
 msgid "Marital Status"
 msgstr "Estado civil"
 
@@ -1326,65 +1326,65 @@ msgstr "Tipo de publicación no válida."
 msgid "Enable Campuses"
 msgstr "Habilitar Campus"
 
-#: src/TouchPoint-WP/Taxonomies.php:643
+#: src/TouchPoint-WP/Taxonomies.php:645
 msgid "Classify posts by their general locations."
 msgstr "clasificar las publicaciones por sus ubicaciones generales."
 
-#: src/TouchPoint-WP/Taxonomies.php:676
+#: src/TouchPoint-WP/Taxonomies.php:678
 msgid "Classify posts by their church campus."
 msgstr "Clasifique las publicaciones por el campus."
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:711
+#: src/TouchPoint-WP/Taxonomies.php:713
 #, php-format
 msgid "Classify things by %s."
 msgstr "Clasifica las cosas por %s."
 
-#: src/TouchPoint-WP/Taxonomies.php:746
+#: src/TouchPoint-WP/Taxonomies.php:748
 msgid "Classify involvements by the day on which they meet."
 msgstr "Clasificar las participaciones por el día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:747
+#: src/TouchPoint-WP/Taxonomies.php:749
 msgid "Weekdays"
 msgstr "Días de semana"
 
-#: src/TouchPoint-WP/Taxonomies.php:777
+#: src/TouchPoint-WP/Taxonomies.php:779
 msgid "Classify involvements by tense (present, future, past)"
 msgstr "Clasificar las implicaciones por tiempo (presente, futuro, pasado)"
 
-#: src/TouchPoint-WP/Taxonomies.php:781
+#: src/TouchPoint-WP/Taxonomies.php:783
 msgid "Tense"
 msgstr "Tiempo"
 
-#: src/TouchPoint-WP/Taxonomies.php:781
+#: src/TouchPoint-WP/Taxonomies.php:783
 msgid "Tenses"
 msgstr "Tiempos"
 
-#: src/TouchPoint-WP/Taxonomies.php:808
+#: src/TouchPoint-WP/Taxonomies.php:810
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr "Clasifique las participaciones por la parte del día en que se reúnen."
 
-#: src/TouchPoint-WP/Taxonomies.php:814
+#: src/TouchPoint-WP/Taxonomies.php:816
 msgid "Times of Day"
 msgstr "Tiempos del Día"
 
-#: src/TouchPoint-WP/Taxonomies.php:844
+#: src/TouchPoint-WP/Taxonomies.php:846
 msgid "Classify involvements and users by their age groups."
 msgstr "Clasifica las implicaciones y los usuarios por sus grupos de edad."
 
-#: src/TouchPoint-WP/Taxonomies.php:847
+#: src/TouchPoint-WP/Taxonomies.php:849
 msgid "Age Groups"
 msgstr "Grupos de Edad"
 
-#: src/TouchPoint-WP/Taxonomies.php:877
+#: src/TouchPoint-WP/Taxonomies.php:879
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr "Clasifique las participaciones según si los participantes son en su mayoría solteros o casados."
 
-#: src/TouchPoint-WP/Taxonomies.php:883
+#: src/TouchPoint-WP/Taxonomies.php:885
 msgid "Marital Statuses"
 msgstr "Estados Civiles"
 
-#: src/TouchPoint-WP/Taxonomies.php:919
+#: src/TouchPoint-WP/Taxonomies.php:921
 msgid "Classify Partners by category chosen in settings."
 msgstr "Clasifique a los ministeriales por categoría elegida en la configuración."
 
@@ -1437,7 +1437,7 @@ msgid "TouchPoint Report"
 msgstr "Informe de TouchPoint"
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:449
+#: src/TouchPoint-WP/Report.php:452
 #, php-format
 msgid "Updated on %1$s at %2$s"
 msgstr "Actualizada %1$s %2$s"
@@ -1610,7 +1610,7 @@ msgstr "hoy"
 msgid "Tomorrow"
 msgstr "mañana"
 
-#: src/templates/admin/invKoForm.php:421
+#: src/templates/admin/invKoForm.php:424
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
@@ -1855,7 +1855,7 @@ msgid "This %s has been cancelled."
 msgstr "Este %s ha sido cancelado."
 
 #: src/templates/admin/invKoForm.php:212
-#: blocks/inv-list/index.js:130
+#: blocks/inv-list/index.js:129
 msgid "Division"
 msgstr "Division"
 
@@ -1927,7 +1927,7 @@ msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
-#: src/TouchPoint-WP/Auth.php:446
+#: src/TouchPoint-WP/Auth.php:447
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
@@ -1976,11 +1976,11 @@ msgstr "Lista de Participaciones"
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
-#: blocks/inv-list/index.js:75
+#: blocks/inv-list/index.js:74
 msgid "All"
 msgstr "Todos"
 
-#: blocks/inv-list/index.js:121
+#: blocks/inv-list/index.js:120
 msgid "Post Type"
 msgstr "tipo de publicación"
 
@@ -1999,11 +1999,11 @@ msgstr "Una lista de participaciones de TouchPoint"
 msgid "None right now."
 msgstr "Nada por ahora"
 
-#: blocks/inv-list/index.js:116
+#: blocks/inv-list/index.js:115
 msgid "To use this block, import Involvements in the TouchPoint-WP settings."
 msgstr "Para utilizar este bloque, importe Involvements en la configuración de TouchPoint-WP."
 
-#: blocks/inv-list/index.js:143
+#: blocks/inv-list/index.js:142
 #: blocks/people-list/index.js:231
 msgid "Preview Only"
 msgstr "Solo vista previa"
@@ -2026,11 +2026,11 @@ msgstr "Solo se incluirán las participaciones de los campus seleccionados."
 msgid "This %s has already happened."
 msgstr "Este %s ya ha sucedido."
 
-#: blocks/inv-list/index.js:122
+#: blocks/inv-list/index.js:121
 msgid "These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings."
 msgstr "Estas opciones se basan en los tipos de entrada de «Involvement» que usted o su administrador han elegido importar en la configuración de TouchPoint-WP."
 
-#: blocks/inv-list/index.js:131
+#: blocks/inv-list/index.js:130
 msgid "This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings."
 msgstr "Esta opción le permite filtrar las participaciones que se muestran en esta lista, como, por ejemplo, limitarlas a un ministerio en particular. Estas opciones son aquellas que usted o su administrador configuraron como Divisiones para importarlas como taxonomías en los ajustes de TouchPoint-WP."
 
@@ -2055,7 +2055,7 @@ msgctxt "block title"
 msgid "People List"
 msgstr "Lista de personas"
 
-#: blocks/inv-list/index.js:39
+#: blocks/inv-list/index.js:40
 #: blocks/people-list/index.js:50
 msgid "Loading Preview..."
 msgstr "Cargando vista previa..."
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index ec5d9c98..aaa96280 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-16T20:49:25+00:00\n"
+"POT-Creation-Date: 2026-04-20T20:42:20+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -200,7 +200,7 @@ msgid "Default Filters"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:212
-#: blocks/inv-list/index.js:130
+#: blocks/inv-list/index.js:129
 msgid "Division"
 msgstr ""
 
@@ -218,13 +218,13 @@ msgstr ""
 
 #: src/templates/admin/invKoForm.php:252
 #: src/TouchPoint-WP/Involvement.php:1929
-#: src/TouchPoint-WP/Taxonomies.php:747
+#: src/TouchPoint-WP/Taxonomies.php:749
 msgid "Weekday"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:256
 #: src/TouchPoint-WP/Involvement.php:1955
-#: src/TouchPoint-WP/Taxonomies.php:813
+#: src/TouchPoint-WP/Taxonomies.php:815
 msgid "Time of Day"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgid "Prevailing Marital Status"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:264
-#: src/TouchPoint-WP/Taxonomies.php:846
+#: src/TouchPoint-WP/Taxonomies.php:848
 msgid "Age Group"
 msgstr ""
 
@@ -261,11 +261,11 @@ msgstr ""
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:421
+#: src/templates/admin/invKoForm.php:424
 msgid "(named person)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:458
+#: src/templates/admin/invKoForm.php:461
 msgid "Select..."
 msgstr ""
 
@@ -367,12 +367,12 @@ msgstr ""
 msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:407
-#: src/TouchPoint-WP/Auth.php:415
+#: src/TouchPoint-WP/Auth.php:408
+#: src/TouchPoint-WP/Auth.php:416
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:446
+#: src/TouchPoint-WP/Auth.php:447
 msgid "No user account found."
 msgstr ""
 
@@ -496,7 +496,7 @@ msgid "Language"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:1977
-#: src/TouchPoint-WP/Taxonomies.php:882
+#: src/TouchPoint-WP/Taxonomies.php:884
 msgid "Marital Status"
 msgstr ""
 
@@ -727,7 +727,7 @@ msgid "TouchPoint Report"
 msgstr ""
 
 #. translators: Last updated date/time for a report. %1$s is the date. %2$s is the time.
-#: src/TouchPoint-WP/Report.php:449
+#: src/TouchPoint-WP/Report.php:452
 #, php-format
 msgid "Updated on %1$s at %2$s"
 msgstr ""
@@ -1353,7 +1353,7 @@ msgid "TouchPoint-WP"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:1450
-#: blocks/inv-list/index.js:113
+#: blocks/inv-list/index.js:112
 #: blocks/people-list/index.js:174
 msgid "Settings"
 msgstr ""
@@ -1437,65 +1437,65 @@ msgstr ""
 msgid "New %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:643
+#: src/TouchPoint-WP/Taxonomies.php:645
 msgid "Classify posts by their general locations."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:676
+#: src/TouchPoint-WP/Taxonomies.php:678
 msgid "Classify posts by their church campus."
 msgstr ""
 
 #. translators: %s: taxonomy name, singular
-#: src/TouchPoint-WP/Taxonomies.php:711
+#: src/TouchPoint-WP/Taxonomies.php:713
 #, php-format
 msgid "Classify things by %s."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:746
+#: src/TouchPoint-WP/Taxonomies.php:748
 msgid "Classify involvements by the day on which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:747
+#: src/TouchPoint-WP/Taxonomies.php:749
 msgid "Weekdays"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:777
+#: src/TouchPoint-WP/Taxonomies.php:779
 msgid "Classify involvements by tense (present, future, past)"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:781
+#: src/TouchPoint-WP/Taxonomies.php:783
 msgid "Tense"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:781
+#: src/TouchPoint-WP/Taxonomies.php:783
 msgid "Tenses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:808
+#: src/TouchPoint-WP/Taxonomies.php:810
 msgid "Classify involvements by the portion of the day in which they meet."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:814
+#: src/TouchPoint-WP/Taxonomies.php:816
 msgid "Times of Day"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:844
+#: src/TouchPoint-WP/Taxonomies.php:846
 msgid "Classify involvements and users by their age groups."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:847
+#: src/TouchPoint-WP/Taxonomies.php:849
 msgid "Age Groups"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:877
+#: src/TouchPoint-WP/Taxonomies.php:879
 msgid "Classify involvements by whether participants are mostly single or married."
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:883
+#: src/TouchPoint-WP/Taxonomies.php:885
 msgid "Marital Statuses"
 msgstr ""
 
-#: src/TouchPoint-WP/Taxonomies.php:919
+#: src/TouchPoint-WP/Taxonomies.php:921
 msgid "Classify Partners by category chosen in settings."
 msgstr ""
 
@@ -2031,32 +2031,32 @@ msgstr ""
 msgid "A list of Involvements from TouchPoint"
 msgstr ""
 
-#: blocks/inv-list/index.js:39
+#: blocks/inv-list/index.js:40
 #: blocks/people-list/index.js:50
 msgid "Loading Preview..."
 msgstr ""
 
-#: blocks/inv-list/index.js:75
+#: blocks/inv-list/index.js:74
 msgid "All"
 msgstr ""
 
-#: blocks/inv-list/index.js:116
+#: blocks/inv-list/index.js:115
 msgid "To use this block, import Involvements in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:121
+#: blocks/inv-list/index.js:120
 msgid "Post Type"
 msgstr ""
 
-#: blocks/inv-list/index.js:122
+#: blocks/inv-list/index.js:121
 msgid "These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:131
+#: blocks/inv-list/index.js:130
 msgid "This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:143
+#: blocks/inv-list/index.js:142
 #: blocks/people-list/index.js:231
 msgid "Preview Only"
 msgstr ""

From 927b375a4137f2e00312ddc41aa7627496186adc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 21 Apr 2026 01:51:16 +0000
Subject: [PATCH 411/423] Fix inv-list preview state collisions across block
 instances

Agent-Logs-Url: https://github.com/TenthPres/TouchPoint-WP/sessions/507b072c-4a04-4c44-9569-4fc665c75e28

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
---
 blocks/inv-list/index.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/blocks/inv-list/index.js b/blocks/inv-list/index.js
index 541ef06a..7f6efe79 100644
--- a/blocks/inv-list/index.js
+++ b/blocks/inv-list/index.js
@@ -58,7 +58,6 @@ wp.blocks.registerBlockType( metadata.name, {
 					if (postType === '' && formattedOptions.length > 0) {
 						setAttributes({ postType: formattedOptions[0].value });
 					}
-					updateListContent(postType, division, blockProps, placeholderId);
 				} catch (error) {
 					console.error('Error fetching post types:', error);
 				}
@@ -82,7 +81,6 @@ wp.blocks.registerBlockType( metadata.name, {
 						groupedOptions.push(<optgroup key={groupLabel} label={groupLabel}>{options}</optgroup>);
 					});
 					setDivisionChildren(groupedOptions);
-					updateListContent(postType, division, blockProps, placeholderId);
 				} catch (error) {
 					console.error('Error fetching divisions:', error);
 				}
@@ -158,16 +156,16 @@ wp.blocks.registerBlockType( metadata.name, {
 
 } );
 
-let lastPath = null;
-let controller = null;
-
 function updateListContent(postType, division, blockProps, placeholderId, placeholderEl, previewControllerRef, lastPathRef, setPreviewHtml) {
 	const placeholder = placeholderEl || document.getElementById(placeholderId);
 	const newPath = `/touchpoint-api/inv/list?type=${postType}&div=${division}&class=${encodeURIComponent(blockProps.className || '')}`;
 
-	// Use per-instance refs when provided, otherwise fall back to module-level vars.
-	const lastPathHolder = lastPathRef && typeof lastPathRef === 'object' ? lastPathRef : {current: lastPath};
-	const controllerHolder = previewControllerRef && typeof previewControllerRef === 'object' ? previewControllerRef : {current: controller};
+	// Keep state per block instance to avoid collisions between block previews.
+	const lastPathHolder = lastPathRef;
+	const controllerHolder = previewControllerRef;
+	if (!lastPathHolder || !controllerHolder) {
+		return;
+	}
 
 	if (lastPathHolder.current === newPath) {
 		return;
@@ -180,10 +178,6 @@ function updateListContent(postType, division, blockProps, placeholderId, placeh
 	controllerHolder.current = new AbortController();
 	lastPathHolder.current = newPath;
 
-	// If using module-level fallback, keep module vars in sync
-	if (!previewControllerRef) controller = controllerHolder.current;
-	if (!lastPathRef) lastPath = lastPathHolder.current;
-
 	fetch(newPath, { signal: controllerHolder.current.signal })
 		.then(response => {
 			if (!response.ok) throw new Error('Network response was not ok');

From 8ea88c2a21e2662e558790f59ead05212d6cf777 Mon Sep 17 00:00:00 2001
From: "James K." <jkurtz@tenth.org>
Date: Mon, 20 Apr 2026 21:54:23 -0400
Subject: [PATCH 412/423] make safe in case table elts are missing

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/TouchPoint-WP/Report.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Report.php b/src/TouchPoint-WP/Report.php
index 19e4c23e..415ec483 100644
--- a/src/TouchPoint-WP/Report.php
+++ b/src/TouchPoint-WP/Report.php
@@ -692,8 +692,15 @@ public static function updateFromTouchPoint(bool $forceEvenIfNotDue = false): in
 	 */
 	private static function cleanupSqlContent(string $content): string
 	{
-		$closes  = substr($content, strrpos($content, '</tr>') + 5);
-		$content = substr($content, 0, strrpos($content, '<tr'));
+		$closePos = strrpos($content, '</tr>');
+		$rowPos   = strrpos($content, '<tr');
+
+		if ($closePos === false || $rowPos === false) {
+			return $content;
+		}
+
+		$closes  = substr($content, $closePos + 5);
+		$content = substr($content, 0, $rowPos);
 		$content .= $closes;
 
 		return $content;

From 9bd69662ad9a492ac2071bc74e35012b98a8e5df Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 21:38:43 -0400
Subject: [PATCH 413/423] working out an array flattening issue

---
 src/TouchPoint-WP/Partner.php                 |  6 ++++-
 .../Utilities/StringableArray.php             | 26 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/TouchPoint-WP/Partner.php b/src/TouchPoint-WP/Partner.php
index 54dbff48..a0ae435e 100644
--- a/src/TouchPoint-WP/Partner.php
+++ b/src/TouchPoint-WP/Partner.php
@@ -1289,7 +1289,11 @@ public function notableAttributes(array|StringableArray $exclude = []): NotableA
 		unset($l);
 
 		foreach ($this->category as $c) {
-			$attrs['category'] = $c->name;
+			if (!isset($attrs['category'])) {
+				$attrs['category'] = new StringableArray();
+			}
+
+			$attrs['category'][] = $c->name;
 		}
 
 		// Not shown on map (only if there is a map, and the partner isn't on it because they lack geo.)
diff --git a/src/TouchPoint-WP/Utilities/StringableArray.php b/src/TouchPoint-WP/Utilities/StringableArray.php
index 0561efe8..c4117657 100644
--- a/src/TouchPoint-WP/Utilities/StringableArray.php
+++ b/src/TouchPoint-WP/Utilities/StringableArray.php
@@ -129,7 +129,31 @@ public function join(?string $separator = null, ?string $prefix = null, ?string
 			$postfix = $this->itemSuffix;
 		}
 		$joiner = $postfix . $separator . $prefix;
-		return $prefix . implode($joiner, $this->getArrayCopy()) . $postfix;
+
+		$r = $prefix;
+		$first = true;
+		foreach ($this->getIterator() as $item) {
+			if (!$first) {
+				$r .= $joiner;
+			}
+
+			// if $item is an object and implements join()
+			if (is_object($item) && method_exists($item, "join")) {
+				try {
+					$r .= $item->join($separator, $prefix, $postfix);
+				} catch (\Exception) {
+					// if it fails, just use the string value of the object
+					$r .= $item;
+				}
+			} else {
+				$r .= $item;
+			}
+
+			$first = false;
+		}
+		$r .= $postfix;
+
+		return $r;
 	}
 
 	/**

From 9f51be611054e6ea9d72088b5e5b6bfa47024be9 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 21:39:11 -0400
Subject: [PATCH 414/423] dealing with issue that arises when an inv slug
 contains /

---
 src/templates/admin/invKoForm.php | 133 +++++++++++++++---------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/src/templates/admin/invKoForm.php b/src/templates/admin/invKoForm.php
index 6ab20f83..dd2a7223 100644
--- a/src/templates/admin/invKoForm.php
+++ b/src/templates/admin/invKoForm.php
@@ -21,26 +21,26 @@
     <table data-bind="visible: _visible" style="margin-left: 2.4em;">
         <tr>
             <th>
-                <label for="it-singular" data-bind="attr: { for: 'it-' + slug() + '-singular'}"><?php _e("Singular Name", "TouchPoint-WP"); ?></label>
+                <label for="it-singular" data-bind="attr: { for: 'it-' + slugSterilized() + '-singular'}"><?php _e("Singular Name", "TouchPoint-WP"); ?></label>
             </th>
             <td colspan="2">
-                <input id="it-singular" type="text" data-bind="value: nameSingular, attr: { id: 'it-' + slug() + '-singular'}" />
+                <input id="it-singular" type="text" data-bind="value: nameSingular, attr: { id: 'it-' + slugSterilized() + '-singular'}" />
             </td>
         </tr>
         <tr>
             <th>
-                <label for="it-plural" data-bind="attr: { for: 'it-' + slug() + '-plural'}"><?php _e("Plural Name", "TouchPoint-WP"); ?></label>
+                <label for="it-plural" data-bind="attr: { for: 'it-' + slugSterilized() + '-plural'}"><?php _e("Plural Name", "TouchPoint-WP"); ?></label>
             </th>
             <td colspan="2">
-                <input id="it-plural" type="text" data-bind="value: namePlural, attr: { id: 'it-' + slug() + '-plural'}, valueUpdate: ['afterkeydown', 'input']" />
+                <input id="it-plural" type="text" data-bind="value: namePlural, attr: { id: 'it-' + slugSterilized() + '-plural'}, valueUpdate: ['afterkeydown', 'input']" />
             </td>
         </tr>
         <tr>
             <th>
-                <label for="it-slug" data-bind="attr: { for: 'it-' + slug() + '-slug'}"><?php _e("Slug", "TouchPoint-WP"); ?></label>
+                <label for="it-slug" data-bind="attr: { for: 'it-' + slugSterilized() + '-slug'}"><?php _e("Slug", "TouchPoint-WP"); ?></label>
             </th>
             <td colspan="2">
-                <input id="it-slug" type="text" data-bind="value: slug, attr: { id: 'it-' + slug() + '-slug'}" />
+                <input id="it-slug" type="text" data-bind="value: slug, attr: { id: 'it-' + slugSterilized() + '-slug'}" />
             </td>
         </tr>
 
@@ -50,8 +50,8 @@
                 <p><?php _e("Only involvements from the selected divisions will be included.", "TouchPoint-WP"); ?></p>
                 <!-- ko foreach: $root.divisions -->
                 <p>
-                    <input id="it-div" type="checkbox" data-bind="value: 'div' + id, checked: $parent.importDivs, attr: {id: 'it-' + $parent.slug() + '-div-' + id}" />
-                    <label for="it-div" data-bind="text: name, attr: {for: 'it-' + $parent.slug() + '-div-' + id}"></label>
+                    <input id="it-div" type="checkbox" data-bind="value: 'div' + id, checked: $parent.importDivs, attr: {id: 'it-' + $parent.slugSterilized() + '-div-' + id}" />
+                    <label for="it-div" data-bind="text: name, attr: {for: 'it-' + $parent.slugSterilized() + '-div-' + id}"></label>
                 </p>
                 <!-- /ko -->
             </td>
@@ -65,17 +65,17 @@
                 <p><?php _e("Loading...", "TouchPoint-WP"); ?></p>
                 <!-- /ko -->
                 <p>
-                    <input id="it-campus-all" type="checkbox" data-bind="checked: $data._importCampusesAll, attr: {id: 'it-' + $data.slug() + '-campus-all'}" />
-                    <label for="it-campus-all" data-bind="attr: {for: 'it-' + $data.slug() + '-campus-all'}"><?php _e("All Campuses", "TouchPoint-WP"); ?></label>
+                    <input id="it-campus-all" type="checkbox" data-bind="checked: $data._importCampusesAll, attr: {id: 'it-' + $data.slugSterilized() + '-campus-all'}" />
+                    <label for="it-campus-all" data-bind="attr: {for: 'it-' + $data.slugSterilized() + '-campus-all'}"><?php _e("All Campuses", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-campus-no" type="checkbox" value="c0" data-bind="checked: $data.importCampuses, attr: {id: 'it-' + $data.slug() + '-campus-no'}" />
-                    <label for="it-campus-no" data-bind="attr: {for: 'it-' + $data.slug() + '-campus-no'}"><?php _e("(No Campus)", "TouchPoint-WP"); ?></label>
+                    <input id="it-campus-no" type="checkbox" value="c0" data-bind="checked: $data.importCampuses, attr: {id: 'it-' + $data.slugSterilized() + '-campus-no'}" />
+                    <label for="it-campus-no" data-bind="attr: {for: 'it-' + $data.slugSterilized() + '-campus-no'}"><?php _e("(No Campus)", "TouchPoint-WP"); ?></label>
                 </p>
                 <!-- ko foreach: $root.campuses -->
                 <p>
-                    <input id="it-campus" type="checkbox" data-bind="value: 'c' + id, checked: $parent.importCampuses, attr: {id: 'it-' + $parent.slug() + '-campus-' + id}" />
-                    <label for="it-campus" data-bind="text: $data.name, attr: {for: 'it-' + $parent.slug() + '-campus-' + id}"></label>
+                    <input id="it-campus" type="checkbox" data-bind="value: 'c' + id, checked: $parent.importCampuses, attr: {id: 'it-' + $parent.slugSterilized() + '-campus-' + id}" />
+                    <label for="it-campus" data-bind="text: $data.name, attr: {for: 'it-' + $parent.slugSterilized() + '-campus-' + id}"></label>
                 </p>
                 <!-- /ko -->
             </td>
@@ -83,76 +83,76 @@
 
         <tr>
             <th>
-                <label for="it-hierarchical" data-bind="attr: { for: 'it-' + slug() + '-hierarchical'}"><?php _e("Import Hierarchically (Parent-Child Relationships)", "TouchPoint-WP"); ?></label>
+                <label for="it-hierarchical" data-bind="attr: { for: 'it-' + slugSterilized() + '-hierarchical'}"><?php _e("Import Hierarchically (Parent-Child Relationships)", "TouchPoint-WP"); ?></label>
             </th>
-            <td colspan="2"><input id="it-hierarchical" type="checkbox" data-bind="checked: hierarchical, attr: { id: 'it-' + slug() + '-hierarchical'}" /></td>
+            <td colspan="2"><input id="it-hierarchical" type="checkbox" data-bind="checked: hierarchical, attr: { id: 'it-' + slugSterilized() + '-hierarchical'}" /></td>
         </tr>
 
         <tr>
             <th>
-                <label for="it-useImages" data-bind="attr: { for: 'it-' + slug() + '-useImages'}"><?php _e("Import Images from TouchPoint", "TouchPoint-WP"); ?></label>
+                <label for="it-useImages" data-bind="attr: { for: 'it-' + slugSterilized() + '-useImages'}"><?php _e("Import Images from TouchPoint", "TouchPoint-WP"); ?></label>
             </th>
             <td colspan="2">
-                <input id="it-useImages" type="checkbox" data-bind="checked: useImages, attr: { id: 'it-' + slug() + '-useImages'}" />
-                <label for="it-useImages" data-bind="attr: { for: 'it-' + slug() + '-useImages'}"><?php _e("Importing images sometimes conflicts with other plugins. Disabling image imports can help.", "TouchPoint-WP"); ?></label>
+                <input id="it-useImages" type="checkbox" data-bind="checked: useImages, attr: { id: 'it-' + slugSterilized() + '-useImages'}" />
+                <label for="it-useImages" data-bind="attr: { for: 'it-' + slugSterilized() + '-useImages'}"><?php _e("Importing images sometimes conflicts with other plugins. Disabling image imports can help.", "TouchPoint-WP"); ?></label>
             </td>
         </tr>
 
         <?php if ($this->enable_meeting_cal === "on") { ?>
         <tr>
             <th>
-                <label for="it-importMeetings" data-bind="attr: { for: 'it-' + slug() + '-importMeetings'}"><?php _e("Import All Meetings to Calendar", "TouchPoint-WP"); ?></label>
+                <label for="it-importMeetings" data-bind="attr: { for: 'it-' + slugSterilized() + '-importMeetings'}"><?php _e("Import All Meetings to Calendar", "TouchPoint-WP"); ?></label>
             </th>
-            <td colspan="2"><input id="it-importMeetings" type="checkbox" data-bind="checked: importMeetings, attr: { id: 'it-' + slug() + '-importMeetings'}" /></td>
+            <td colspan="2"><input id="it-importMeetings" type="checkbox" data-bind="checked: importMeetings, attr: { id: 'it-' + slugSterilized() + '-importMeetings'}" /></td>
         </tr>
 
         <tr data-bind="visible: importMeetings">
             <th>
-                <label for="it-meetingGroupingMethod" data-bind="attr: { for: 'it-' + slug() + '-meetingGroupingMethod'}"><?php _e("Collect Meetings for Larger Events", "TouchPoint-WP"); ?></label>
+                <label for="it-meetingGroupingMethod" data-bind="attr: { for: 'it-' + slugSterilized() + '-meetingGroupingMethod'}"><?php _e("Collect Meetings for Larger Events", "TouchPoint-WP"); ?></label>
             </th>
             <td colspan="2">
-                <select id="it-meetingGroupingMethod" data-bind="value: meetingGroupingMethod, attr: { id: 'it-' + slug() + '-meetingGroupingMethod'}">
+                <select id="it-meetingGroupingMethod" data-bind="value: meetingGroupingMethod, attr: { id: 'it-' + slugSterilized() + '-meetingGroupingMethod'}">
                     <option value="<?php echo Meeting::GROUP_NONE; ?>"><?php _e("No Collecting", "TouchPoint-WP"); ?></option>
                     <option value="<?php echo Meeting::GROUP_UNSCHEDULED; ?>"><?php _e("Collect Meetings only from Involvements without Schedules", "TouchPoint-WP"); ?></option>
                     <option value="<?php echo Meeting::GROUP_ALL; ?>"><?php _e("Collect Meetings for all Involvements", "TouchPoint-WP"); ?></option>
                 </select>
-                <br /><label for="it-meetingGroupingMethod" data-bind="attr: { for: 'it-' + slug() + '-meetingGroupingMethod'}"><?php _e("Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours.", "TouchPoint-WP"); ?></label></td>
+                <br /><label for="it-meetingGroupingMethod" data-bind="attr: { for: 'it-' + slugSterilized() + '-meetingGroupingMethod'}"><?php _e("Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference.  For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours.", "TouchPoint-WP"); ?></label></td>
         </tr>
         <?php } ?>
 
         <tr>
             <th>
-                <label for="it-useGeo" data-bind="attr: { for: 'it-' + slug() + '-useGeo'}"><?php _e("Use Geographic Location", "TouchPoint-WP"); ?></label>
+                <label for="it-useGeo" data-bind="attr: { for: 'it-' + slugSterilized() + '-useGeo'}"><?php _e("Use Geographic Location", "TouchPoint-WP"); ?></label>
             </th>
-            <td colspan="2"><input id="it-useGeo" type="checkbox" data-bind="checked: useGeo, attr: { id: 'it-' + slug() + '-useGeo'}" /></td>
+            <td colspan="2"><input id="it-useGeo" type="checkbox" data-bind="checked: useGeo, attr: { id: 'it-' + slugSterilized() + '-useGeo'}" /></td>
         </tr>
 
         <tr>
             <th><?php _e("Exclude Involvements if", 'TouchPoint-WP'); ?></th>
             <td colspan="2">
                 <p>
-                    <input id="it-excludeIf-closed" type="checkbox" value="closed" data-bind="checked: excludeIf, attr: {id: 'it-' + slug() + '-excludeIf-closed'}" />
-                    <label for="it-excludeIf-closed" data-bind="attr: {for: 'it-' + slug() + '-excludeIf-closed'}"><?php _e("Involvement is Closed", "TouchPoint-WP"); ?></label>
+                    <input id="it-excludeIf-closed" type="checkbox" value="closed" data-bind="checked: excludeIf, attr: {id: 'it-' + slugSterilized() + '-excludeIf-closed'}" />
+                    <label for="it-excludeIf-closed" data-bind="attr: {for: 'it-' + slugSterilized() + '-excludeIf-closed'}"><?php _e("Involvement is Closed", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-excludeIf-child" type="checkbox" value="child" data-bind="checked: excludeIf, attr: {id: 'it-' + slug() + '-excludeIf-child'}" />
-                    <label for="it-excludeIf-child" data-bind="attr: {for: 'it-' + slug() + '-excludeIf-child'}"><?php _e("Involvement is a Child Involvement", "TouchPoint-WP"); ?></label>
+                    <input id="it-excludeIf-child" type="checkbox" value="child" data-bind="checked: excludeIf, attr: {id: 'it-' + slugSterilized() + '-excludeIf-child'}" />
+                    <label for="it-excludeIf-child" data-bind="attr: {for: 'it-' + slugSterilized() + '-excludeIf-child'}"><?php _e("Involvement is a Child Involvement", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-excludeIf-notWeekly" type="checkbox" value="notWeekly" data-bind="checked: excludeIf, attr: {id: 'it-' + slug() + '-excludeIf-notWeekly'}" />
-                    <label for="it-excludeIf-notWeekly" data-bind="attr: {for: 'it-' + slug() + '-excludeIf-notWeekly'}" title="<?php _e("Based on Involvement setting in TouchPoint", "TouchPoint-WP"); ?>"><?php _e("Involvement does not meet weekly", "TouchPoint-WP"); ?></label>
+                    <input id="it-excludeIf-notWeekly" type="checkbox" value="notWeekly" data-bind="checked: excludeIf, attr: {id: 'it-' + slugSterilized() + '-excludeIf-notWeekly'}" />
+                    <label for="it-excludeIf-notWeekly" data-bind="attr: {for: 'it-' + slugSterilized() + '-excludeIf-notWeekly'}" title="<?php _e("Based on Involvement setting in TouchPoint", "TouchPoint-WP"); ?>"><?php _e("Involvement does not meet weekly", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-excludeIf-unscheduled" type="checkbox" value="unscheduled" data-bind="checked: excludeIf, attr: {id: 'it-' + slug() + '-excludeIf-unscheduled'}" />
-                    <label for="it-excludeIf-unscheduled" data-bind="attr: {for: 'it-' + slug() + '-excludeIf-unscheduled'}"><?php _e("Involvement does not have a Schedule", "TouchPoint-WP"); ?></label>
+                    <input id="it-excludeIf-unscheduled" type="checkbox" value="unscheduled" data-bind="checked: excludeIf, attr: {id: 'it-' + slugSterilized() + '-excludeIf-unscheduled'}" />
+                    <label for="it-excludeIf-unscheduled" data-bind="attr: {for: 'it-' + slugSterilized() + '-excludeIf-unscheduled'}"><?php _e("Involvement does not have a Schedule", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-excludeIf-noRegistration" type="checkbox" value="noRegistration" data-bind="checked: excludeIf, attr: {id: 'it-' + slug() + '-excludeIf-noRegistration'}" />
-                    <label for="it-excludeIf-noRegistration" data-bind="attr: {for: 'it-' + slug() + '-excludeIf-noRegistration'}"><?php _e("Involvement has a registration type of \"No Online Registration\"", "TouchPoint-WP"); ?></label>
+                    <input id="it-excludeIf-noRegistration" type="checkbox" value="noRegistration" data-bind="checked: excludeIf, attr: {id: 'it-' + slugSterilized() + '-excludeIf-noRegistration'}" />
+                    <label for="it-excludeIf-noRegistration" data-bind="attr: {for: 'it-' + slugSterilized() + '-excludeIf-noRegistration'}"><?php _e("Involvement has a registration type of \"No Online Registration\"", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-excludeIf-registrationEnded" type="checkbox" value="registrationEnded" data-bind="checked: excludeIf, attr: {id: 'it-' + slug() + '-excludeIf-registrationEnded'}" />
-                    <label for="it-excludeIf-registrationEnded" data-bind="attr: {for: 'it-' + slug() + '-excludeIf-registrationEnded'}"><?php _e("Involvement registration has ended (end date is past)", "TouchPoint-WP"); ?></label>
+                    <input id="it-excludeIf-registrationEnded" type="checkbox" value="registrationEnded" data-bind="checked: excludeIf, attr: {id: 'it-' + slugSterilized() + '-excludeIf-registrationEnded'}" />
+                    <label for="it-excludeIf-registrationEnded" data-bind="attr: {for: 'it-' + slugSterilized() + '-excludeIf-registrationEnded'}"><?php _e("Involvement registration has ended (end date is past)", "TouchPoint-WP"); ?></label>
                 </p>
             </td>
         </tr>
@@ -165,8 +165,8 @@
                 <!-- /ko -->
                 <!-- ko foreach: $data._activeMemberTypes -->
                 <p>
-                    <input id="it-leader-type" type="checkbox" data-bind="value: 'mt' + id, checked: $parent.leaderTypes, attr: {id: 'it-' + $parent.slug() + '-leader-type-' + id}" />
-                    <label for="it-leader-type" data-bind="text: description, attr: {for: 'it-' + $parent.slug() + '-leader-type-' + id}"></label>
+                    <input id="it-leader-type" type="checkbox" data-bind="value: 'mt' + id, checked: $parent.leaderTypes, attr: {id: 'it-' + $parent.slugSterilized() + '-leader-type-' + id}" />
+                    <label for="it-leader-type" data-bind="text: description, attr: {for: 'it-' + $parent.slugSterilized() + '-leader-type-' + id}"></label>
                 </p>
                 <!-- /ko -->
             </td>
@@ -181,18 +181,18 @@
                 <!-- /ko -->
                 <!-- ko foreach: $data._activeMemberTypes -->
                 <p>
-                    <input id="it-host-type" type="checkbox" data-bind="value: 'mt' + id, checked: $parent.hostTypes, attr: {id: 'it-' + $parent.slug() + '-host-type-' + id}" />
-                    <label for="it-host-type" data-bind="text: description, attr: {for: 'it-' + $parent.slug() + '-host-type-' + id}"></label>
+                    <input id="it-host-type" type="checkbox" data-bind="value: 'mt' + id, checked: $parent.hostTypes, attr: {id: 'it-' + $parent.slugSterilized() + '-host-type-' + id}" />
+                    <label for="it-host-type" data-bind="text: description, attr: {for: 'it-' + $parent.slugSterilized() + '-host-type-' + id}"></label>
                 </p>
                 <!-- /ko -->
             </td>
         </tr>
         <tr data-bind="">
             <th>
-                <label for="it-tense" data-bind="attr: { for: 'it-' + slug() + '-tense'}"><?php _e("Default Grouping", "TouchPoint-WP"); ?></label>
+                <label for="it-tense" data-bind="attr: { for: 'it-' + slugSterilized() + '-tense'}"><?php _e("Default Grouping", "TouchPoint-WP"); ?></label>
             </th>
             <td colspan="2">
-                <select id="it-tense" data-bind="value: groupBy, attr: { id: 'it-' + slug() + '-tense'}">
+                <select id="it-tense" data-bind="value: groupBy, attr: { id: 'it-' + slugSterilized() + '-tense'}">
                     <option value=""><?php _e("No Grouping", "TouchPoint-WP"); ?></option>
                     <option value="-<?php echo Taxonomies::TAX_TENSE; ?>"><?php _e("Upcoming / Current", "TouchPoint-WP"); ?></option>
                     <option value="<?php echo Taxonomies::TAX_TENSE; ?>"><?php _e("Current / Upcoming", "TouchPoint-WP"); ?></option>
@@ -230,45 +230,45 @@
             </th>
             <td colspan="2">
                 <p>
-                    <input id="it-filt-div" type="checkbox" value="div" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-div'}" />
-                    <label for="it-filt-div" data-bind="attr: { for: 'it-' + slug() + '-filt-div'}"><?php echo $divisionsLabel ?></label>
+                    <input id="it-filt-div" type="checkbox" value="div" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-div'}" />
+                    <label for="it-filt-div" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-div'}"><?php echo $divisionsLabel ?></label>
                 </p>
                 <p>
-                    <input id="it-filt-genderId" type="checkbox" value="genderId" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-genderId'}" />
-                    <label for="it-filt-genderId" data-bind="attr: { for: 'it-' + slug() + '-filt-genderId'}"><?php _e("Gender", "TouchPoint-WP"); ?></label>
+                    <input id="it-filt-genderId" type="checkbox" value="genderId" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-genderId'}" />
+                    <label for="it-filt-genderId" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-genderId'}"><?php _e("Gender", "TouchPoint-WP"); ?></label>
                 </p>
                 <p data-bind="visible: useGeo">
-                    <input id="it-filt-rescode" type="checkbox" value="rescode" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-rescode'}" />
-                    <label for="it-filt-rescode" data-bind="attr: { for: 'it-' + slug() + '-filt-rescode'}"><?php echo $resCodeLabel ?></label>
+                    <input id="it-filt-rescode" type="checkbox" value="rescode" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-rescode'}" />
+                    <label for="it-filt-rescode" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-rescode'}"><?php echo $resCodeLabel ?></label>
                 </p>
                 <?php if ($this->get('enable_campuses') === "on") { ?>
                 <p>
-                    <input id="it-filt-campus" type="checkbox" value="campus" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-campus'}" />
-                    <label for="it-filt-campus" data-bind="attr: { for: 'it-' + slug() + '-filt-campus'}"><?php echo $campusLabel ?></label>
+                    <input id="it-filt-campus" type="checkbox" value="campus" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-campus'}" />
+                    <label for="it-filt-campus" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-campus'}"><?php echo $campusLabel ?></label>
                 </p>
                 <?php } ?>
                 <p>
-                    <input id="it-filt-weekday" type="checkbox" value="weekday" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-weekday'}" />
-                    <label for="it-filt-weekday" data-bind="attr: { for: 'it-' + slug() + '-filt-weekday'}"><?php _e("Weekday", "TouchPoint-WP"); ?></label>
+                    <input id="it-filt-weekday" type="checkbox" value="weekday" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-weekday'}" />
+                    <label for="it-filt-weekday" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-weekday'}"><?php _e("Weekday", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-filt-timeOfDay" type="checkbox" value="timeOfDay" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-timeOfDay'}" />
-                    <label for="it-filt-timeOfDay" data-bind="attr: { for: 'it-' + slug() + '-filt-timeOfDay'}"><?php _e("Time of Day", "TouchPoint-WP"); ?></label>
+                    <input id="it-filt-timeOfDay" type="checkbox" value="timeOfDay" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-timeOfDay'}" />
+                    <label for="it-filt-timeOfDay" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-timeOfDay'}"><?php _e("Time of Day", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-filt-marital" type="checkbox" value="inv_marital" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-marital'}" />
-                    <label for="it-filt-marital" data-bind="attr: { for: 'it-' + slug() + '-filt-marital'}"><?php _e("Prevailing Marital Status", "TouchPoint-WP"); ?></label>
+                    <input id="it-filt-marital" type="checkbox" value="inv_marital" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-marital'}" />
+                    <label for="it-filt-marital" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-marital'}"><?php _e("Prevailing Marital Status", "TouchPoint-WP"); ?></label>
                 </p>
                 <p>
-                    <input id="it-filt-agegroup" type="checkbox" value="agegroup" data-bind="checked: filters, attr: { id: 'it-' + slug() + '-filt-agegroup'}" />
-                    <label for="it-filt-agegroup" data-bind="attr: { for: 'it-' + slug() + '-filt-agegroup'}"><?php _e("Age Group", "TouchPoint-WP"); ?></label>
+                    <input id="it-filt-agegroup" type="checkbox" value="agegroup" data-bind="checked: filters, attr: { id: 'it-' + slugSterilized() + '-filt-agegroup'}" />
+                    <label for="it-filt-agegroup" data-bind="attr: { for: 'it-' + slugSterilized() + '-filt-agegroup'}"><?php _e("Age Group", "TouchPoint-WP"); ?></label>
                 </p>
             </td>
         </tr>
         <tr data-bind="">
-            <th><label for="it-taskOwner" data-bind="attr: {for: 'it-' + slug() + '-taskOwner'}"><?php _e("Task Owner", "TouchPoint-WP"); ?></th>
+            <th><label for="it-taskOwner" data-bind="attr: {for: 'it-' + slugSterilized() + '-taskOwner'}"><?php _e("Task Owner", "TouchPoint-WP"); ?></th>
             <td colspan="2">
-                <select id="it-taskOwner" data-bind="value: taskOwner, attr: { id: 'it-' + slug() + '-taskOwner'}" class="select2">
+                <select id="it-taskOwner" data-bind="value: taskOwner, attr: { id: 'it-' + slugSterilized() + '-taskOwner'}" class="select2">
                 </select>
             </td>
         </tr>
@@ -277,8 +277,8 @@
             <td colspan="2" class="column-wrap">
                 <!-- ko foreach: $root.keywords -->
                 <p>
-                    <input id="it-clt-kw" type="checkbox" data-bind="value: 'kw' + id, checked: $parent.contactKeywords, attr: {id: 'it-' + $parent.slug() + '-clt-kw-' + id}" />
-                    <label for="it-clt-kw" data-bind="text: name, attr: {for: 'it-' + $parent.slug() + '-clt-kw-' + id}"></label>
+                    <input id="it-clt-kw" type="checkbox" data-bind="value: 'kw' + id, checked: $parent.contactKeywords, attr: {id: 'it-' + $parent.slugSterilized() + '-clt-kw-' + id}" />
+                    <label for="it-clt-kw" data-bind="text: name, attr: {for: 'it-' + $parent.slugSterilized() + '-clt-kw-' + id}"></label>
                 </p>
                 <!-- /ko -->
             </td>
@@ -288,8 +288,8 @@
             <td colspan="2" class="column-wrap">
                 <!-- ko foreach: $root.keywords -->
                 <p>
-                    <input id="it-jt-kw" type="checkbox" data-bind="value: 'kw' + id, checked: $parent.joinKeywords, attr: {id: 'it-' + $parent.slug() + '-jt-kw-' + id}" />
-                    <label for="it-jt-kw" data-bind="text: name, attr: {for: 'it-' + $parent.slug() + '-jt-kw-' + id}"></label>
+                    <input id="it-jt-kw" type="checkbox" data-bind="value: 'kw' + id, checked: $parent.joinKeywords, attr: {id: 'it-' + $parent.slugSterilized() + '-jt-kw-' + id}" />
+                    <label for="it-jt-kw" data-bind="text: name, attr: {for: 'it-' + $parent.slugSterilized() + '-jt-kw-' + id}"></label>
                 </p>
                 <!-- /ko -->
             </td>
@@ -310,6 +310,7 @@ function InvType(data) {
         this.nameSingular = ko.observable(data.nameSingular ?? "<?php _e("Small Group", "TouchPoint-WP"); ?>");
         this.namePlural = ko.observable(data.namePlural ?? "<?php _e("Small Groups", "TouchPoint-WP"); ?>");
         this.slug = ko.observable(data.slug ?? "smallgroup").extend({slug: 0});
+        this.slugSterilized = ko.pureComputed({read: () => self.slug().replace("/", "-") });
         this.importDivs = ko.observable(data.importDivs ?? []);
         this.importCampuses = ko.observable(data.importCampuses ?? []);
         this.useGeo = ko.observable(data.useGeo ?? false);

From caec7eeba64580d10c93217137388787ce504db7 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 21:42:17 -0400
Subject: [PATCH 415/423] cr

---
 src/TouchPoint-WP/Taxonomies.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TouchPoint-WP/Taxonomies.php b/src/TouchPoint-WP/Taxonomies.php
index 378c2d20..a9f680f4 100644
--- a/src/TouchPoint-WP/Taxonomies.php
+++ b/src/TouchPoint-WP/Taxonomies.php
@@ -78,7 +78,7 @@ public static function insertTermsForArrayBasedTaxonomy(array $list, string $tax
 		$existingIds = [];
 		$idUpdate = $forceIdUpdate;
 		foreach ($list as $slug => $name) {
-			// In addition to making sure term exists, make sure it has the correct meta id, too.
+			// In addition to making sure term exists, make sure it has the correct meta id if forceIdUpdate is true.
 			$term = self::termExists($name, $taxonomy);
 			if ( ! $term) {
 				$term = self::insertTerm(
@@ -123,14 +123,14 @@ public static function insertTermsForArrayBasedTaxonomy(array $list, string $tax
 	 *
 	 * @return void
 	 */
-	public static function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate)
+	public static function insertTermsForLookupBasedTaxonomy(array $list, string $taxonomy, bool $forceIdUpdate): void
 	{
 		$existingIds = [];
 		foreach ($list as $i) {
 			if ($i->name === null) {
 				continue;
 			}
-			// In addition to making sure term exists, make sure it has the correct meta id, too.
+			// In addition to making sure term exists, make sure it has the correct meta id if forceIdUpdate is true.
 			$term = self::termExists($i->name, $taxonomy);
 			$idUpdate = $forceIdUpdate;
 			if ( ! $term) {

From f19ab427594db4ce9e5dd12cfc4fb38dfa4a8daf Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 21:45:23 -0400
Subject: [PATCH 416/423] cr

---
 src/TouchPoint-WP/Stats.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php
index f5da2f7b..c0a1a01a 100644
--- a/src/TouchPoint-WP/Stats.php
+++ b/src/TouchPoint-WP/Stats.php
@@ -461,6 +461,11 @@ public static function api(array $uri): bool
 	 */
 	public static function handleSubmission(): bool
 	{
+		if ($_SERVER['HTTP_HOST'] !== 'www.tenth.org') {
+			http_response_code(Http::FORBIDDEN);
+			echo "Submissions are only accepted to www.tenth.org.";
+			return false;
+		}
 
 		if ($_SERVER['REQUEST_METHOD'] !== "POST") {
 			http_response_code(Http::METHOD_NOT_ALLOWED);

From 947cc2bedefae2165362c47cb62eae9092249921 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 21:48:54 -0400
Subject: [PATCH 417/423] cr

---
 src/TouchPoint-WP/Blocks/BlocksController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TouchPoint-WP/Blocks/BlocksController.php b/src/TouchPoint-WP/Blocks/BlocksController.php
index 9dd0339f..84f644cf 100644
--- a/src/TouchPoint-WP/Blocks/BlocksController.php
+++ b/src/TouchPoint-WP/Blocks/BlocksController.php
@@ -8,6 +8,10 @@
 use tp\TouchPointWP\Interfaces\api;
 use tp\TouchPointWP\TouchPointWP;
 
+if ( ! defined('ABSPATH')) {
+	exit;
+}
+
 abstract class BlocksController implements api
 {
 

From 749ff5dcb3dd526870c4bab9dc4c82a60486e004 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Mon, 20 Apr 2026 22:25:32 -0400
Subject: [PATCH 418/423] permissions more smoothly.

---
 src/TouchPoint-WP/Auth.php         |  9 ++++-----
 src/TouchPoint-WP/TouchPointWP.php | 10 ++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 93decf4a..097b1d48 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -10,7 +10,6 @@
 use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonQuery;
-use tp\TouchPointWP\Utilities\Session;
 use WP_Error;
 use WP_User;
 
@@ -56,7 +55,7 @@ public static function init(): void
 		add_filter('login_redirect', [self::class, 'redirectLoginCompleteMaybe'], 10, 3);
 
 		// If configured, prevent admin bar from appearing for subscribers
-		add_action('after_setup_theme', [self::class, 'removeAdminBarMaybe']);
+		self::removeAdminBarMaybe();
 	}
 
 
@@ -200,7 +199,7 @@ public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $
 		}
 
 		$redirect = TouchPointWP::instance()->settings->auth_change_profile_urls === 'on';
-		$redirect &= !TouchPointWP::userHasEditingPermissions();
+		$redirect &= !TouchPointWP::userHasEditingPermissions($user);
 
 		/**
 		 * Controls whether to redirect to the TouchPoint login automatically.
@@ -210,7 +209,7 @@ public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $
 		$redirect = apply_filters('tp_redirect_after_login', $redirect);
 
 		// if there is no defined redirect page, redirect to the home page
-		if ($redirect && (!isset($_GET['redirect_to']) || $_GET['redirect_to'] == '')) {
+		if ($redirect && $redirect_to == '') {
 			return home_url();
 		}
 
@@ -225,7 +224,7 @@ public static function removeAdminBarMaybe(): void
 	{
 		$removeBar = (TouchPointWP::instance()->settings->auth_prevent_admin_bar === 'on')
 					 && !is_admin()
-					 && !current_user_can('edit_posts');
+					 && !TouchPointWP::userHasEditingPermissions();
 
 		/**
 		 * Allows for hiding the WordPress-provided Admin bar.
diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php
index a7a9654d..fd99ba99 100644
--- a/src/TouchPoint-WP/TouchPointWP.php
+++ b/src/TouchPoint-WP/TouchPointWP.php
@@ -629,22 +629,20 @@ public static function currentUserIsAdmin(): bool
 	/**
 	 * Determine if the current user can edit *anything* and therefore may need access to wp-admin.
 	 *
-	 * @param int|null $userId
+	 * @param ?WP_User $user
 	 *
 	 * @return bool
 	 */
-	public static function userHasEditingPermissions(?int $userId = null): bool
+	public static function userHasEditingPermissions(?WP_User $user = null): bool
 	{
 		if (!function_exists('get_current_user_id')) {
 			return false;
 		}
 
-		if ($userId === null) {
-			$userId = get_current_user_id();
+		if ($user === null) {
+			$user = get_user(get_current_user_id());
 		}
 
-		$user = get_user($userId);
-
 		if (!$user) {
 			return false;
 		}

From 329167e935a25e9fe329360b0fe184d13270a900 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 21 Apr 2026 13:04:23 -0400
Subject: [PATCH 419/423] Translation loading issue.  Closes #245. Closes #248.

---
 assets/template/calendar-grid-style.css | 33 ++++++++++++---
 build.sh                                |  1 +
 i18n/TouchPoint-WP-es_ES.po             | 54 ++++++++++++------------
 i18n/TouchPoint-WP.pot                  | 56 ++++++++++++-------------
 src/TouchPoint-WP/CalendarGrid.php      |  9 ++--
 5 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/assets/template/calendar-grid-style.css b/assets/template/calendar-grid-style.css
index cc214a4b..9c9f4f99 100644
--- a/assets/template/calendar-grid-style.css
+++ b/assets/template/calendar-grid-style.css
@@ -63,10 +63,37 @@ div.calGrid div.calDay.after {
     background: #0001;
 }
 
+div.calGridEmpty {
+    text-align: center;
+    padding: 3em 0;
+}
+
+div.calGridNav {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
 div.calGridNav.bottom {
     display: none;
 }
 
+div.calGridNav > * {
+    flex-basis: 200px;
+}
+
+div.calGridNav > div.prev {
+    text-align: left;
+}
+
+div.calGridNav > div.month {
+    text-align: center;
+}
+
+div.calGridNav > div.next {
+    text-align: right;
+}
+
 @media screen and (max-width: 1000px) {
     div.calGrid {
         display: grid;
@@ -105,10 +132,4 @@ div.calGridNav.bottom {
     div.calGridNav.bottom {
         display: flex;
     }
-}
-
-div.calGridNav {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
 }
\ No newline at end of file
diff --git a/build.sh b/build.sh
index fccac5a5..4078651e 100644
--- a/build.sh
+++ b/build.sh
@@ -50,6 +50,7 @@ echo "Internationalization..."
 cp -r ./i18n ./build/i18n
 php ./wp-cli.phar i18n make-json ./build/i18n
 php ./wp-cli.phar i18n make-mo ./build/i18n
+php ./wp-cli.phar i18n make-php ./build/i18n
 cp ./wpml-config.xml ./build/wpml-config.xml
 cp ./composer.json ./build/composer.json
 
diff --git a/i18n/TouchPoint-WP-es_ES.po b/i18n/TouchPoint-WP-es_ES.po
index 7923d1a1..8825cbc5 100644
--- a/i18n/TouchPoint-WP-es_ES.po
+++ b/i18n/TouchPoint-WP-es_ES.po
@@ -86,7 +86,7 @@ msgstr "Tipos de miembros de líder"
 #: src/templates/admin/invKoForm.php:65
 #: src/templates/admin/invKoForm.php:164
 #: src/templates/admin/invKoForm.php:180
-#: src/templates/admin/invKoForm.php:334
+#: src/templates/admin/invKoForm.php:335
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Meeting.php:801
 #: src/TouchPoint-WP/Rsvp.php:77
@@ -168,7 +168,7 @@ msgstr "Grupo Pequeño"
 msgid "Small Groups"
 msgstr "Grupos Pequeños"
 
-#: src/templates/admin/invKoForm.php:461
+#: src/templates/admin/invKoForm.php:462
 msgid "Select..."
 msgstr "Seleccione..."
 
@@ -185,8 +185,8 @@ msgstr "No se encontraron %s"
 msgid "%s will be imported overnight for the first time."
 msgstr "%s se importarán durante la noche por primera vez."
 
-#: src/TouchPoint-WP/Auth.php:408
-#: src/TouchPoint-WP/Auth.php:416
+#: src/TouchPoint-WP/Auth.php:407
+#: src/TouchPoint-WP/Auth.php:415
 msgid "Your login token is invalid."
 msgstr "Su token de inicio de sesión no es válido."
 
@@ -275,7 +275,7 @@ msgid "Join"
 msgstr "Únete"
 
 #: src/TouchPoint-WP/Involvement.php:4081
-#: src/TouchPoint-WP/Partner.php:1357
+#: src/TouchPoint-WP/Partner.php:1361
 msgid "Show on Map"
 msgstr "Muestra en el mapa"
 
@@ -285,7 +285,7 @@ msgstr "Muestra en el mapa"
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr "Los %1$s enumerados son solo los que se muestran en el mapa, así como todos los %2$s."
 
-#: src/TouchPoint-WP/Partner.php:1297
+#: src/TouchPoint-WP/Partner.php:1301
 msgid "Not Shown on Map"
 msgstr "No se muestra en el mapa"
 
@@ -307,24 +307,24 @@ msgstr "Contacta"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2251
+#: src/TouchPoint-WP/TouchPointWP.php:2249
 msgid "Unknown Type"
 msgstr "Tipo desconocido"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2308
+#: src/TouchPoint-WP/TouchPointWP.php:2306
 msgid "Your Searches"
 msgstr "Tus búsquedas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2311
+#: src/TouchPoint-WP/TouchPointWP.php:2309
 msgid "Public Searches"
 msgstr "Búsquedas públicas"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2314
+#: src/TouchPoint-WP/TouchPointWP.php:2312
 msgid "Status Flags"
 msgstr "Indicadores de Estado"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2319
-#: src/TouchPoint-WP/TouchPointWP.php:2320
+#: src/TouchPoint-WP/TouchPointWP.php:2317
+#: src/TouchPoint-WP/TouchPointWP.php:2318
 msgid "Current Value"
 msgstr "Valor actual"
 
@@ -341,7 +341,7 @@ msgstr "Configuración de API no válida o incompleta."
 msgid "Host appears to be missing from TouchPoint-WP configuration."
 msgstr "Parece que falta el host en la configuración de TouchPoint-WP."
 
-#: src/TouchPoint-WP/TouchPointWP.php:2534
+#: src/TouchPoint-WP/TouchPointWP.php:2532
 msgid "People Query Failed"
 msgstr "Consulta de registros de personas fallida"
 
@@ -787,7 +787,7 @@ msgid "TouchPoint-WP"
 msgstr "TouchPoint-WP"
 
 #: src/TouchPoint-WP/Settings.php:1450
-#: blocks/inv-list/index.js:112
+#: blocks/inv-list/index.js:110
 #: blocks/people-list/index.js:174
 msgid "Settings"
 msgstr "Ajustes"
@@ -1303,7 +1303,7 @@ msgid "Could not locate."
 msgstr "No se pudo localizar."
 
 #: src/TouchPoint-WP/Meeting.php:727
-#: src/TouchPoint-WP/TouchPointWP.php:1203
+#: src/TouchPoint-WP/TouchPointWP.php:1201
 msgid "Only GET requests are allowed."
 msgstr "Solo se permiten solicitudes GET."
 
@@ -1610,7 +1610,7 @@ msgstr "hoy"
 msgid "Tomorrow"
 msgstr "mañana"
 
-#: src/templates/admin/invKoForm.php:424
+#: src/templates/admin/invKoForm.php:425
 msgid "(named person)"
 msgstr "(persona nombrada)"
 
@@ -1811,7 +1811,7 @@ msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:279
+#: src/TouchPoint-WP/CalendarGrid.php:280
 #, php-format
 msgid "There are no %s published for this month."
 msgstr "No hay %s publicados para este mes."
@@ -1855,7 +1855,7 @@ msgid "This %s has been cancelled."
 msgstr "Este %s ha sido cancelado."
 
 #: src/templates/admin/invKoForm.php:212
-#: blocks/inv-list/index.js:129
+#: blocks/inv-list/index.js:127
 msgid "Division"
 msgstr "Division"
 
@@ -1922,12 +1922,12 @@ msgid "Allow the TouchPoint-WP developers to publicly list your site/church as u
 msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:140
+#: src/TouchPoint-WP/Auth.php:139
 #, php-format
 msgid "Sign in with %s"
 msgstr "Iniciar sesión con %s"
 
-#: src/TouchPoint-WP/Auth.php:447
+#: src/TouchPoint-WP/Auth.php:446
 msgid "No user account found."
 msgstr "No se encontró ninguna cuenta de usuario"
 
@@ -1939,7 +1939,7 @@ msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga
 msgid "Change Profile Links"
 msgstr "Cambiar enlaces de perfil"
 
-#: src/TouchPoint-WP/TouchPointWP.php:2510
+#: src/TouchPoint-WP/TouchPointWP.php:2508
 msgid "People Count Failed"
 msgstr "El recuento de personas falló"
 
@@ -1976,11 +1976,11 @@ msgstr "Lista de Participaciones"
 msgid "A list of Involvements from TouchPoint"
 msgstr "Una lista de participaciones de TouchPoint"
 
-#: blocks/inv-list/index.js:74
+#: blocks/inv-list/index.js:73
 msgid "All"
 msgstr "Todos"
 
-#: blocks/inv-list/index.js:120
+#: blocks/inv-list/index.js:118
 msgid "Post Type"
 msgstr "tipo de publicación"
 
@@ -1999,11 +1999,11 @@ msgstr "Una lista de participaciones de TouchPoint"
 msgid "None right now."
 msgstr "Nada por ahora"
 
-#: blocks/inv-list/index.js:115
+#: blocks/inv-list/index.js:113
 msgid "To use this block, import Involvements in the TouchPoint-WP settings."
 msgstr "Para utilizar este bloque, importe Involvements en la configuración de TouchPoint-WP."
 
-#: blocks/inv-list/index.js:142
+#: blocks/inv-list/index.js:140
 #: blocks/people-list/index.js:231
 msgid "Preview Only"
 msgstr "Solo vista previa"
@@ -2026,11 +2026,11 @@ msgstr "Solo se incluirán las participaciones de los campus seleccionados."
 msgid "This %s has already happened."
 msgstr "Este %s ya ha sucedido."
 
-#: blocks/inv-list/index.js:121
+#: blocks/inv-list/index.js:119
 msgid "These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings."
 msgstr "Estas opciones se basan en los tipos de entrada de «Involvement» que usted o su administrador han elegido importar en la configuración de TouchPoint-WP."
 
-#: blocks/inv-list/index.js:130
+#: blocks/inv-list/index.js:128
 msgid "This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings."
 msgstr "Esta opción le permite filtrar las participaciones que se muestran en esta lista, como, por ejemplo, limitarlas a un ministerio en particular. Estas opciones son aquellas que usted o su administrador configuraron como Divisiones para importarlas como taxonomías en los ajustes de TouchPoint-WP."
 
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index aaa96280..0580a66c 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-04-20T20:42:20+00:00\n"
+"POT-Creation-Date: 2026-04-21T16:55:08+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: TouchPoint-WP\n"
@@ -77,7 +77,7 @@ msgstr ""
 #: src/templates/admin/invKoForm.php:65
 #: src/templates/admin/invKoForm.php:164
 #: src/templates/admin/invKoForm.php:180
-#: src/templates/admin/invKoForm.php:334
+#: src/templates/admin/invKoForm.php:335
 #: src/templates/parts/involvement-nearby-list.php:2
 #: src/TouchPoint-WP/Meeting.php:801
 #: src/TouchPoint-WP/Rsvp.php:77
@@ -200,7 +200,7 @@ msgid "Default Filters"
 msgstr ""
 
 #: src/templates/admin/invKoForm.php:212
-#: blocks/inv-list/index.js:129
+#: blocks/inv-list/index.js:127
 msgid "Division"
 msgstr ""
 
@@ -261,11 +261,11 @@ msgstr ""
 msgid "Small Groups"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:424
+#: src/templates/admin/invKoForm.php:425
 msgid "(named person)"
 msgstr ""
 
-#: src/templates/admin/invKoForm.php:461
+#: src/templates/admin/invKoForm.php:462
 msgid "Select..."
 msgstr ""
 
@@ -362,17 +362,17 @@ msgid "The scripts on TouchPoint that interact with this plugin are out-of-date,
 msgstr ""
 
 #. translators: %s is "what you call TouchPoint at your church", which is a setting
-#: src/TouchPoint-WP/Auth.php:140
+#: src/TouchPoint-WP/Auth.php:139
 #, php-format
 msgid "Sign in with %s"
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:408
-#: src/TouchPoint-WP/Auth.php:416
+#: src/TouchPoint-WP/Auth.php:407
+#: src/TouchPoint-WP/Auth.php:415
 msgid "Your login token is invalid."
 msgstr ""
 
-#: src/TouchPoint-WP/Auth.php:447
+#: src/TouchPoint-WP/Auth.php:446
 msgid "No user account found."
 msgstr ""
 
@@ -383,7 +383,7 @@ msgid "%s is cancelled."
 msgstr ""
 
 #. Translators: %s is the plural name of the of the Meetings, such as "Events".
-#: src/TouchPoint-WP/CalendarGrid.php:279
+#: src/TouchPoint-WP/CalendarGrid.php:280
 #, php-format
 msgid "There are no %s published for this month."
 msgstr ""
@@ -559,7 +559,7 @@ msgid "Contact Leaders"
 msgstr ""
 
 #: src/TouchPoint-WP/Involvement.php:4081
-#: src/TouchPoint-WP/Partner.php:1357
+#: src/TouchPoint-WP/Partner.php:1361
 msgid "Show on Map"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgid "Unknown"
 msgstr ""
 
 #: src/TouchPoint-WP/Meeting.php:727
-#: src/TouchPoint-WP/TouchPointWP.php:1203
+#: src/TouchPoint-WP/TouchPointWP.php:1201
 msgid "Only GET requests are allowed."
 msgstr ""
 
@@ -677,7 +677,7 @@ msgstr ""
 msgid "The %1$s listed are only those shown on the map, as well as all %2$s."
 msgstr ""
 
-#: src/TouchPoint-WP/Partner.php:1297
+#: src/TouchPoint-WP/Partner.php:1301
 msgid "Not Shown on Map"
 msgstr ""
 
@@ -1353,7 +1353,7 @@ msgid "TouchPoint-WP"
 msgstr ""
 
 #: src/TouchPoint-WP/Settings.php:1450
-#: blocks/inv-list/index.js:112
+#: blocks/inv-list/index.js:110
 #: blocks/people-list/index.js:174
 msgid "Settings"
 msgstr ""
@@ -1533,32 +1533,32 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2251
+#: src/TouchPoint-WP/TouchPointWP.php:2249
 msgid "Unknown Type"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2308
+#: src/TouchPoint-WP/TouchPointWP.php:2306
 msgid "Your Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2311
+#: src/TouchPoint-WP/TouchPointWP.php:2309
 msgid "Public Searches"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2314
+#: src/TouchPoint-WP/TouchPointWP.php:2312
 msgid "Status Flags"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2319
-#: src/TouchPoint-WP/TouchPointWP.php:2320
+#: src/TouchPoint-WP/TouchPointWP.php:2317
+#: src/TouchPoint-WP/TouchPointWP.php:2318
 msgid "Current Value"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2510
+#: src/TouchPoint-WP/TouchPointWP.php:2508
 msgid "People Count Failed"
 msgstr ""
 
-#: src/TouchPoint-WP/TouchPointWP.php:2534
+#: src/TouchPoint-WP/TouchPointWP.php:2532
 msgid "People Query Failed"
 msgstr ""
 
@@ -2036,27 +2036,27 @@ msgstr ""
 msgid "Loading Preview..."
 msgstr ""
 
-#: blocks/inv-list/index.js:74
+#: blocks/inv-list/index.js:73
 msgid "All"
 msgstr ""
 
-#: blocks/inv-list/index.js:115
+#: blocks/inv-list/index.js:113
 msgid "To use this block, import Involvements in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:120
+#: blocks/inv-list/index.js:118
 msgid "Post Type"
 msgstr ""
 
-#: blocks/inv-list/index.js:121
+#: blocks/inv-list/index.js:119
 msgid "These options are based on the Involvement post types you or your administrator have chosen to import in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:130
+#: blocks/inv-list/index.js:128
 msgid "This option allows you to filter the involvements that are shown on this list, such as limiting to a particular ministry. These options are those that you or your administrator configured as Divisions to import as taxonomies in the TouchPoint-WP settings."
 msgstr ""
 
-#: blocks/inv-list/index.js:142
+#: blocks/inv-list/index.js:140
 #: blocks/people-list/index.js:231
 msgid "Preview Only"
 msgstr ""
diff --git a/src/TouchPoint-WP/CalendarGrid.php b/src/TouchPoint-WP/CalendarGrid.php
index 1da88479..0df95ce1 100644
--- a/src/TouchPoint-WP/CalendarGrid.php
+++ b/src/TouchPoint-WP/CalendarGrid.php
@@ -275,9 +275,12 @@ public function __construct(WP_Query $q, ?int $month = null, ?int $year = null)
 		if ($this->eventCount > 0) {
 			$this->html = $r;
 		} else {
-			// Translators: %s is the plural name of the of the Meetings, such as "Events".
-			$message = wp_sprintf(__("There are no %s published for this month.", "TouchPoint-WP"), TouchPointWP::instance()->settings->mc_name_plural);
-			$this->html = "<div class=\"calGrid noEvents\">$message</div>";
+			$message = wp_sprintf(
+				// Translators: %s is the plural name of the of the Meetings, such as "Events".
+				__("There are no %s published for this month.", "TouchPoint-WP"),
+				strtolower(__(TouchPointWP::instance()->settings->mc_name_plural, 'TouchPoint-WP'))
+			);
+			$this->html = "<div class=\"calGridEmpty noEvents\">$message</div>";
 		}
 
 		$this->next = DateTimeImmutable::createFromMutable($lastDayOfMonth);

From 986b51ce4f93d8113ee4cfb2f03876bd5daedbce Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 21 Apr 2026 13:11:37 -0400
Subject: [PATCH 420/423] Translation loading issue.  Closes #245.

---
 build.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build.sh b/build.sh
index 4078651e..d3a7c3ce 100644
--- a/build.sh
+++ b/build.sh
@@ -47,6 +47,14 @@ echo "Build blocks..."
 npm run build-blocks
 
 echo "Internationalization..."
+
+# download wp-cli if not already downloaded
+if [ ! -f wp-cli.phar ]; then
+  echo "Downloading WP-CLI..."
+  curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+  chmod +x wp-cli.phar
+fi
+
 cp -r ./i18n ./build/i18n
 php ./wp-cli.phar i18n make-json ./build/i18n
 php ./wp-cli.phar i18n make-mo ./build/i18n

From 18f21779604dbbac4da8c209cea3b941665bb70a Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Sun, 26 Apr 2026 11:17:20 -0400
Subject: [PATCH 421/423] Catch situations where a WP_Error is returned from
 POST call.

---
 src/TouchPoint-WP/Auth.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php
index 097b1d48..2e0802a9 100644
--- a/src/TouchPoint-WP/Auth.php
+++ b/src/TouchPoint-WP/Auth.php
@@ -403,6 +403,10 @@ public static function authenticate(WP_Error|WP_User|null $user, mixed $username
 				return $e->toWpError();
 			}
 
+			if (is_wp_error($r)) {
+				return $r;
+			}
+
 			if ($r['response']['code'] !== Http::OK) {
 				$e = new TouchPointWP_Exception(__('Your login token is invalid.', 'TouchPoint-WP'), 177003);
 				return $e->toWpError();

From 0d3aa2fb17c7850bba85204f66e743fb44b4b984 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Tue, 28 Apr 2026 12:15:49 -0400
Subject: [PATCH 422/423] Spacing.  Closes #249

---
 assets/template/block-preview-style.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/assets/template/block-preview-style.css b/assets/template/block-preview-style.css
index 731b5bd5..4fc281dd 100644
--- a/assets/template/block-preview-style.css
+++ b/assets/template/block-preview-style.css
@@ -18,4 +18,10 @@
 
 .tp-preview-block:hover::before {
     opacity: 1;
+}
+
+/* compensates for margin on person list */
+.person-list.tp-preview-block::before {
+    left: 0;
+    right: 0;
 }
\ No newline at end of file

From d9297054115386c22c97b29f90764cf3363446a2 Mon Sep 17 00:00:00 2001
From: "James K." <jkrrv@jkrrv.org>
Date: Wed, 29 Apr 2026 12:43:46 -0400
Subject: [PATCH 423/423] Correcting a scoping and formatting issue.  Possibly
 related to #236.

---
 assets/js/base-defer.js                         | 4 ++--
 src/templates/parts/involvement-nearby-list.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/base-defer.js b/assets/js/base-defer.js
index 59ce3ca3..e5e51a48 100644
--- a/assets/js/base-defer.js
+++ b/assets/js/base-defer.js
@@ -1133,7 +1133,7 @@
                 if (response.error !== undefined) {
                     if (response.geo === false) {
                         if (navigator.geolocation && location.protocol === 'https:') {
-                            tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP') + "<br /><a href=\"javascript:TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>");
+                            tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP') + "<br /><a href=\"javascript:tpvm.TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>");
                         } else {
                             tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP'));
                         }
@@ -1143,7 +1143,7 @@
                 } else if (response.geo?.human !== undefined) {
                     let label = response.geo.human;
                     if (response.geo.type === "ip" && navigator.geolocation && location.protocol === 'https:') {
-                        label += "<br /><a href=\"javascript:TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>";
+                        label += "<br /><a href=\"javascript:tpvm.TP_DataGeo.geoByNavigator();\" onclick=\"tpvm._utils.ga('send', 'event', 'tp', 'permission', 'Device Location');\">" + __("Click here to use your actual location.", 'TouchPoint-WP') + "</a>";
                     }
                     tpvm._invNear.labelStr(label);
                 } else {
diff --git a/src/templates/parts/involvement-nearby-list.php b/src/templates/parts/involvement-nearby-list.php
index 676182ba..ea634148 100644
--- a/src/templates/parts/involvement-nearby-list.php
+++ b/src/templates/parts/involvement-nearby-list.php
@@ -8,7 +8,7 @@
         </h3>
         <p><small>
             <span data-bind="text: wp.i18n.sprintf('<?php /* translators: number of miles */ _ex("%2.1fmi", "miles. Unit is appended to a number.  %2.1f is the number, so %2.1fmi looks like '12.3mi'", 'TouchPoint-WP'); ?>', distance)"></span> &sdot;
-            <span data-bind="text: schedule"></span>
+            <span data-bind="html: schedule"></span>
         </small></p>
     </div>
     <!-- /ko -->