Merge pull request #3091 from pixelfed/staging

Staging

CHANGELOG.md

@@ -59,8 +59,10 @@
 - 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 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))
-- Update SPA, rewrite autolink urls to SPA when applicable. ([0837b410](https://github.com/pixelfed/pixelfed/commit/0837b410))
+- Updated LoginController, bump decayMinutes from 1 to 60. ([6bf92bed](https://github.com/pixelfed/pixelfed/commit/6bf92bed))
+- 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/))
 
 ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

app/Util/Site/Config.php

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

app/Util/Webfinger/WebfingerUrl.php

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

config/exp.php

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