From 64d8cf88fd4a34a20bdb409d1112e40ca598e1d3 Mon Sep 17 00:00:00 2001 From: Simon Dann Date: Thu, 18 Apr 2019 13:44:59 +0100 Subject: [PATCH 1/6] Add ext-intl requirement --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 7b2b87284..dfad0bb4e 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", + "ext-intl" : "*" "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", From f6f693271a680fe511c334fbb4d2c0fb418a1c74 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 18 Apr 2019 15:52:58 +0100 Subject: [PATCH 2/6] Update composer.json Co-Authored-By: carbontwelve --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dfad0bb4e..9d942579a 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", - "ext-intl" : "*" + "ext-intl": "*", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", From cea44f9877e6e9cc0c2f6c5d1070273e1a039d1b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 18 Apr 2019 22:44:55 -0600 Subject: [PATCH 3/6] Update settings partial --- .../views/settings/partial/sidebar.blade.php | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php index c46b07482..2265f3054 100644 --- a/resources/views/settings/partial/sidebar.blade.php +++ b/resources/views/settings/partial/sidebar.blade.php @@ -6,37 +6,17 @@
  • Password
    • - {{--
  • - Email -
    • -
  • - Notifications -
    • --}} -
  • Privacy
  • Security
    • - {{--
  • +
    • -
  • - Import -
  • - Export + Data Export
    • - -
  • -
    -
    • -
  • - Applications -
    • -
  • - Developers -
    • --}} \ No newline at end of file From 7ea8233a611e6d2d116494f75c329dfa56ee594d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 18 Apr 2019 22:47:20 -0600 Subject: [PATCH 4/6] Update SettingsController --- app/Http/Controllers/SettingsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index a3f766564..66f684164 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -74,7 +74,7 @@ class SettingsController extends Controller public function exportFollowing() { - $data = Cache::remember('account:export:profile:following:'.Auth::user()->profile->id, now()->addMinutes(1440), function() { + $data = Cache::remember('account:export:profile:following:'.Auth::user()->profile->id, now()->addMinutes(60), function() { return Auth::user()->profile->following()->get()->map(function($i) { return $i->url(); }); @@ -86,7 +86,7 @@ class SettingsController extends Controller public function exportFollowers() { - $data = Cache::remember('account:export:profile:followers:'.Auth::user()->profile->id, now()->addMinutes(1440), function() { + $data = Cache::remember('account:export:profile:followers:'.Auth::user()->profile->id, now()->addMinutes(60), function() { return Auth::user()->profile->followers()->get()->map(function($i) { return $i->url(); }); @@ -105,7 +105,7 @@ class SettingsController extends Controller if(!$exists) { return redirect()->back(); } - $data = Cache::remember('account:export:profile:muteblocklist:'.Auth::user()->profile->id, now()->addMinutes(1440), function() use($profile) { + $data = Cache::remember('account:export:profile:muteblocklist:'.Auth::user()->profile->id, now()->addMinutes(60), function() use($profile) { return json_encode([ 'muted' => $profile->mutedProfileUrls(), 'blocked' => $profile->blockedProfileUrls() From fd59a0cc9ae71979ed3e9a620f51cd3d6fd14423 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 19 Apr 2019 00:51:40 -0600 Subject: [PATCH 5/6] Update costar config --- config/costar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/costar.php b/config/costar.php index 29af954ec..942e28180 100644 --- a/config/costar.php +++ b/config/costar.php @@ -10,7 +10,7 @@ return [ - 'enabled' => env('PF_COSTAR_ENABLED', true), + 'enabled' => env('PF_COSTAR_ENABLED', false), 'domain' => [ 'block' => env('CS_BLOCKED_DOMAINS', null) ? explode(',', env('CS_BLOCKED_DOMAINS')) : null, From e620fd9abf12daaa805e1fc6f2e682b262e1ff06 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 19 Apr 2019 00:57:07 -0600 Subject: [PATCH 6/6] Update .envs --- .env.example | 1 + .env.testing | 1 + 2 files changed, 2 insertions(+) diff --git a/.env.example b/.env.example index 92f6cb3ce..652864625 100644 --- a/.env.example +++ b/.env.example @@ -66,6 +66,7 @@ HORIZON_DARKMODE=true ACTIVITY_PUB=false REMOTE_FOLLOW=false +PF_COSTAR_ENABLED=false CS_BLOCKED_DOMAINS='example.org,example.net,example.com' CS_CW_DOMAINS='example.org,example.net,example.com' CS_UNLISTED_DOMAINS='example.org,example.net,example.com' diff --git a/.env.testing b/.env.testing index 82f28be00..ef7f69cf1 100644 --- a/.env.testing +++ b/.env.testing @@ -57,6 +57,7 @@ MIX_API_SEARCH="${API_SEARCH}" TELESCOPE_ENABLED=false PF_MAX_USERS=1000 +PF_COSTAR_ENABLED=true CS_BLOCKED_DOMAINS='example.org,example.net,example.com' CS_CW_DOMAINS='example.org,example.net,example.com' CS_UNLISTED_DOMAINS='example.org,example.net,example.com'