Merge pull request #4943 from pixelfed/staging

Staging

.gitattributes

@@ -3,3 +3,10 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
+
+# Collapse diffs for generated files:
+public/**/*.js text -diff
+public/**/*.json text -diff
+public/**/*.css text -diff
+public/img/* binary -diff
+public/fonts/* binary -diff

CHANGELOG.md

@@ -7,6 +7,8 @@
 - Update Inbox, cast live filters to lowercase ([d835e0ad](https://github.com/pixelfed/pixelfed/commit/d835e0ad))
 - Update federation config, increase default timeline days falloff to 90 days from 2 days. Fixes #4905 ([011834f4](https://github.com/pixelfed/pixelfed/commit/011834f4))
 - Update cache config, use predis as default redis driver client ([ea6b1623](https://github.com/pixelfed/pixelfed/commit/ea6b1623))
+- Update .gitattributes to collapse diffs on generated files ([ThisIsMissEm](https://github.com/pixelfed/pixelfed/commit/9978b2b9))
+- Update api v1/v2 instance endpoints, bump mastoapi version from 2.7.2 to 3.5.3 ([545f7d5e](https://github.com/pixelfed/pixelfed/commit/545f7d5e))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.12 (2024-02-16)](https://github.com/pixelfed/pixelfed/compare/v0.11.11...v0.11.12)

app/Http/Controllers/Api/ApiV1Controller.php

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

app/Http/Controllers/Api/ApiV2Controller.php

@@ -71,10 +71,11 @@ class ApiV2Controller extends Controller
                 ->toArray() : [];
         });
 
-        $res = [
+        $res = Cache::remember('api:v2:instance-data-response-v2', 1800, function () use($contact, $rules) {
+            return [
                 'domain' => config('pixelfed.domain.app'),
                 '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',
                 'description' => config_cache('app.short_description'),
                 'usage' => [
@@ -93,7 +94,7 @@ class ApiV2Controller extends Controller
                 'languages' => [config('app.locale')],
                 'configuration' => [
                     'urls' => [
-                    'streaming' => 'wss://' . config('pixelfed.domain.app'),
+                        'streaming' => null,
                         'status' => null
                     ],
                     'vapid' => [
@@ -116,19 +117,20 @@ class ApiV2Controller extends Controller
                         'video_matrix_limit' => 3686400
                     ],
                     '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' => [
                         'enabled' => false,
                     ],
                 ],
                 'registrations' => [
-                'enabled' => (bool) config_cache('pixelfed.open_registration'),
+                    'enabled' => null,
                     'approval_required' => false,
-                'message' => null
+                    'message' => null,
+                    'url' => null,
                 ],
                 'contact' => [
                     'email' => config('instance.email'),
@@ -136,7 +138,9 @@ class ApiV2Controller extends Controller
                 ],
                 'rules' => $rules
             ];
+        });
 
+        $res['registrations']['enabled'] = (bool) config_cache('pixelfed.open_registration');
         return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
     }