mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update api v1/v2 instance endpoints, bump mastoapi version from 2.7.2 to 3.5.3

This commit is contained in:
Daniel Supernault 2024-02-18 22:14:23 -07:00
parent f97afcf47e
commit 545f7d5e70
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
2 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1612,7 +1612,7 @@ class ApiV1Controller extends Controller
'short_description' => config_cache('app.short_description'), 'short_description' => config_cache('app.short_description'),
'description' => config_cache('app.description'), 'description' => config_cache('app.description'),
'email' => config('instance.email'), 'email' => config('instance.email'),
'version' => '2.7.2 (compatible; Pixelfed ' . config('pixelfed.version') .')', 'version' => '3.5.3 (compatible; Pixelfed ' . config('pixelfed.version') .')',
'urls' => [ 'urls' => [
'streaming_api' => 'wss://' . config('pixelfed.domain.app') 'streaming_api' => 'wss://' . config('pixelfed.domain.app')
], ],

22
app/Http/Controllers/Api/ApiV2Controller.php
View File

@ -71,10 +71,11 @@ class ApiV2Controller extends Controller
->toArray() : []; ->toArray() : [];
}); });
$res = [ $res = Cache::remember('api:v2:instance-data-response-v2', 1800, function () use($contact, $rules) {
return [
'domain' => config('pixelfed.domain.app'), 'domain' => config('pixelfed.domain.app'),
'title' => config_cache('app.name'), 'title' => config_cache('app.name'),
'version' => config('pixelfed.version'), 'version' => '3.5.3 (compatible; Pixelfed ' . config('pixelfed.version') .')',
'source_url' => 'https://github.com/pixelfed/pixelfed', 'source_url' => 'https://github.com/pixelfed/pixelfed',
'description' => config_cache('app.short_description'), 'description' => config_cache('app.short_description'),
'usage' => [ 'usage' => [
@ -93,7 +94,7 @@ class ApiV2Controller extends Controller
'languages' => [config('app.locale')], 'languages' => [config('app.locale')],
'configuration' => [ 'configuration' => [
'urls' => [ 'urls' => [
'streaming' => 'wss://' . config('pixelfed.domain.app'), 'streaming' => null,
'status' => null 'status' => null
], ],
'vapid' => [ 'vapid' => [
@ -116,19 +117,20 @@ class ApiV2Controller extends Controller
'video_matrix_limit' => 3686400 'video_matrix_limit' => 3686400
], ],
'polls' => [ 'polls' => [
'max_options' => 4, 'max_options' => 0,
'max_characters_per_option' => 50, 'max_characters_per_option' => 0,
'min_expiration' => 300, 'min_expiration' => 0,
'max_expiration' => 2629746, 'max_expiration' => 0,
], ],
'translation' => [ 'translation' => [
'enabled' => false, 'enabled' => false,
], ],
], ],
'registrations' => [ 'registrations' => [
'enabled' => (bool) config_cache('pixelfed.open_registration'), 'enabled' => null,
'approval_required' => false, 'approval_required' => false,
'message' => null 'message' => null,
'url' => null,
], ],
'contact' => [ 'contact' => [
'email' => config('instance.email'), 'email' => config('instance.email'),
@ -136,7 +138,9 @@ class ApiV2Controller extends Controller
], ],
'rules' => $rules 'rules' => $rules
]; ];
});
$res['registrations']['enabled'] = (bool) config_cache('pixelfed.open_registration');
return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES); return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
} }