Update NotificationTransformer, fix mediaTag and modLog types

pixelfed · Nov 18, 2022 · b6c06c4 · b6c06c4
1 parent 8665eab
commit b6c06c4
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/app/Transformer/Api/NotificationTransformer.php b/app/Transformer/Api/NotificationTransformer.php
@@ -32,18 +32,22 @@ public function transform(Notification $notification)
 
 		if($n->item_id && $n->item_type == 'App\ModLog') {
 			$ml = $n->item;
-			$res['modlog'] = [
-				'id' => $ml->object_uid,
-				'url' => url('/i/admin/users/modlogs/' . $ml->object_uid)
-			];
+			if($ml && $ml->object_uid) {
+				$res['modlog'] = [
+					'id' => $ml->object_uid,
+					'url' => url('/i/admin/users/modlogs/' . $ml->object_uid)
+				];
+			}
 		}
 
 		if($n->item_id && $n->item_type == 'App\MediaTag') {
 			$ml = $n->item;
-			$res['tagged'] = [
-				'username' => $ml->tagged_username,
-				'post_url' => '/p/'.HashidService::encode($ml->status_id)
-			];
+			if($ml && $ml->tagged_username) {
+				$res['tagged'] = [
+					'username' => $ml->tagged_username,
+					'post_url' => '/p/'.HashidService::encode($ml->status_id)
+				];
+			}
 		}
 
 		return $res;