UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-11 06:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3091 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-12-26 05:01:13 -07:00 committed by GitHub
commit 59c226bd73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -59,8 +59,10 @@
- Updated ComposeController, refactor compose_settings. ([edc2958b](https://github.com/pixelfed/pixelfed/commit/edc2958b)) - Updated ComposeController, refactor compose_settings. ([edc2958b](https://github.com/pixelfed/pixelfed/commit/edc2958b))
- Updated StatusEntityLexer, prevent boosts and replies from being added to PublicTimelineService. ([32707372](https://github.com/pixelfed/pixelfed/commit/32707372)) - Updated StatusEntityLexer, prevent boosts and replies from being added to PublicTimelineService. ([32707372](https://github.com/pixelfed/pixelfed/commit/32707372))
- Updated SpaController, persist web language changes. ([7bc684e5](https://github.com/pixelfed/pixelfed/commit/7bc684e5)) - Updated SpaController, persist web language changes. ([7bc684e5](https://github.com/pixelfed/pixelfed/commit/7bc684e5))
- Update LoginController, bump decayMinutes from 1 to 60. ([6bf92bed](https://github.com/pixelfed/pixelfed/commit/6bf92bed)) - Updated LoginController, bump decayMinutes from 1 to 60. ([6bf92bed](https://github.com/pixelfed/pixelfed/commit/6bf92bed))
- Update SPA, rewrite autolink urls to SPA when applicable. ([0837b410](https://github.com/pixelfed/pixelfed/commit/0837b410)) - Updated SPA, rewrite autolink urls to SPA when applicable. ([0837b410](https://github.com/pixelfed/pixelfed/commit/0837b410))
- Updated site config, increase ttl and enable SPA by default. ([469d49d8](https://github.com/pixelfed/pixelfed/commit/469d49d8))
- Updated Webfinger, fixes #3050. ([ff7ee3bd](https://github.com/pixelfed/pixelfed/commit/ff7ee3bd))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

12
app/Util/Site/Config.php
View file

@ -7,10 +7,10 @@ use Illuminate\Support\Str;
class Config { class Config {
const CACHE_KEY = 'api:site:configuration:_v0.4'; const CACHE_KEY = 'api:site:configuration:_v0.5';
public static function get() { public static function get() {
return Cache::remember(self::CACHE_KEY, now()->addMinutes(5), function() { return Cache::remember(self::CACHE_KEY, 86400, function() {
return [ return [
'open_registration' => (bool) config_cache('pixelfed.open_registration'), 'open_registration' => (bool) config_cache('pixelfed.open_registration'),
'uploader' => [ 'uploader' => [
@ -33,13 +33,7 @@ class Config {
'remote_follow' => config('federation.activitypub.remoteFollow') 'remote_follow' => config('federation.activitypub.remoteFollow')
], ],
'ab' => [ 'ab' => config('exp'),
'lc' => config('exp.lc'),
'rec' => config('exp.rec'),
'loops' => config('exp.loops'),
'top' => config('exp.top'),
'polls' => config('exp.polls')
],
'site' => [ 'site' => [
'name' => config_cache('app.name'), 'name' => config_cache('app.name'),

2
app/Util/Webfinger/WebfingerUrl.php
View file

@ -11,7 +11,7 @@ class WebfingerUrl
$url = Nickname::normalizeProfileUrl($url); $url = Nickname::normalizeProfileUrl($url);
$domain = $url['domain']; $domain = $url['domain'];
$username = $url['username']; $username = $url['username'];
$path = "https://{$domain}/.well-known/webfinger?resource={$username}@{$domain}"; $path = "https://{$domain}/.well-known/webfinger?resource=acct:{$username}@{$domain}";
return $path; return $path;
} }

2
config/exp.php
View file

@ -9,5 +9,5 @@ return [
'polls' => env('EXP_POLLS', false), 'polls' => env('EXP_POLLS', false),
'cached_public_timeline' => env('EXP_CPT', false), 'cached_public_timeline' => env('EXP_CPT', false),
'gps' => env('EXP_GPS', false), 'gps' => env('EXP_GPS', false),
'spa' => env('EXP_SPA', false), 'spa' => env('EXP_SPA', true),
]; ];