From 219362b415bb28621a18f37b894555c61df8d3f9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 12 Jan 2019 15:18:33 -0700 Subject: [PATCH] Update SharePipeline --- app/Jobs/SharePipeline/SharePipeline.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php index 8d72376cb..4e2fbce52 100644 --- a/app/Jobs/SharePipeline/SharePipeline.php +++ b/app/Jobs/SharePipeline/SharePipeline.php @@ -19,6 +19,13 @@ class SharePipeline implements ShouldQueue protected $like; + /** + * Delete the job if its models no longer exist. + * + * @var bool + */ + public $deleteWhenMissingModels = true; + /** * Create a new job instance. * @@ -45,10 +52,10 @@ class SharePipeline implements ShouldQueue return; } - $exists = Notification::whereProfileId($status->profile_id) - ->whereActorId($actor->id) - ->whereAction('like') - ->whereItemId($status->id) + $exists = Notification::whereProfileId($target->id) + ->whereActorId($status->profile_id) + ->whereAction('share') + ->whereItemId($status->in_reply_to_id) ->whereItemType('App\Status') ->count(); @@ -57,10 +64,12 @@ class SharePipeline implements ShouldQueue } try { + $text = "{$actor->username} " . __('notification.likedPhoto'); + $html = ''; $notification = new Notification(); $notification->profile_id = $status->profile_id; $notification->actor_id = $actor->id; - $notification->action = 'like'; + $notification->action = 'share'; $notification->message = $like->toText(); $notification->rendered = $like->toHtml(); $notification->item_id = $status->id;