Merge pull request #1348 from jonnybarnes/develop

MTM Fix WebMentions

app/Console/Commands/UpdateWebmentionsRelationship.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Note;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class UpdateWebmentionsRelationship extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'webmentions:update-model-relationship';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update webmentions to relate to the correct note model class';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        DB::table('webmentions')
+            ->where('commentable_type', '=', 'App\Model\Note')
+            ->update(['commentable_type' => Note::class]);
+
+        $this->info('All webmentions updated to relate to the correct note model class');
+    }
+}

app/Jobs/ProcessWebMention.php

@@ -92,7 +92,7 @@ class ProcessWebMention implements ShouldQueue
         $webmention->source = $this->source;
         $webmention->target = $this->note->longurl;
         $webmention->commentable_id = $this->note->id;
-        $webmention->commentable_type = 'App\Model\Note';
+        $webmention->commentable_type = Note::class;
         $webmention->type = $type;
         $webmention->mf2 = json_encode($microformats);
         $webmention->save();