Merge pull request #3134 from pixelfed/staging

Staging

app/Http/Controllers/Api/ApiV1Controller.php

@@ -2532,7 +2532,7 @@ class ApiV1Controller extends Controller
 		}
 
 		$data = $ids->map(function($post) use($pid) {
-			$status = StatusService::getMastodon($post->id);
+			$status = StatusService::get($post->id);
 
 			if(!$status || !isset($status['id'])) {
 				return false;
@@ -2542,7 +2542,7 @@ class ApiV1Controller extends Controller
 			return $status;
 		})
 		->filter(function($post) {
-			return $post && isset($post['id']);
+			return $post && isset($post['id']) && isset($post['account']);
 		})
 		->values();
 

public/_lang/en.json

@@ -19,6 +19,10 @@
         "other": "Other",
         "readMore": "Read more",
         "success": "Success",
+        "proceed": "Proceed",
+        "next": "Next",
+        "close": "Close",
+        "clickHere": "click here",
         "sensitive": "Sensitive",
         "sensitiveContent": "Sensitive Content",
         "sensitiveContentWarning": "This post may contain sensitive content"
@@ -146,5 +150,13 @@
     },
     "hashtags": {
         "emptyFeed": "We can't seem to find any posts for this hashtag"
+    },
+    "report": {
+        "report": "Report",
+        "selectReason": "Select a reason",
+        "reported": "Reported",
+        "sendingReport": "Sending report",
+        "thanksMsg": "Thanks for the report, people like you help keep our community safe!",
+        "contactAdminMsg": "If you'd like to contact an administrator about this post or report"
     }
 }

public/mix-manifest.json

@@ -3,7 +3,7 @@
     "/js/vendor.js": "/js/vendor.js?id=131c5e4445728ce4224a",
     "/js/activity.js": "/js/activity.js?id=1d855c03383566536e13",
     "/js/admin.js": "/js/admin.js?id=05c8d6766650050d8ef0",
-    "/js/app.js": "/js/app.js?id=26f7c3ba07877a3e7953",
+    "/js/app.js": "/js/app.js?id=e27175f7e2a588412a70",
     "/css/app.css": "/css/app.css?id=70554ace925b5a7ecef2",
     "/css/appdark.css": "/css/appdark.css?id=ccdcd84f1087f89bd7b2",
     "/css/admin.css": "/css/admin.css?id=8884d2f48c1dd491ba04",
@@ -24,7 +24,7 @@
     "/js/rempos.js": "/js/rempos.js?id=2ef46b249c6390aa4ef8",
     "/js/rempro.js": "/js/rempro.js?id=3971b84aef886204d286",
     "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
-    "/js/spa.js": "/js/spa.js?id=0075686e34360bcda2e3",
+    "/js/spa.js": "/js/spa.js?id=b93b37b40129a4351836",
     "/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9",
     "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
     "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",

resources/assets/js/i18n/en.json

@@ -19,6 +19,10 @@
         "other": "Other",
         "readMore": "Read more",
         "success": "Success",
+        "proceed": "Proceed",
+        "next": "Next",
+        "close": "Close",
+        "clickHere": "click here",
         "sensitive": "Sensitive",
         "sensitiveContent": "Sensitive Content",
         "sensitiveContentWarning": "This post may contain sensitive content"
@@ -146,5 +150,13 @@
     },
     "hashtags": {
         "emptyFeed": "We can't seem to find any posts for this hashtag"
+    },
+    "report": {
+        "report": "Report",
+        "selectReason": "Select a reason",
+        "reported": "Reported",
+        "sendingReport": "Sending report",
+        "thanksMsg": "Thanks for the report, people like you help keep our community safe!",
+        "contactAdminMsg": "If you'd like to contact an administrator about this post or report"
     }
 }

resources/lang/en/web.php

@@ -23,6 +23,10 @@ return [
 		'other' => 'Other',
 		'readMore' => 'Read more',
 		'success' => 'Success',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
 		'sensitive' => 'Sensitive',
 		'sensitiveContent' => 'Sensitive Content',
@@ -183,4 +187,13 @@ return [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];