Merge pull request #3134 from pixelfed/staging

Staging
This commit is contained in:
daniel 2022-01-08 01:59:01 -07:00 committed by GitHub
commit f772925d70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 2 deletions

View file

@ -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();

Binary file not shown.

BIN
public/js/app.js vendored

Binary file not shown.

BIN
public/js/spa.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -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"
}
}

View file

@ -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',
],
];