Correct for Github payload differences

orphans · May 18, 2018 · c2f0a10 · c2f0a10
1 parent cde1eee
commit c2f0a10
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/http/GitDeployController.php b/src/http/GitDeployController.php
@@ -218,6 +218,12 @@ public function gitHook(Request $request)
                 $postdata['commits'][$commit_key]['human_date'] = $date_str;
             }
 
+            // Standardise formats for Gitlab / Github payload differences
+            if (isset($postdata['pusher']) && !empty($postdata['pusher'])) {
+                $postdata['user_name'] = $postdata['pusher']['name'];
+                $postdata['user_email'] = $postdata['pusher']['email'];
+            }
+
             // Use package's own sender or the project default?
             $addressdata['sender_name'] = config('mail.from.name');
             $addressdata['sender_address'] = config('mail.from.address');