From b43c464fd3f19ab96083c0000d675d9651798503 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:06:26 +0800 Subject: [PATCH 01/23] Update .env.example --- .env.example | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.example b/.env.example index 877fddbd7..b21ae8908 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,6 @@ APP_URL=http://localhost APP_DOMAIN="localhost" ADMIN_DOMAIN="localhost" SESSION_DOMAIN="localhost" -SESSION_SECURE_COOKIE=true TRUST_PROXIES="*" LOG_CHANNEL=stack From 9f1ca2cbc879851e0a8292dbcde188e8d441d1b5 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:06:35 +0800 Subject: [PATCH 02/23] Update .env.example.docker --- .env.example.docker | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.example.docker b/.env.example.docker index f102446ab..9e34cb859 100644 --- a/.env.example.docker +++ b/.env.example.docker @@ -7,7 +7,6 @@ APP_URL=http://localhost APP_DOMAIN="localhost" ADMIN_DOMAIN="localhost" SESSION_DOMAIN="localhost" -SESSION_SECURE_COOKIE=true TRUST_PROXIES="*" LOG_CHANNEL=stack From f56c175b090555df582541f5960adf42ce5bcd59 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:06:45 +0800 Subject: [PATCH 03/23] Update .env.testing --- .env.testing | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.testing b/.env.testing index 5ea92d176..969115030 100644 --- a/.env.testing +++ b/.env.testing @@ -7,7 +7,6 @@ APP_URL=https://pixelfed.dev APP_DOMAIN="pixelfed.dev" ADMIN_DOMAIN="pixelfed.dev" SESSION_DOMAIN="pixelfed.dev" -SESSION_SECURE_COOKIE=true TRUST_PROXIES="*" LOG_CHANNEL=stack From 76fd1c1efdc250c98943fafb07382175718eeba1 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:13:29 +0800 Subject: [PATCH 04/23] Update media.php --- config/media.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/config/media.php b/config/media.php index 21ce50a56..bd392998a 100644 --- a/config/media.php +++ b/config/media.php @@ -3,13 +3,5 @@ return [ 'exif' => [ 'database' => env('MEDIA_EXIF_DATABASE', false), - 'strip' => true ], - 'types' => env('MEDIA_TYPES', 'image/jpeg,image/png,image/gif'), - 'photo' => [ - 'optimize' => env('PF_OPTIMIZE_IMAGES', true), - 'quality' => (int) env('IMAGE_QUALITY', 80), - 'max_size' => env('MAX_PHOTO_SIZE', 15000), - 'max_album_length' => env('MAX_ALBUM_LENGTH', 4), - ], -]; \ No newline at end of file +]; From 10211fe9cbcec57ee1c49a5137ae6eceefdaf14e Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:15:56 +0800 Subject: [PATCH 05/23] Update media.php --- config/media.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/media.php b/config/media.php index bd392998a..6fb1a4673 100644 --- a/config/media.php +++ b/config/media.php @@ -3,5 +3,6 @@ return [ 'exif' => [ 'database' => env('MEDIA_EXIF_DATABASE', false), + 'strip' => true ], ]; From 524d4370d2ba3ab32ffea5ac55dd1ebee20fd1c4 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:16:55 +0800 Subject: [PATCH 06/23] Update media.php --- config/media.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/media.php b/config/media.php index 6fb1a4673..bd392998a 100644 --- a/config/media.php +++ b/config/media.php @@ -3,6 +3,5 @@ return [ 'exif' => [ 'database' => env('MEDIA_EXIF_DATABASE', false), - 'strip' => true ], ]; From 2295bef8777afb351c1fb24fdea574c031f98595 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:42:34 +0800 Subject: [PATCH 07/23] Update pixelfed.php --- config/pixelfed.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index a091d6cdd..26c06f213 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -257,10 +257,6 @@ return [ 'oauth_enabled' => env('OAUTH_ENABLED', false), - 'sanitizer' => [ - 'restrict_html_types' => env('RESTRICT_HTML_TYPES', true) - ], - 'admin' => [ 'env_editor' => env('ADMIN_ENV_EDITOR', false) ], From 44c5494a0c34b5588efa88df49384e7bde1f634c Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:44:28 +0800 Subject: [PATCH 08/23] Update pixelfed.php --- config/pixelfed.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 26c06f213..42b5167d7 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -58,17 +58,6 @@ return [ */ 'open_registration' => env('OPEN_REGISTRATION', true), - /* - |-------------------------------------------------------------------------- - | ActivityPub - |-------------------------------------------------------------------------- - | - */ - 'activitypub_enabled' => env('ACTIVITY_PUB', false), - 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0), - 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10), - 'remote_follow_enabled' => false, - /* |-------------------------------------------------------------------------- | Account file size limit From 03de0761aba3a430897f187a950d0f3633a471d2 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:45:58 +0800 Subject: [PATCH 09/23] Update exp.php --- config/exp.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/exp.php b/config/exp.php index 1c4bf45c6..440997614 100644 --- a/config/exp.php +++ b/config/exp.php @@ -4,7 +4,5 @@ return [ 'lc' => env('EXP_LC', false), 'rec' => env('EXP_REC', false), - 'ns' => env('EXP_NS', false), - 'loops' => env('EXP_LOOPS', false) - -]; \ No newline at end of file + 'loops' => env('EXP_LOOPS', false), +]; From 438138b55c0e3544ef37ba156dbde81a7c1d5042 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:51:53 +0800 Subject: [PATCH 10/23] Update instance.php --- config/instance.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/instance.php b/config/instance.php index de58147fa..70fd6c261 100644 --- a/config/instance.php +++ b/config/instance.php @@ -10,9 +10,6 @@ return [ ], 'discover' => [ - 'loops' => [ - 'enabled' => env('EXP_LOOPS', false), - ], 'tags' => [ 'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false) ], @@ -53,4 +50,4 @@ return [ 'enabled' => env('RESTRICTED_INSTANCE', false), 'level' => 1 ] -]; \ No newline at end of file +]; From 77bc60541767ad07477dff9def38ea79527d97cc Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:52:33 +0800 Subject: [PATCH 11/23] Update pixelfed.php --- config/pixelfed.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 42b5167d7..3afe81799 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -249,6 +249,4 @@ return [ 'admin' => [ 'env_editor' => env('ADMIN_ENV_EDITOR', false) ], - - 'links_per_post' => env('MAX_LINKS_PER_POST', 0) ]; From b629e4fd9022bf6f0f4376624c92f279d1a58d90 Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:55:30 +0800 Subject: [PATCH 12/23] Update routes.php --- config/routes.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/routes.php b/config/routes.php index ab355cf22..ce2067944 100644 --- a/config/routes.php +++ b/config/routes.php @@ -1,16 +1,8 @@ [ - 'base' => config('app.url').'/api/1/', - 'sharedInbox' => config('app.url').'/api/sharedInbox', - 'search' => config('app.url').env('MIX_API_SEARCH'), - ], - 'hashtag' => [ 'base' => config('app.url').'/discover/tags/', 'search' => config('app.url').'/discover/tags/', ], - ]; From 06d60ac3518d370738af1a5f1d3769e7fc8f13ff Mon Sep 17 00:00:00 2001 From: Shlee Date: Thu, 13 Feb 2020 17:56:24 +0800 Subject: [PATCH 13/23] Update ProfileTransformer.php --- app/Transformer/ActivityPub/ProfileTransformer.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Transformer/ActivityPub/ProfileTransformer.php b/app/Transformer/ActivityPub/ProfileTransformer.php index 8172e3773..dcfb0870d 100644 --- a/app/Transformer/ActivityPub/ProfileTransformer.php +++ b/app/Transformer/ActivityPub/ProfileTransformer.php @@ -39,10 +39,6 @@ class ProfileTransformer extends Fractal\TransformerAbstract 'owner' => $profile->permalink(), 'publicKeyPem' => $profile->public_key, ], - // remove shared inbox support until proper support - // 'endpoints' => [ - // 'sharedInbox' => config('routes.api.sharedInbox'), - // ], 'icon' => [ 'type' => 'Image', 'mediaType' => 'image/jpeg', From b9a66fed9596597256e7ec8d00601f1661cec293 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 13:07:53 +0800 Subject: [PATCH 14/23] Update Installer.php --- app/Console/Commands/Installer.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Installer.php index 35d4a6573..31f4ba999 100644 --- a/app/Console/Commands/Installer.php +++ b/app/Console/Commands/Installer.php @@ -97,7 +97,6 @@ class Installer extends Command if(extension_loaded($ext) == false) { $this->error("- {$ext} extension not found, aborting installation"); exit; - } else { } } $this->info("- Required PHP extensions found!"); @@ -221,7 +220,7 @@ class Installer extends Command $envPath = app()->environmentFilePath(); $payload = file_get_contents($envPath); - if ($existing = $this->existingEnv($key, $payload)) { + if ($existing == $this->existingEnv($key, $payload)) { $payload = str_replace("{$key}={$existing}", "{$key}=\"{$value}\"", $payload); $this->storeEnv($payload); } else { From 03c90fd4dee5d557d1cbf1c703512e62381d6bb4 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 13:08:20 +0800 Subject: [PATCH 15/23] Update pixelfed.php --- config/pixelfed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 3afe81799..215cc7a12 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -34,7 +34,7 @@ return [ | */ 'nodeinfo' => [ - 'url' => config('app.url').'/'.'api/nodeinfo/2.0.json', + 'url' => config('app.url').'/api/nodeinfo/2.0.json', ], /* From b4cb75a314f9fb94027d580c8f4591e0e1c3522d Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 13:09:05 +0800 Subject: [PATCH 16/23] Update custom.scss --- resources/assets/sass/custom.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 51fa67fbe..5dbe993fc 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -46,9 +46,6 @@ body, button, input, textarea { opacity: .4; } -.card.status-container { -} - .card-img-top { height: auto; } @@ -565,4 +562,4 @@ details summary::-webkit-details-marker { .status-content > p:first-child { display: inline; -} \ No newline at end of file +} From 9dd1e5fb559b4f11e49a83c74d914dc9ff81e6f9 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 13:10:37 +0800 Subject: [PATCH 17/23] Update custom.scss --- resources/assets/sass/custom.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 5dbe993fc..fe96bd93c 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -525,7 +525,7 @@ details summary::-webkit-details-marker { .text-lighter { color:#B8C2CC !important; -} +} .btn-outline-lighter { color: #B8C2CC !important; From 06d2fd30279b9b475704e7bba75ef7aa12744439 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 13:11:37 +0800 Subject: [PATCH 18/23] Update moment.scss --- resources/assets/sass/moment.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/assets/sass/moment.scss b/resources/assets/sass/moment.scss index 0d642d1f7..95c6adcba 100644 --- a/resources/assets/sass/moment.scss +++ b/resources/assets/sass/moment.scss @@ -1,4 +1,4 @@ -/* +/* red */ .bg-moment-passion { @@ -7,7 +7,7 @@ background: linear-gradient(to left, #e35d5b, #e53935); } -/* +/* teal/purple */ .bg-moment-azure { @@ -79,7 +79,7 @@ background: linear-gradient(to left, #734b6d, #42275a); } -/* +/* purple */ .bg-moment-argon { @@ -95,4 +95,4 @@ background: #141E30; background: -webkit-linear-gradient(to left, #243B55, #141E30); background: linear-gradient(to left, #243B55, #141E30); -} \ No newline at end of file +} From 6b1e90c5d49ae29baebbef65a68ca82826164be5 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 19:28:08 +0800 Subject: [PATCH 19/23] Update passwords.php --- resources/lang/ca/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ca/passwords.php b/resources/lang/ca/passwords.php index d8d75f764..eb8aac15b 100644 --- a/resources/lang/ca/passwords.php +++ b/resources/lang/ca/passwords.php @@ -11,7 +11,7 @@ return [ | */ 'password' => 'Cal que la contrasenya sigui d\'un mínim de sis caràcters i que coincideixi amb la confirmació.', - 'reset' => 'S'ha reinicialitzat la vostra contrasenya!', + 'reset' => 'S\'ha reinicialitzat la vostra contrasenya!', 'sent' => 'Si la vostra adreça electrònica existeix a la nostra base de dades, en breus minuts rebreu un enllaç de recuperació a la vostra bústia. Si us plau, si no rebeu el missatge, comproveu la bústia de correu brossa.', 'token' => 'Aquest testimoni (token) de reinicialització de la contrasenya no és vàlid.', 'user' => 'Si la vostra adreça electrònica existeix a la nostra base de dades, en breus minuts rebreu un enllaç de recuperació a la vostra bústia. Si us plau, si no rebeu el missatge, comproveu la bústia de correu brossa.', From b16d2dbefb9a4654aea298f7df161cfac0c1e7b5 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 19:30:10 +0800 Subject: [PATCH 20/23] Update passwords.php --- resources/lang/ca/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ca/passwords.php b/resources/lang/ca/passwords.php index eb8aac15b..d8d75f764 100644 --- a/resources/lang/ca/passwords.php +++ b/resources/lang/ca/passwords.php @@ -11,7 +11,7 @@ return [ | */ 'password' => 'Cal que la contrasenya sigui d\'un mínim de sis caràcters i que coincideixi amb la confirmació.', - 'reset' => 'S\'ha reinicialitzat la vostra contrasenya!', + 'reset' => 'S'ha reinicialitzat la vostra contrasenya!', 'sent' => 'Si la vostra adreça electrònica existeix a la nostra base de dades, en breus minuts rebreu un enllaç de recuperació a la vostra bústia. Si us plau, si no rebeu el missatge, comproveu la bústia de correu brossa.', 'token' => 'Aquest testimoni (token) de reinicialització de la contrasenya no és vàlid.', 'user' => 'Si la vostra adreça electrònica existeix a la nostra base de dades, en breus minuts rebreu un enllaç de recuperació a la vostra bústia. Si us plau, si no rebeu el missatge, comproveu la bústia de correu brossa.', From a5117fcfa3c65fef0cd938c6cacc9f863fd67eeb Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 19:33:57 +0800 Subject: [PATCH 21/23] Update Installer.php --- app/Console/Commands/Installer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Installer.php index 31f4ba999..3cbf4ddb8 100644 --- a/app/Console/Commands/Installer.php +++ b/app/Console/Commands/Installer.php @@ -97,6 +97,7 @@ class Installer extends Command if(extension_loaded($ext) == false) { $this->error("- {$ext} extension not found, aborting installation"); exit; + } else { } } $this->info("- Required PHP extensions found!"); From 2a82788ab007576d0b32eb9c733e4d0898fe2442 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 19:34:36 +0800 Subject: [PATCH 22/23] Update Installer.php --- app/Console/Commands/Installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Installer.php index 3cbf4ddb8..35d4a6573 100644 --- a/app/Console/Commands/Installer.php +++ b/app/Console/Commands/Installer.php @@ -221,7 +221,7 @@ class Installer extends Command $envPath = app()->environmentFilePath(); $payload = file_get_contents($envPath); - if ($existing == $this->existingEnv($key, $payload)) { + if ($existing = $this->existingEnv($key, $payload)) { $payload = str_replace("{$key}={$existing}", "{$key}=\"{$value}\"", $payload); $this->storeEnv($payload); } else { From c241184a706aa830e1d60e962089a332300f6637 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sun, 16 Feb 2020 19:36:12 +0800 Subject: [PATCH 23/23] Update pixelfed.php --- config/pixelfed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 215cc7a12..3afe81799 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -34,7 +34,7 @@ return [ | */ 'nodeinfo' => [ - 'url' => config('app.url').'/api/nodeinfo/2.0.json', + 'url' => config('app.url').'/'.'api/nodeinfo/2.0.json', ], /*