Merge pull request #2494 from pixelfed/staging

Staging

CHANGELOG.md

@@ -132,6 +132,8 @@
 - Updated ComposeModal, fix filter bug on safari. ([8e3e7586](https://github.com/pixelfed/pixelfed/commit/8e3e7586))
 - Updated StatusStatelessController, remove unused attributes. ([d0d46807](https://github.com/pixelfed/pixelfed/commit/d0d46807))
 - Updated Profile, fix follower counter bug. ([d06bec9c](https://github.com/pixelfed/pixelfed/commit/d06bec9c))
+- Updated NotificationTransformer, add missing types. ([3a428366](https://github.com/pixelfed/pixelfed/commit/3a428366))
+- Updated StatusService, fix json bug. ([1ea2db74](https://github.com/pixelfed/pixelfed/commit/1ea2db74))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added

app/Services/StatusService.php

@@ -2,9 +2,11 @@
 
 namespace App\Services;
 
-use Redis;
+use Illuminate\Support\Facades\Redis;
 use App\Status;
+//use App\Transformer\Api\v3\StatusTransformer;
 use App\Transformer\Api\StatusStatelessTransformer;
+use App\Transformer\Api\StatusTransformer;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -15,7 +17,7 @@ class StatusService {
 
 	public static function get($id)
 	{
-		return Redis::get(self::CACHE_KEY . $id) ?? self::coldGet($id);
+		return json_decode(Redis::get(self::CACHE_KEY . $id) ?? self::coldGet($id));
 	}
 
 	public static function coldGet($id)

app/Transformer/Api/Mastodon/v1/NotificationTransformer.php

@@ -47,12 +47,14 @@ class NotificationTransformer extends Fractal\TransformerAbstract
 	public function replaceTypeVerb($verb)
 	{
 		$verbs = [
+			'dm'	=> 'direct',
 			'follow' => 'follow',
 			'mention' => 'mention',
 			'share' => 'reblog',
 			'like' => 'favourite',
 			'comment' => 'mention',
-			'admin.user.modlog.comment' => 'modlog'
+			'admin.user.modlog.comment' => 'modlog',
+			'tagged' => 'tagged'
 		];
 		return $verbs[$verb];
 	}