Merge pull request #3515 from pixelfed/staging

Staging

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Fix mastodon api compatibility ([#3499](https://github.com/pixelfed/pixelfed/pull/3499))
 - Add ffmpeg config, disable logging by default ([108e3803](https://github.com/pixelfed/pixelfed/commit/108e3803))
 - Refactor AP profileFetch logic to fix race conditions and improve updating fields and avatars ([505261da](https://github.com/pixelfed/pixelfed/commit/505261da))
+- Update network timeline api, limit falloff to 2 days ([13a66303](https://github.com/pixelfed/pixelfed/commit/13a66303))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

app/Console/Commands/UserCreate.php

@@ -53,7 +53,7 @@ class UserCreate extends Command
             $user->email = $o['email'];
             $user->password = bcrypt($o['password']);
             $user->is_admin = (bool) $o['is_admin'];
-            $user->email_verified_at = (bool) $o['confirm_email'] ? now() : null;
+            $user->email_verified_at = $o['confirm_email'] ? now() : null;
             $user->save();
 
             $this->info('Successfully created user!');

app/Http/Controllers/PublicApiController.php

@@ -604,7 +604,7 @@ class PublicApiController extends Controller
         $max = $request->input('max_id');
         $limit = $request->input('limit') ?? 3;
         $user = $request->user();
-        $amin = SnowflakeService::byDate(now()->subDays(490));
+        $amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff')));
 
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
 

config/federation.php

@@ -45,6 +45,7 @@ return [
 	],
 
 	'network_timeline' => env('PF_NETWORK_TIMELINE', true),
+	'network_timeline_days_falloff' => env('PF_NETWORK_TIMELINE_DAYS_FALLOFF', 2),
 
 	'custom_emoji' => [
 		'enabled' => env('CUSTOM_EMOJI', false),