Refactor XML-RPC logic

Author: Jacob Middag

src/class-tiny-settings.php

@@ -30,9 +30,16 @@ class Tiny_Settings extends Tiny_WP_Base {
     public function __construct() {
         parent::__construct();
         $this->notices = new Tiny_Notices();
+    }
+
+    private function init_compressor() {
+        $this->compressor = Tiny_Compress::get_compressor($this->get_api_key(), $this->get_method('after_compress_callback'));
+    }
 
-        if(defined('XMLRPC_REQUEST') && XMLRPC_REQUEST && $this->get_api_key()) {
-            $this->compressor = Tiny_Compress::get_compressor($this->get_api_key(), $this->get_method('after_compress_callback'));
+    public function xmlrpc_init() {
+        try {
+            $this->init_compressor();
+        } catch (Tiny_Exception $e) {
         }
     }
 
@@ -42,8 +49,8 @@ public function admin_init() {
                 self::translate_escape('Please fill in an API key to start compressing images'));
             $this->notices->show('setting', $link, 'error', false);
         }
-        try {
-            $this->compressor = Tiny_Compress::get_compressor($this->get_api_key(), $this->get_method('after_compress_callback'));
+         try {
+            $this->init_compressor();
         } catch (Tiny_Exception $e) {
             $this->notices->show('compressor_exception', self::translate_escape($e->getMessage()), 'error', false);
         }

src/class-tiny-wp-base.php

@@ -42,6 +42,10 @@ public static function check_wp_version($version) {
         return floatval(self::wp_version()) >= $version;
     }
 
+    protected function is_xmlrpc_request() {
+        return defined('XMLRPC_REQUEST') && XMLRPC_REQUEST;
+    }
+
     public static function plugin_version() {
         if (is_null(self::$plugin_version)) {
             $plugin_data = get_plugin_data(dirname(__FILE__) . '/../tiny-compress-images.php');
@@ -68,7 +72,9 @@ protected static function translate_escape($phrase) {
 
     public function __construct() {
         add_action('init', $this->get_method('init'));
-        if (is_admin()) {
+        if (self::is_xmlrpc_request()) {
+            add_action('init', $this->get_method('xmlrpc_init'));
+        } elseif (is_admin()) {
             add_action('admin_init', $this->get_method('admin_init'));
         }
     }