Options API

darrenjacoby · Jun 28, 2021 · d5ee647 · d5ee647
1 parent 883d7dc
commit d5ee647
Show file tree

Hide file tree

Showing 12 changed files with 410 additions and 536 deletions.
diff --git a/src/Admin/SharedApi.php b/src/Admin/SharedApi.php
@@ -76,8 +76,7 @@ public function __construct($key = false, $config = false)
     public function router()
     {
         if ($this->config->has($this->key)) {
-            Router::set($this->key)
-                ->route($this->config->get($this->key));
+            Router::set($this->key)->route($this->config->get($this->key));
         }
     }
 

diff --git a/src/Admin/Support/BlockEditor.php b/src/Admin/Support/BlockEditor.php
@@ -34,6 +34,10 @@ public static function set($config = false)
     public function __construct($config = false)
     {
         add_action('enqueue_block_assets', function () use ($config) {
+            if (!is_admin()) {
+                return;
+            }
+
             if (wp_script_is('intervention-block-editor', 'registered')) {
                 return;
             }

diff --git a/src/Application/Discussion.php b/src/Application/Discussion.php
@@ -2,7 +2,7 @@
 
 namespace Sober\Intervention\Application;
 
-use Sober\Intervention\Application\Support\Element;
+use Sober\Intervention\Application\OptionsApi;
 use Sober\Intervention\Application\Support\Comments;
 use Sober\Intervention\Support\Arr;
 
@@ -14,7 +14,6 @@
  * @since 2.0.0
  *
  * @link https://developer.wordpress.org/reference/hooks/init/
- * @link https://developer.wordpress.org/reference/functions/update_option/
  *
  * @param
  * [
@@ -48,6 +47,7 @@
 class Discussion
 {
     protected $config;
+    protected $api;
 
     /**
      * Initialize
@@ -57,6 +57,7 @@ class Discussion
     public function __construct($config = false)
     {
         $this->config = Arr::normalize($config);
+        $this->api = OptionsApi::set($this->config);
         $this->hook();
     }
 
@@ -93,228 +94,56 @@ protected function hook()
             Comments::remove();
         }
 
-        add_action('init', [$this, 'discussion']);
-        add_action('admin_head-options-discussion.php', [$this, 'admin']);
+        add_action('init', [$this, 'options']);
+        add_action('admin_head-options-discussion.php', [$this->api, 'disableKeys']);
     }
 
     /**
-     * Discussion
+     * Options
      */
-    public function discussion()
+    public function options()
     {
-        // Post
+        $this->api->saveKeys([
+            'discussion.post.ping-flag',
+            'discussion.comments.name-email',
+            'discussion.comments.registration',
+            'discussion.comments.close',
+            'discussion.comments.close.days',
+            'discussion.comments.cookies',
+            'discussion.comments.thread',
+            'discussion.comments.thread.depth',
+            'discussion.comments.pages',
+            'discussion.comments.pages.per-page',
+            'discussion.comments.pages.default',
+            'discussion.comments.order',
+            'discussion.emails.comment',
+            'discussion.emails.moderation',
+            'discussion.moderation.approve-manual',
+            'discussion.moderation.approve-previous',
+            'discussion.moderation.queue-links',
+            'discussion.moderation.queue-keys',
+            'discussion.moderation.disallowed-keys',
+            'discussion.avatars',
+            'discussion.avatars.rating',
+            'discussion.avatars.default',
+        ]);
+
+        /*
         if ($this->config->has('discussion.post.ping-flag')) {
-            update_option('default_pingback_flag', $this->config->get('discussion.post.ping-flag'));
+            $this->api->save('discussion.post.ping-flag', $this->config->get('discussion.post.ping-flag'));
         }
+        */
 
         if ($this->config->has('discussion.post.ping-status')) {
             $value = $this->config->get('discussion.post.ping-status');
             $value = $value === true ? 'open' : 'closed';
-            update_option('default_ping_status', $value);
+            $this->api->save('discussion.post.ping-status', $value);
         }
 
         if ($this->config->has('discussion.post.comments')) {
             $value = $this->config->get('discussion.post.comments');
             $value = $value === true ? 'open' : 'closed';
-            update_option('default_comment_status', $value);
-        }
-
-        // Comments
-        if ($this->config->has('discussion.comments.name-email')) {
-            update_option('require_name_email', $this->config->get('discussion.comments.name-email'));
-        }
-
-        if ($this->config->has('discussion.comments.registration')) {
-            update_option('comment_registration', $this->config->get('discussion.comments.registration'));
-        }
-
-        if ($this->config->has('discussion.comments.close')) {
-            update_option('close_comments_for_old_posts', $this->config->get('discussion.comments.close'));
-        }
-
-        if ($this->config->has('discussion.comments.close.days')) {
-            update_option('close_comments_days_old', $this->config->get('discussion.comments.close.days'));
-        }
-
-        if ($this->config->has('discussion.comments.cookies')) {
-            update_option('show_comments_cookies_opt_in', $this->config->get('discussion.comments.cookies'));
-        }
-
-        if ($this->config->has('discussion.comments.thread')) {
-            update_option('thread_comments', $this->config->get('discussion.comments.thread'));
-        }
-
-        if ($this->config->has('discussion.comments.thread.depth')) {
-            update_option('thread_comments_depth', $this->config->get('discussion.comments.thread.depth'));
-        }
-
-        if ($this->config->has('discussion.comments.pages')) {
-            update_option('page_comments', $this->config->get('discussion.comments.pages'));
-        }
-
-        if ($this->config->has('discussion.comments.pages.per-page')) {
-            update_option('comments_per_page', $this->config->get('discussion.comments.pages.per-page'));
-        }
-
-        if ($this->config->has('discussion.comments.pages.default')) {
-            update_option('default_comments_page', $this->config->get('discussion.comments.pages.default'));
-        }
-
-        if ($this->config->has('discussion.comments.order')) {
-            update_option('comment_order', $this->config->get('discussion.comments.order'));
-        }
-
-        // Emails
-        if ($this->config->has('discussion.emails.comment')) {
-            update_option('comments_notify', $this->config->get('discussion.emails.comment'));
-        }
-
-        if ($this->config->has('discussion.emails.moderation')) {
-            update_option('moderation_notify', $this->config->get('discussion.emails.moderation'));
-        }
-
-        // Moderation/Approve
-        if ($this->config->has('discussion.moderation.approve-manual')) {
-            update_option('comment_moderation', $this->config->get('discussion.moderation.approve-manual'));
-        }
-
-        if ($this->config->has('discussion.moderation.approve-previous')) {
-            update_option('comment_previously_approved', $this->config->get('discussion.moderation.approve-previous'));
-        }
-
-        // Moderation/Queue
-        if ($this->config->has('discussion.moderation.queue-links')) {
-            update_option('comment_max_links', $this->config->get('discussion.moderation.queue-links'));
-        }
-
-        if ($this->config->has('discussion.moderation.queue-keys')) {
-            update_option('moderation_keys', $this->config->get('discussion.moderation.queue-keys'));
-        }
-
-        // Moderation/Disallowed Keys
-        if ($this->config->has('discussion.moderation.disallowed-keys')) {
-            update_option('disallowed_keys', $this->config->get('discussion.moderation.disallowed-keys'));
-        }
-
-        /**
-         * Avatars
-         */
-        if ($this->config->has('discussion.avatars')) {
-            update_option('show_avatars', $this->config->get('discussion.avatars'));
-        }
-
-        if ($this->config->has('discussion.avatars.rating')) {
-            update_option('avatar_rating', $this->config->get('discussion.avatars.rating'));
-        }
-
-        if ($this->config->has('discussion.avatars.default')) {
-            update_option('avatar_default', $this->config->get('discussion.avatars.default'));
-        }
-    }
-
-    public function admin()
-    {
-        // Post
-        if ($this->config->has('discussion.post.ping-flag')) {
-            Element::disabled('#default_pingback_flag');
-        }
-
-        if ($this->config->has('discussion.post.ping-status')) {
-            Element::disabled('#default_ping_status');
-        }
-
-        if ($this->config->has('discussion.post.comments')) {
-            Element::disabled('#default_comment_status');
-        }
-
-        // Comments
-        if ($this->config->has('discussion.comments.name-email')) {
-            Element::disabled('#require_name_email');
-        }
-
-        if ($this->config->has('discussion.comments.registration')) {
-            Element::disabled('#comment_registration');
-        }
-
-        if ($this->config->has('discussion.comments.close')) {
-            Element::disabled('#close_comments_for_old_posts');
-        }
-
-        if ($this->config->has('discussion.comments.close.days')) {
-            Element::disabled('#close_comments_days_old');
-        }
-
-        if ($this->config->has('discussion.comments.cookies')) {
-            Element::disabled('#show_comments_cookies_opt_in');
-        }
-
-        if ($this->config->has('discussion.comments.thread')) {
-            Element::disabled('#thread_comments');
-        }
-
-        if ($this->config->has('discussion.comments.thread.depth')) {
-            Element::disabled('#thread_comments_depth');
-        }
-
-        if ($this->config->has('discussion.comments.pages')) {
-            Element::disabled('#page_comments');
-        }
-
-        if ($this->config->has('discussion.comments.pages.per-page')) {
-            Element::disabled('#comments_per_page');
-        }
-
-        if ($this->config->has('discussion.comments.pages.default')) {
-            Element::disabled('#default_comments_page');
-        }
-
-        if ($this->config->has('discussion.comments.order')) {
-            Element::disabled('#comment_order');
-        }
-
-        // Emails
-        if ($this->config->has('discussion.emails.comment')) {
-            Element::disabled('#comments_notify');
-        }
-
-        if ($this->config->has('discussion.emails.moderation')) {
-            Element::disabled('#moderation_notify');
-        }
-
-        // Moderation/Approve
-        if ($this->config->has('discussion.moderation.approve-manual')) {
-            Element::disabled('#comment_moderation');
-        }
-
-        if ($this->config->has('discussion.moderation.approve-previous')) {
-            Element::disabled('#comment_previously_approved');
-        }
-
-        // Moderation/Queue
-        if ($this->config->has('discussion.moderation.queue-links')) {
-            Element::disabled('#comment_max_links');
-        }
-
-        if ($this->config->has('discussion.moderation.queue-keys')) {
-            Element::disabled('#moderation_keys');
-        }
-
-        // Moderation/Disallowed Keys
-        if ($this->config->has('discussion.moderation.disallowed-keys')) {
-            Element::disabled('#disallowed_keys');
-        }
-
-        // Avatars
-        if ($this->config->has('discussion.avatars')) {
-            Element::disabled('#show_avatars');
-        }
-
-        if ($this->config->has('discussion.avatars.rating')) {
-            Element::disabled('.avatar-settings:nth-child(2) fieldset');
-        }
-
-        if ($this->config->has('discussion.avatars.default')) {
-            Element::disabled('.avatar-settings:nth-child(3) fieldset');
+            $this->api->save('discussion.post.comments', $value);
         }
     }
 }