Changeset 1836044

Timestamp:

03/08/2018 08:52:27 AM (7 years ago)

Author:

litefeel

Message:

auto deploy from deploy2wp:https://github.com/litefeel/deploy2wp

Location:

writing-on-github/trunk

Files:

• lib/controller.php (modified) (1 diff)
• lib/import.php (modified) (1 diff)
• lib/payload.php (modified) (3 diffs)
• lib/request.php (modified) (2 diffs)
• readme.txt (modified) (4 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/ClassLoader.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (5 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• writing-on-github.php (modified) (1 diff)

writing-on-github/trunk/lib/controller.php

@@ -58 +58 @@
             return $this->app->response()->error( new WP_Error(
                 'invalid_headers',
-                __( 'Failed to validate webhook event.', 'writing-on-github' )
+                sprintf( 'Failed to validate webhook event: %s.',
+                    $this->app->request()->webhook_event() )
             ) );
         }
         $payload = $this->app->request()->payload();
 
-        if ( ! $payload->should_import() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_payload',
-                sprintf(
-                    __( "%s won't be imported.", 'writing-on-github' ),
-                    strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
-                )
-            ) );
+        $error = $payload->should_import();
+        if ( is_wp_error( $error ) ) {
+            /*　@var WP_Error $error */
+            return $this->app->response()->error( $error );
         }
 

writing-on-github/trunk/lib/import.php

@@ -302 +302 @@
             if ( array_key_exists( 'ID', $meta ) ) {
                 $id = $args['ID'] = $meta['ID'];
-                $blob->set_id($id);
+                $blob->set_id( $id );
                 unset( $meta['ID'] );
+            }
+
+            if ( array_key_exists( 'post_date', $meta ) ) {
+                if ( empty( $meta['post_date'] ) ) {
+                    $meta['post_date'] = current_time( 'mysql' );
+                }
+
+                $args['post_date'] = $meta['post_date'];
+                unset( $meta['post_date'] );
             }
         }

writing-on-github/trunk/lib/payload.php

@@ -38 +38 @@
      * Returns whether payload should be imported.
      *
-     * @return bool
+     * @return true|WP_Error
      */
     public function should_import() {
         // @todo how do we get this without importing the whole api object just for this?
         if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
-            return false;
+            return new WP_Error(
+                'incorrect_repository',
+                sprintf( 'Incorrect repository, %s -> %s .',
+                    $this->data->repository->full_name,
+                    $this->app->api()->fetch()->repository()
+                )
+            );
         }
 
@@ -53 +59 @@
 
         if ( $branch !== $payload_branch ) {
-            return false;
+            return new WP_Error(
+                'incorrect_branch',
+                sprintf( 'Incorrect branch, %s -> %s .',
+                    $payload_branch,
+                    $branch
+                )
+            );
         }
 
@@ -64 +76 @@
 
         if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
-            return false;
+            return new WP_Error(
+                'skip_import',
+                'Skip import on auto export post.'
+            );
         }
 
         if ( ! $this->get_commit_id() ) {
-            return false;
+            return new WP_Error(
+                'invalid_payload',
+                "[Missing Commit ID] won't be imported."
+            );
         }
 

writing-on-github/trunk/lib/request.php

@@ -68 +68 @@
      */
     public function is_ping() {
-        $headers = $this->headers();
-
-        $event = $headers['X-Github-Event'];
-        return 'ping' == $event;
+        return 'ping' == $this->webhook_event();
     }
 
@@ -79 +76 @@
      */
     public function is_push() {
+        return 'push' == $this->webhook_event();
+    }
+
+    /**
+     * Return X-Github-Event in headers.
+     * @return string
+     */
+    public function webhook_event() {
         $headers = $this->headers();
-
-        $event = $headers['X-Github-Event'];
-        return 'push' == $event;
+        return $headers['X-Github-Event'];
     }
 

writing-on-github/trunk/readme.txt

@@ -6 +6 @@
 Donate link: https://www.paypal.me/litefeel  
 Requires at least: 3.9  
-Tested up to: 4.8.1  
-Stable tag: 1.7  
+Tested up to: 4.9.4  
+Stable tag: 1.8  
 License: GPLv2  
 License URI: http://www.gnu.org/licenses/gpl-2.0.html  
@@ -101 +101 @@
     post_title: 'Post Title'
     post_name: 'this is post name'
+    post_date: '2018-03-07 15:21:26'
     layout: post_type_probably_post
     published: true_or_false
@@ -135 +136 @@
 == Changelog ==
 
+= 1.8 =
+
+* Apply post_date from github
+* Friendly error message when validate webhook event
+* Friendly error message when can not import
+
 = 1.7 =
 
@@ -198 +205 @@
   [1.6.1]: https://github.com/litefeel/writing-on-github/releases/tag/1.6.1
   [1.7]: https://github.com/litefeel/writing-on-github/releases/tag/1.7
+  [1.8]: https://github.com/litefeel/writing-on-github/releases/tag/1.8

writing-on-github/trunk/vendor/autoload.php

@@ -5 +5 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitdceed942811feb8a045169f778363db6::getLoader();
+return ComposerAutoloaderInit4cd77128cdef6e0cbb9a7016878f8015::getLoader();

writing-on-github/trunk/vendor/composer/ClassLoader.php

@@ -380 +380 @@
                 $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        $length = $this->prefixLengthsPsr4[$first][$search];
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir . $pathEnd)) {
                             return $file;
                         }

writing-on-github/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitdceed942811feb8a045169f778363db6
+class ComposerAutoloaderInit4cd77128cdef6e0cbb9a7016878f8015
 {
     private static $loader;
@@ -20 +20 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitdceed942811feb8a045169f778363db6', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4cd77128cdef6e0cbb9a7016878f8015', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitdceed942811feb8a045169f778363db6', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4cd77128cdef6e0cbb9a7016878f8015', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
@@ -28 +28 @@
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitdceed942811feb8a045169f778363db6::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit4cd77128cdef6e0cbb9a7016878f8015::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
@@ -49 +49 @@
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitdceed942811feb8a045169f778363db6::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit4cd77128cdef6e0cbb9a7016878f8015::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiredceed942811feb8a045169f778363db6($fileIdentifier, $file);
+            composerRequire4cd77128cdef6e0cbb9a7016878f8015($fileIdentifier, $file);
         }
 
@@ -61 +61 @@
 }
 
-function composerRequiredceed942811feb8a045169f778363db6($fileIdentifier, $file)
+function composerRequire4cd77128cdef6e0cbb9a7016878f8015($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

writing-on-github/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitdceed942811feb8a045169f778363db6
+class ComposerStaticInit4cd77128cdef6e0cbb9a7016878f8015
 {
     public static $files = array (
@@ -35 +35 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitdceed942811feb8a045169f778363db6::$classMap;
+            $loader->classMap = ComposerStaticInit4cd77128cdef6e0cbb9a7016878f8015::$classMap;
 
         }, null, ClassLoader::class);

writing-on-github/trunk/writing-on-github.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/litefeel/writing-on-github
  * Description: A WordPress plugin to allow you writing on GitHub (or Jekyll site).
- * Version: 1.7
+ * Version: 1.8
  * Author:  litefeel
  * Author URI: https://www.litefeel.com