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

Merge pull request #3515 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2022-05-21 01:51:18 -06:00 committed by GitHub
parent 8e65198893 eb6db77aa9
commit a8100f14fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -25,6 +25,7 @@
- Fix mastodon api compatibility ([#3499](https://github.com/pixelfed/pixelfed/pull/3499)) - 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)) - 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)) - 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/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

2
app/Console/Commands/UserCreate.php
View File

@ -53,7 +53,7 @@ class UserCreate extends Command
$user->email = $o['email']; $user->email = $o['email'];
$user->password = bcrypt($o['password']); $user->password = bcrypt($o['password']);
$user->is_admin = (bool) $o['is_admin']; $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(); $user->save();
$this->info('Successfully created user!'); $this->info('Successfully created user!');

2
app/Http/Controllers/PublicApiController.php
View File

@ -604,7 +604,7 @@ class PublicApiController extends Controller
$max = $request->input('max_id'); $max = $request->input('max_id');
$limit = $request->input('limit') ?? 3; $limit = $request->input('limit') ?? 3;
$user = $request->user(); $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) : []; $filtered = $user ? UserFilterService::filters($user->profile_id) : [];

1
config/federation.php
View File

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