chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3606 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2022-08-05 22:03:14 -06:00 committed by GitHub
parent 0f5bf8b4b2 a91c439273
commit c26edc65c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -50,6 +50,8 @@
- Improve cache invalidation after processing VideoThumbnail to eliminate "No Preview Available" on grid feeds ([47571887](https://github.com/pixelfed/pixelfed/commit/47571887))
- Use poster in VideoPresenter component ([a3cc90b0](https://github.com/pixelfed/pixelfed/commit/a3cc90b0))
- Fix mastoapi notification type casting to include comment and share (mention and reblog) notifications ([eba84530](https://github.com/pixelfed/pixelfed/commit/eba84530))
- Fix email verification requests filtering to gracefully handle deleted accounts and accounts already verified ([b57066d1](https://github.com/pixelfed/pixelfed/commit/b57066d1))
- Add configuration to v1/instance endpoint. Fixes #3605 ([2fb18b7d](https://github.com/pixelfed/pixelfed/commit/2fb18b7d))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

4
app/Http/Controllers/Admin/AdminReportController.php
View File

@ -560,10 +560,10 @@ trait AdminReportController
})
->map(function($id) {
$user = User::whereProfileId($id)->first();
if(!$user) {
if(!$user || $user->email_verified_at) {
return [];
}
$account = AccountService::get($id);
$account = AccountService::get($id, true);
if(!$account) {
return [];
}

25
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -1305,7 +1305,7 @@ class ApiV1Controller extends Controller
*/
public function instance(Request $request)
{
$res = Cache::remember('api:v1:instance-data-response-v0', 1800, function () {
$res = Cache::remember('api:v1:instance-data-response-v1', 1800, function () {
$contact = Cache::remember('api:v1:instance-data:contact', 604800, function () {
$admin = User::whereIsAdmin(true)->first();
return $admin && isset($admin->profile_id) ?
@ -1350,7 +1350,28 @@ class ApiV1Controller extends Controller
'registrations' => (bool) config_cache('pixelfed.open_registration'),
'approval_required' => false,
'contact_account' => $contact,
'rules' => $rules
'rules' => $rules,
'configuration' => [
'media_attachments' => [
'image_matrix_limit' => 16777216,
'image_size_limit' => config('pixelfed.max_photo_size') * 1024,
'supported_mime_types' => explode(',', config('pixelfed.media_types')),
'video_frame_rate_limit' => 120,
'video_matrix_limit' => 2304000,
'video_size_limit' => config('pixelfed.max_photo_size') * 1024,
],
'polls' => [
'max_characters_per_option' => 50,
'max_expiration' => 2629746,
'max_options' => 4,
'min_expiration' => 300
],
'statuses' => [
'characters_reserved_per_url' => 23,
'max_characters' => (int) config('pixelfed.max_caption_length'),
'max_media_attachments' => (int) config('pixelfed.max_album_length')
]
]
];
});