Merge branch 'staging' of https://github.com/pixelfed/pixelfed into translation-coverage-extension

This commit is contained in:
Jeff Poirier 2024-08-21 00:42:49 +00:00
commit 49c9fef4df
3 changed files with 10 additions and 1 deletions

View file

@ -16,6 +16,7 @@
- Update ApiV1Dot1Controller, add new single media status create endpoint ([b03f5cec](https://github.com/pixelfed/pixelfed/commit/b03f5cec)) - Update ApiV1Dot1Controller, add new single media status create endpoint ([b03f5cec](https://github.com/pixelfed/pixelfed/commit/b03f5cec))
- Update AdminSettings component, add link to Custom CSS settings ([958daac4](https://github.com/pixelfed/pixelfed/commit/958daac4)) - Update AdminSettings component, add link to Custom CSS settings ([958daac4](https://github.com/pixelfed/pixelfed/commit/958daac4))
- Update ApiV1Controller, fix v1/instance stats, force cast to int ([dcd95d68](https://github.com/pixelfed/pixelfed/commit/dcd95d68)) - Update ApiV1Controller, fix v1/instance stats, force cast to int ([dcd95d68](https://github.com/pixelfed/pixelfed/commit/dcd95d68))
- Update BeagleService, disable discovery if AP is disabled ([6cd1cbb4](https://github.com/pixelfed/pixelfed/commit/6cd1cbb4))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3) ## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3)

View file

@ -51,6 +51,10 @@ class BeagleService
public static function getDiscover() public static function getDiscover()
{ {
if ((bool) config_cache('federation.activitypub.enabled') == false) {
return [];
}
return Cache::remember(self::DISCOVER_CACHE_KEY, now()->addHours(6), function () { return Cache::remember(self::DISCOVER_CACHE_KEY, now()->addHours(6), function () {
try { try {
$res = Http::withOptions(['allow_redirects' => false]) $res = Http::withOptions(['allow_redirects' => false])
@ -84,6 +88,10 @@ class BeagleService
public static function getDiscoverPosts() public static function getDiscoverPosts()
{ {
if ((bool) config_cache('federation.activitypub.enabled') == false) {
return [];
}
return Cache::remember(self::DISCOVER_POSTS_CACHE_KEY, now()->addHours(1), function () { return Cache::remember(self::DISCOVER_POSTS_CACHE_KEY, now()->addHours(1), function () {
$posts = collect(self::getDiscover()) $posts = collect(self::getDiscover())
->filter(function ($post) { ->filter(function ($post) {

View file

@ -195,7 +195,7 @@ return [
| Max User Limit | Max User Limit
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Allow a maximum number of user accounts. Default: off | Allow a maximum number of user accounts. Default: enabled w/ 1000 max users
| |
*/ */
'max_users' => env('PF_MAX_USERS', 1000), 'max_users' => env('PF_MAX_USERS', 1000),