diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php index e14047830..f8aeb5c0a 100644 --- a/app/Jobs/LikePipeline/LikePipeline.php +++ b/app/Jobs/LikePipeline/LikePipeline.php @@ -69,19 +69,13 @@ class LikePipeline implements ShouldQueue $notification->profile_id = $status->profile_id; $notification->actor_id = $actor->id; $notification->action = 'like'; - $notification->message = $like->toText(); - $notification->rendered = $like->toHtml(); + $notification->message = $like->toText($status->in_reply_to_id ? 'comment' : 'post'); + $notification->rendered = $like->toHtml($status->in_reply_to_id ? 'comment' : 'post'); $notification->item_id = $status->id; $notification->item_type = "App\Status"; $notification->save(); - Cache::forever('notification.'.$notification->id, $notification); - - $redis = Redis::connection(); - $key = config('cache.prefix').':user.'.$status->profile_id.'.notifications'; - $redis->lpush($key, $notification->id); } catch (Exception $e) { - Log::error($e); } } } diff --git a/app/Like.php b/app/Like.php index 94d8d57b9..8b45b60cb 100644 --- a/app/Like.php +++ b/app/Like.php @@ -27,19 +27,20 @@ class Like extends Model return $this->belongsTo(Status::class); } - public function toText() + public function toText($type = 'post') { $actorName = $this->actor->username; + $msg = $type == 'post' ? __('notification.likedPhoto') : __('notification.likedComment'); - return "{$actorName} ".__('notification.likedPhoto'); + return "{$actorName} ".$msg; } - public function toHtml() + public function toHtml($type = 'post') { $actorName = $this->actor->username; $actorUrl = $this->actor->url(); + $msg = $type == 'post' ? __('notification.likedPhoto') : __('notification.likedComment'); - return "{$actorName} ". - __('notification.likedPhoto'); + return "{$actorName} ".$msg; } } diff --git a/resources/lang/en/notification.php b/resources/lang/en/notification.php index d737167ae..2478224f8 100644 --- a/resources/lang/en/notification.php +++ b/resources/lang/en/notification.php @@ -2,7 +2,8 @@ return [ - 'likedPhoto' => 'liked your photo.', + 'likedPhoto' => 'liked your post.', + 'likedComment' => 'liked your comment.', 'startedFollowingYou' => 'started following you.', 'commented' => 'commented on your post.', 'mentionedYou' => 'mentioned you.',