Merge branch 'develop' into feature/activitystreams

app/Services/NoteService.php

@@ -37,7 +37,7 @@ class NoteService
         );
 
         if (array_key_exists('published', $data) && empty($data['published']) === false) {
-            $carbon = new \Carbon\Carbon($data['published']);
+            $carbon = carbon($data['published']);
             $note->created_at = $note->updated_at = $carbon->toDateTimeString();
         }
 

app/WebMention.php

@@ -5,7 +5,6 @@ namespace App;
 use Cache;
 use Twitter;
 use HTMLPurifier;
-use Carbon\Carbon;
 use HTMLPurifier_Config;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Database\Eloquent\Model;
@@ -63,10 +62,9 @@ class WebMention extends Model
     public function getPublishedAttribute()
     {
         $microformats = json_decode($this->mf2, true);
-        $carbon = new Carbon();
         if (isset($microformats['items'][0]['properties']['published'][0])) {
             try {
-                $published = $carbon->parse(
+                $published = carbon()->parse(
                     $microformats['items'][0]['properties']['published'][0]
                 )->toDayDateTimeString();
             } catch (\Exception $exception) {

helpers.php

@@ -204,3 +204,10 @@ if (! function_exists('prettyPrintJson')) {
         return str_replace("\t", '    ', $result);
     }
 }
+
+// sourced from https://twitter.com/jrubsc/status/907776591320764416/photo/1
+if (! function_exists('carbon')) {
+    function carbon(...$args) {
+        return new Carbon\Carbon(...$args);
+    }
+}