Merge branch 'main' into v0_12_4

This commit is contained in:
Felipe Mateus 2025-01-07 15:04:56 -03:00
commit eac3d92340
No known key found for this signature in database
GPG key ID: 94D494618F214123

View file

@ -16,9 +16,8 @@ return [
'enabled' => env('EXP_LOOPS', false), 'enabled' => env('EXP_LOOPS', false),
], ],
'tags' => [ 'tags' => [
'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false), 'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false)
], ],
'beagle_api' => env('PF_INSTANCE_USE_BEAGLE_API', true),
], ],
'email' => env('INSTANCE_CONTACT_EMAIL'), 'email' => env('INSTANCE_CONTACT_EMAIL'),
@ -26,30 +25,30 @@ return [
'timeline' => [ 'timeline' => [
'home' => [ 'home' => [
'cached' => env('PF_HOME_TIMELINE_CACHE', false), 'cached' => env('PF_HOME_TIMELINE_CACHE', false),
'cache_ttl' => env('PF_HOME_TIMELINE_CACHE_TTL', 900), 'cache_ttl' => env('PF_HOME_TIMELINE_CACHE_TTL', 900)
], ],
'local' => [ 'local' => [
'cached' => env('INSTANCE_PUBLIC_TIMELINE_CACHED', false), 'cached' => env('INSTANCE_PUBLIC_TIMELINE_CACHED', false),
'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false), 'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false)
], ],
'network' => [ 'network' => [
'cached' => env('PF_NETWORK_TIMELINE') ? env('INSTANCE_NETWORK_TIMELINE_CACHED', false) : false, 'cached' => env('PF_NETWORK_TIMELINE') ? env('INSTANCE_NETWORK_TIMELINE_CACHED', false) : false,
'cache_dropoff' => env('INSTANCE_NETWORK_TIMELINE_CACHE_DROPOFF', 100), 'cache_dropoff' => env('INSTANCE_NETWORK_TIMELINE_CACHE_DROPOFF', 100),
'max_hours_old' => env('INSTANCE_NETWORK_TIMELINE_CACHE_MAX_HOUR_INGEST', 2160), 'max_hours_old' => env('INSTANCE_NETWORK_TIMELINE_CACHE_MAX_HOUR_INGEST', 6)
], ]
], ],
'page' => [ 'page' => [
'404' => [ '404' => [
'header' => env('PAGE_404_HEADER', 'Sorry, this page isn\'t available.'), 'header' => env('PAGE_404_HEADER', 'Sorry, this page isn\'t available.'),
'body' => env('PAGE_404_BODY', 'The link you followed may be broken, or the page may have been removed. <a href="/">Go back to Pixelfed.</a>'), 'body' => env('PAGE_404_BODY', 'The link you followed may be broken, or the page may have been removed. <a href="/">Go back to Pixelfed.</a>')
], ],
'503' => [ '503' => [
'header' => env('PAGE_503_HEADER', 'Service Unavailable'), 'header' => env('PAGE_503_HEADER', 'Service Unavailable'),
'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.'), 'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.')
], ]
], ],
'username' => [ 'username' => [
@ -57,12 +56,12 @@ return [
'remote' => [ 'remote' => [
'formats' => ['@', 'from', 'custom'], 'formats' => ['@', 'from', 'custom'],
'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@', 'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@',
'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null), 'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null)
], ]
], ],
'polls' => [ 'polls' => [
'enabled' => false, 'enabled' => env('INSTANCE_POLLS', false),
], ],
'stories' => [ 'stories' => [
@ -71,7 +70,7 @@ return [
'restricted' => [ 'restricted' => [
'enabled' => env('RESTRICTED_INSTANCE', false), 'enabled' => env('RESTRICTED_INSTANCE', false),
'level' => 1, 'level' => 1
], ],
'oauth' => [ 'oauth' => [
@ -80,15 +79,15 @@ return [
'pat' => [ 'pat' => [
'enabled' => env('OAUTH_PAT_ENABLED', false), 'enabled' => env('OAUTH_PAT_ENABLED', false),
'id' => env('OAUTH_PAT_ID'), 'id' => env('OAUTH_PAT_ID'),
], ]
], ],
'label' => [ 'label' => [
'covid' => [ 'covid' => [
'enabled' => env('ENABLE_COVID_LABEL', true), 'enabled' => env('ENABLE_COVID_LABEL', true),
'url' => env('COVID_LABEL_URL', 'https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public'), 'url' => env('COVID_LABEL_URL', 'https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public'),
'org' => env('COVID_LABEL_ORG', 'visit the WHO website'), 'org' => env('COVID_LABEL_ORG', 'visit the WHO website')
], ]
], ],
'enable_cc' => env('ENABLE_CONFIG_CACHE', true), 'enable_cc' => env('ENABLE_CONFIG_CACHE', true),
@ -103,11 +102,11 @@ return [
'hide_nsfw_on_public_feeds' => env('PF_HIDE_NSFW_ON_PUBLIC_FEEDS', false), 'hide_nsfw_on_public_feeds' => env('PF_HIDE_NSFW_ON_PUBLIC_FEEDS', false),
'avatar' => [ 'avatar' => [
'local_to_cloud' => env('PF_LOCAL_AVATAR_TO_CLOUD', false), 'local_to_cloud' => env('PF_LOCAL_AVATAR_TO_CLOUD', false)
], ],
'admin_invites' => [ 'admin_invites' => [
'enabled' => env('PF_ADMIN_INVITES_ENABLED', true), 'enabled' => env('PF_ADMIN_INVITES_ENABLED', true)
], ],
'user_filters' => [ 'user_filters' => [
@ -120,8 +119,8 @@ return [
'email' => [ 'email' => [
'enabled' => env('INSTANCE_REPORTS_EMAIL_ENABLED', false), 'enabled' => env('INSTANCE_REPORTS_EMAIL_ENABLED', false),
'to' => env('INSTANCE_REPORTS_EMAIL_ADDRESSES'), 'to' => env('INSTANCE_REPORTS_EMAIL_ADDRESSES'),
'autospam' => env('INSTANCE_REPORTS_EMAIL_AUTOSPAM', false), 'autospam' => env('INSTANCE_REPORTS_EMAIL_AUTOSPAM', false)
], ]
], ],
'landing' => [ 'landing' => [
@ -130,7 +129,7 @@ return [
], ],
'banner' => [ 'banner' => [
'blurhash' => env('INSTANCE_BANNER_BLURHASH', 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt'), 'blurhash' => env('INSTANCE_BANNER_BLURHASH', 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt')
], ],
'parental_controls' => [ 'parental_controls' => [
@ -144,20 +143,14 @@ return [
], ],
'software-update' => [ 'software-update' => [
'disable_failed_warning' => env('INSTANCE_SOFTWARE_UPDATE_DISABLE_FAILED_WARNING', false), 'disable_failed_warning' => env('INSTANCE_SOFTWARE_UPDATE_DISABLE_FAILED_WARNING', false)
], ],
'notifications' => [ 'notifications' => [
'gc' => [ 'gc' => [
'enabled' => env('INSTANCE_NOTIFY_AUTO_GC', false), 'enabled' => env('INSTANCE_NOTIFY_AUTO_GC', false),
'delete_after_days' => env('INSTANCE_NOTIFY_AUTO_GC_DEL_AFTER_DAYS', 365), 'delete_after_days' => env('INSTANCE_NOTIFY_AUTO_GC_DEL_AFTER_DAYS', 365)
], ]
'nag' => [
'enabled' => (bool) env('INSTANCE_NOTIFY_APP_GATEWAY', true),
'api_key' => env('PIXELFED_PUSHGATEWAY_KEY', false),
'endpoint' => 'push.pixelfed.net',
],
], ],
'curated_registration' => [ 'curated_registration' => [
@ -178,12 +171,9 @@ return [
'enabled' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY', false), 'enabled' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY', false),
'bundle' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_BUNDLE', false), 'bundle' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_BUNDLE', false),
'max_per_day' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_MPD', 10), 'max_per_day' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_MPD', 10),
'cc_addresses' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_CC'),
], ],
'on_user_response' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_USER_RESPONSE', false), 'on_user_response' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_USER_RESPONSE', false),
]
], ],
], ],
],
'show_peers' => env('INSTANCE_SHOW_PEERS', false),
]; ];