From c4dd8449daefabda6925d693c39c97221b63275a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Oct 2019 21:27:57 -0600 Subject: [PATCH 01/38] Update Settings, hide sponsors feature until re-implemented --- resources/views/settings/partial/sidebar.blade.php | 4 ++-- routes/web.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php index 43a47b41f..272e5934a 100644 --- a/resources/views/settings/partial/sidebar.blade.php +++ b/resources/views/settings/partial/sidebar.blade.php @@ -33,9 +33,9 @@
  • Security
    • -
  • + {{--
  • Sponsor -
    • + --}}
    • diff --git a/routes/web.php b/routes/web.php index 07dcb0e40..08593aa01 100644 --- a/routes/web.php +++ b/routes/web.php @@ -149,7 +149,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('exp/rec', 'ApiController@userRecommendations'); Route::post('discover/tag/subscribe', 'HashtagFollowController@store')->middleware('throttle:maxHashtagFollowsPerHour,60')->middleware('throttle:maxHashtagFollowsPerDay,1440');; Route::get('discover/tag/list', 'HashtagFollowController@getTags'); - Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get'); + // Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get'); Route::get('bookmarks', 'InternalApiController@bookmarks'); Route::get('collection/items/{id}', 'CollectionController@getItems'); Route::post('collection/item', 'CollectionController@storeId'); @@ -318,8 +318,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('invites/create', 'UserInviteController@create')->name('settings.invites.create'); Route::post('invites/create', 'UserInviteController@store'); Route::get('invites', 'UserInviteController@show')->name('settings.invites'); - Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor'); - Route::post('sponsor', 'SettingsController@sponsorStore'); + // Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor'); + // Route::post('sponsor', 'SettingsController@sponsorStore'); }); Route::group(['prefix' => 'site'], function () { From 235790e04de3a6bd70db7e361b12b697b2b3435c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Oct 2019 21:28:57 -0600 Subject: [PATCH 02/38] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f5b7c1b..8ad28db60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - Updated StatusHashtagService, reduce cached hashtag count ttl from 6 hours to 5 minutes ([126886e8](https://github.com/pixelfed/pixelfed/commit/126886e8)) - Updated Hashtag.vue component, added formatted posts count ([c71f3dd1](https://github.com/pixelfed/pixelfed/commit/c71f3dd1)) - Updated FixLikes command, fix postgres support ([771f9c46](https://github.com/pixelfed/pixelfed/commit/771f9c46)) +- Updated Settings, hide sponsors feature until re-implemented in Profile UI ([c4dd8449](https://github.com/pixelfed/pixelfed/commit/c4dd8449)) ## Deprecated From 4fa5ca4f82626c2e20d3efb5c203ffb0532dfb2b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 20 Oct 2019 23:06:06 -0600 Subject: [PATCH 03/38] Update AuthServiceProvider --- app/Providers/AuthServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 7de25b357..285c61adb 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -27,7 +27,7 @@ class AuthServiceProvider extends ServiceProvider $this->registerPolicies(); if(config('pixelfed.oauth_enabled')) { - Passport::routes(null, ['middleware' => [ \Barryvdh\Cors\HandleCors::class ]]); + Passport::routes(null, ['middleware' => ['twofactor','validemail',\Barryvdh\Cors\HandleCors::class]]); Passport::tokensExpireIn(now()->addDays(15)); Passport::refreshTokensExpireIn(now()->addDays(30)); Passport::enableImplicitGrant(); From 43d4517f7174d8f466d3ccb3256a42ea84d63e12 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 21 Oct 2019 00:00:07 -0600 Subject: [PATCH 04/38] Update AuthServiceProvider --- app/Providers/AuthServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 285c61adb..3448b3005 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -27,7 +27,7 @@ class AuthServiceProvider extends ServiceProvider $this->registerPolicies(); if(config('pixelfed.oauth_enabled')) { - Passport::routes(null, ['middleware' => ['twofactor','validemail',\Barryvdh\Cors\HandleCors::class]]); + Passport::routes(null, ['middleware' => ['twofactor', \Barryvdh\Cors\HandleCors::class]]); Passport::tokensExpireIn(now()->addDays(15)); Passport::refreshTokensExpireIn(now()->addDays(30)); Passport::enableImplicitGrant(); From 8b57a2cfe8439cc97504bfcaa93b9299f0dc1964 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 21 Oct 2019 00:01:55 -0600 Subject: [PATCH 05/38] Update api routes --- routes/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/api.php b/routes/api.php index d3317352e..944d7cafe 100644 --- a/routes/api.php +++ b/routes/api.php @@ -60,7 +60,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) { Route::post('statuses/{id}/unreblog', 'Api\ApiV1Controller@statusUnshare')->middleware($middleware); Route::delete('statuses/{id}', 'Api\ApiV1Controller@statusDelete')->middleware($middleware); Route::get('statuses/{id}', 'Api\ApiV1Controller@statusById')->middleware($middleware); - Route::post('statuses', 'Api\ApiV1Controller@statusCreate')->middleware($middleware); + Route::post('statuses', 'Api\ApiV1Controller@statusCreate')->middleware($middleware)->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440'); Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); From 5ff9d92830f271820862a20bb921230393d783a8 Mon Sep 17 00:00:00 2001 From: okpierre <1679025+okpierre@users.noreply.github.com> Date: Sat, 26 Oct 2019 01:04:28 -0400 Subject: [PATCH 06/38] Update nginx.conf Updated to include code to prevent remote code execution on certain nginx/php-fpm configurations --- contrib/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/nginx.conf b/contrib/nginx.conf index d668ce090..ecb90e15f 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -30,6 +30,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; + try_files $fastcgi_script_name =404; fastcgi_pass unix:/run/php-fpm/php-fpm.sock; # make sure this is correct fastcgi_index index.php; include fastcgi_params; From 02c5997eb2e2db3b6aa07b4e1d312d1fc06dd1ee Mon Sep 17 00:00:00 2001 From: Nicolas Martinussen Date: Sat, 26 Oct 2019 18:48:41 +0200 Subject: [PATCH 07/38] Adding OpenGraph for videos --- resources/views/status/show.blade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index b0d768c17..a68839d51 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -17,9 +17,12 @@ @push('meta') - + + @if($status->viewType() == "video" || $status->viewType() == "video:album") + + @endif @endpush @push('scripts') From d2a90f11a0289b19ab1263b64a0f7c97615947a9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 29 Oct 2019 18:13:44 -0600 Subject: [PATCH 08/38] Update AccountTransformer --- app/Transformer/Api/AccountTransformer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php index 564d653a6..d2db1adc4 100644 --- a/app/Transformer/Api/AccountTransformer.php +++ b/app/Transformer/Api/AccountTransformer.php @@ -31,6 +31,7 @@ class AccountTransformer extends Fractal\TransformerAbstract 'url' => $profile->url(), 'avatar' => $profile->avatarUrl(), 'website' => $profile->website, + 'local' => (bool) $local, 'is_admin' => (bool) $is_admin, ]; } From 9c30c78727ac503090453f8659ed652a26c254e6 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 15:55:41 +0100 Subject: [PATCH 09/38] improve German translation --- resources/lang/de/auth.php | 2 +- resources/lang/de/helpcenter.php | 2 +- resources/lang/de/notification.php | 6 +++--- resources/lang/de/passwords.php | 6 +++--- resources/lang/de/profile.php | 10 +++++----- resources/lang/de/site.php | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/lang/de/auth.php b/resources/lang/de/auth.php index 4118bc202..053b045ad 100644 --- a/resources/lang/de/auth.php +++ b/resources/lang/de/auth.php @@ -14,6 +14,6 @@ return [ */ 'failed' => 'Diese Anmeldeinformationen stimmen nicht mit unseren Daten überein.', - 'throttle' => 'Zu viele Login-Versuche. Versuche es in :seconds Sekunden erneut.', + 'throttle' => 'Zu viele Anmeldeversuche. Versuche es in :seconds Sekunden erneut.', ]; diff --git a/resources/lang/de/helpcenter.php b/resources/lang/de/helpcenter.php index 953193239..b3953a663 100644 --- a/resources/lang/de/helpcenter.php +++ b/resources/lang/de/helpcenter.php @@ -15,7 +15,7 @@ return [ 'timelines' => 'Timelines', 'embed' => 'Einbetten', - 'communityGuidelines' => 'Community-Richtlinien', + 'communityGuidelines' => 'Gemeinschaftsrichtlinien', 'whatIsTheFediverse' => 'Was ist das Fediversum?', 'controllingVisibility' => 'Sichtbarkeit steuern', 'blockingAccounts' => 'Kontosperrung', diff --git a/resources/lang/de/notification.php b/resources/lang/de/notification.php index e08d6aea5..539881ec0 100644 --- a/resources/lang/de/notification.php +++ b/resources/lang/de/notification.php @@ -2,11 +2,11 @@ return [ - 'likedPhoto' => 'gefällt dein Foto.', + 'likedPhoto' => 'gefällt dein Beitrag.', 'likedComment' => 'gefällt dein Kommentar.', 'startedFollowingYou' => 'folgt dir nun.', - 'commented' => 'hat deinen Post kommentiert.', + 'commented' => 'hat deinen Beitrag kommentiert.', 'mentionedYou' => 'hat dich erwähnt.', - 'shared' => 'hat deinen Post teilen.', + 'shared' => 'hat deinen Beitrag geteilt.', ]; diff --git a/resources/lang/de/passwords.php b/resources/lang/de/passwords.php index b728ed830..da86a4511 100644 --- a/resources/lang/de/passwords.php +++ b/resources/lang/de/passwords.php @@ -15,8 +15,8 @@ return [ 'password' => 'Passwörter müssen mindestens 6 Zeichen lang sein und mit der Bestätigung übereinstimmen.', 'reset' => 'Dein Passwort wurde zurückgesetzt!', - 'sent' => 'Wir haben dir eine E-Mail zum Zurücksetzen deines Passworts gesendet!', - 'token' => 'Dieser Passwort-Reset-Code ist ungültig.', - 'user' => 'Wir konnten keinen Nutzer mit dieser E-Mail-Adresse finden.', + 'sent' => 'Wenn deine E-Mail-Adresse in unserer Datenbank existiert, wirst du in ein paar Minuten einen Link zum Zurücksetzen deines Passworts zugesendet bekommen. Bitte prüfe deinen Spam-Ordner, wenn du diese E-Mail nicht bekommst.', + 'token' => 'Dieser Code zum Passwort zurücksetzen ist ungültig.', + 'user' => 'Wenn deine E-Mail-Adresse in unserer Datenbank existiert, wirst du in ein paar Minuten einen Link zum Zurücksetzen deines Passworts zugesendet bekommen. Bitte prüfe deinen Spam-Ordner, wenn du diese E-Mail nicht bekommst.', ]; diff --git a/resources/lang/de/profile.php b/resources/lang/de/profile.php index 44aa5fa50..7bd312cc9 100644 --- a/resources/lang/de/profile.php +++ b/resources/lang/de/profile.php @@ -1,15 +1,15 @@ 'Dieser Benutzer hat noch nichts gepostet!', + 'emptyTimeline' => 'Dieser Benutzer hat noch nichts beigetragen!', 'emptyFollowers' => 'Diesem Benutzer folgt noch niemand!', 'emptyFollowing' => 'Dieser Benutzer folgt noch niemanden!', - 'emptySaved' => 'Du hast noch keinen Post gespeichert!', - 'savedWarning' => 'Nur du kannst sehen was du gespeichert hast', - 'privateProfileWarning' => 'Dieser Account ist privat', + 'emptySaved' => 'Du hast noch keinen Beitrag gespeichert!', + 'savedWarning' => 'Nur du kannst sehen, was du gespeichert hast', + 'privateProfileWarning' => 'Dieses Konto ist privat', 'alreadyFollow' => ':username bereits folgen?', 'loginToSeeProfile' => 'um deren Bilder und Videos zu sehen.', 'status.disabled.header' => 'Profil nicht verfügbar', - 'status.disabled.body' => 'Entschuldigung, dieses Profil ist im Moment nicht verfügbar. Bitte versuchen Sie es später noch einmal.', + 'status.disabled.body' => 'Entschuldigung, dieses Profil ist im Moment nicht verfügbar. Bitte versuche es in Kürze noch einmal.', ]; diff --git a/resources/lang/de/site.php b/resources/lang/de/site.php index c91a1bb39..1197b5e51 100644 --- a/resources/lang/de/site.php +++ b/resources/lang/de/site.php @@ -8,12 +8,12 @@ return [ 'fediverse' => 'Fediverse', 'opensource' => 'Open Source', 'terms' => 'Nutzungshinweise', - 'privacy' => 'Privacy', + 'privacy' => 'Datenschutz', 'l10nWip' => 'Wir arbeiten noch an der Unterstützung weiterer Sprachen', 'currentLocale' => 'Aktuelle Sprache', 'selectLocale' => 'Wähle eine der unterstützten Sprachen aus', 'contact' => 'Kontakt', 'contact-us' => 'Kontaktiere uns', - 'places' => 'Plätze', + 'places' => 'Orte', ]; From 8de7de4588f82ae9b82b9b87ed5d6612143b39c8 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 18:59:13 +0100 Subject: [PATCH 10/38] use Dockerfile.apache by default In docker-compose, using a symlink from ./Dockerfile to contrib/docker/Dockerfile.apache does not work. Therefore the symlink is deleted and the docker-compose.yml is instructed to use the file Dockerfile.apache in contrib by default. --- Dockerfile | 1 - docker-compose.yml | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) delete mode 120000 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 120000 index 2f722aa37..000000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -contrib/docker/Dockerfile.apache \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3d9cccc02..0d6c501a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,10 @@ services: app: # Comment to use dockerhub image - build: . + build: + context: . + dockerfile: contrib/docker/Dockerfile.apache + #dockerfile: contrib/docker/Dockerfile.fpm image: pixelfed restart: unless-stopped ## If you have a traefik running, uncomment this to expose Pixelfed @@ -36,7 +39,10 @@ services: worker: # Comment this whole block if HORIZON_EMBED is true. # Comment to use dockerhub image - build: . + build: + context: . + dockerfile: contrib/docker/Dockerfile.apache + #dockerfile: contrib/docker/Dockerfile.fpm image: pixelfed restart: unless-stopped env_file: From ffe507077861e43f2a4d840f6ce2ac193cf007fc Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 19:01:40 +0100 Subject: [PATCH 11/38] docker db use native password as auth method This commit changes the default auth plugin of mysql to mysql_native_password, because otherwise the laravel app couldn't connect to the mysql database. The following error was thrown: `SQLSTATE[HY000] [2054] The server requested authentication method unknown to the client` --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0d6c501a8..9dc61f205 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,6 +60,7 @@ services: restart: unless-stopped networks: - internal + command: --default-authentication-plugin=mysql_native_password environment: - MYSQL_DATABASE=pixelfed - MYSQL_USER=${DB_USERNAME} From d4e1123ea7180828d7773f65dd225af1ff16d915 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 19:55:04 +0100 Subject: [PATCH 12/38] docker: expose redis port so the app can connect to it --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9dc61f205..c2ed23208 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,6 +72,8 @@ services: redis: image: redis:5-alpine restart: unless-stopped + ports: + - "6379:6379" volumes: - "redis-data:/data" networks: From c62978e192c94c497265a7fed3698dafdffe8204 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 21:03:40 +0100 Subject: [PATCH 13/38] docker: install mysqldump for backup This commit installs mysqldump via the package mariadb-client to make use of `php artisan backup:run`. Without that package the command fails with the following error: ``` $ docker-compose exec app php artisan backup:run Starting backup... Dumping database pixelfed... Backup failed because The dump process failed with exitcode 127 : Command not found : sh: 1: mysqldump: not found ``` --- contrib/docker/Dockerfile.apache | 2 +- contrib/docker/Dockerfile.fpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 4e089faed..d6a364a51 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -8,7 +8,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \ libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ && locale-gen && update-locale \ && docker-php-source extract \ diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index a402726a3..2b4b94416 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -8,7 +8,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends git gosu \ optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \ libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ && locale-gen && update-locale \ && docker-php-source extract \ From c864f4b2221c3b6e6555864eb5d189cb890a2797 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Fri, 1 Nov 2019 23:58:50 +0100 Subject: [PATCH 14/38] docker: provide .env to the redis container, too --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index c2ed23208..e19334ad3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,6 +72,8 @@ services: redis: image: redis:5-alpine restart: unless-stopped + env_file: + - ./.env ports: - "6379:6379" volumes: From b825c35d8547c3018fd51a313be1d6726dc0736d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 1 Nov 2019 20:15:56 -0600 Subject: [PATCH 15/38] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ad28db60..bc8fb4bdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,8 @@ - Updated Hashtag.vue component, added formatted posts count ([c71f3dd1](https://github.com/pixelfed/pixelfed/commit/c71f3dd1)) - Updated FixLikes command, fix postgres support ([771f9c46](https://github.com/pixelfed/pixelfed/commit/771f9c46)) - Updated Settings, hide sponsors feature until re-implemented in Profile UI ([c4dd8449](https://github.com/pixelfed/pixelfed/commit/c4dd8449)) +- Updated Status view, added ```video``` open graph tag support ([#1799](https://github.com/pixelfed/pixelfed/pull/1799)) +- Updated AccountTransformer, added ```local``` attribute ([d2a90f11](https://github.com/pixelfed/pixelfed/commit/d2a90f11)) ## Deprecated From 534385ed4ec42ffa625ffe02be502749b1a3b4ce Mon Sep 17 00:00:00 2001 From: Strubbl <97055+Strubbl@users.noreply.github.com> Date: Sat, 2 Nov 2019 15:10:44 +0100 Subject: [PATCH 16/38] Update CONTRIBUTING.md add info about which branch is used for what --- CONTRIBUTING.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e8b7d9827..f9d2304cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,8 +10,13 @@ Remember, bug reports are created in the hope that others with the same problem ## Core Development Discussion Informal discussion regarding bugs, new features, and implementation of existing features takes place in the ```#pixelfed-dev``` channel on the Freenode IRC network. +## Branches +If you want to contribute to this repository, please file your pull request against the `staging` branch. + +Pixelfed Beta currently uses the `dev` branch for deployable code. When v1.0 is released, the stable branch will be changed to `master`, with `dev` branch being used for development and testing. + ## Compiled Assets If you are submitting a change that will affect a compiled file, such as most of the files in ```resources/assets/sass``` or ```resources/assets/js``` of the pixelfed/pixelfed repository, do not commit the compiled files. Due to their large size, they cannot realistically be reviewed by a maintainer. This could be exploited as a way to inject malicious code into Pixelfed. In order to defensively prevent this, all compiled files will be generated and committed by Pixelfed maintainers. ## Security Vulnerabilities -If you discover a security vulnerability within Pixelfed, please send an email to Daniel Supernault at hello@pixelfed.org. All security vulnerabilities will be promptly addressed. \ No newline at end of file +If you discover a security vulnerability within Pixelfed, please send an email to Daniel Supernault at hello@pixelfed.org. All security vulnerabilities will be promptly addressed. From 6d40876ae82c6e1752bdf56db88d9af254cf0d1b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Nov 2019 21:12:44 -0600 Subject: [PATCH 17/38] Update Site Config --- app/Util/Site/Config.php | 8 ++++++++ config/instance.php | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php index 3e6c5351f..f80d68c26 100644 --- a/app/Util/Site/Config.php +++ b/app/Util/Site/Config.php @@ -36,6 +36,14 @@ class Config { 'site' => [ 'domain' => config('pixelfed.domain.app'), 'url' => config('app.url') + ], + + 'username' => [ + 'remote' => [ + 'formats' => config('instance.username.remote.formats'), + 'format' => config('instance.username.remote.format'), + 'custom' => config('instance.username.remote.custom') + ] ] ]; }); diff --git a/config/instance.php b/config/instance.php index b01b43c38..706d06274 100644 --- a/config/instance.php +++ b/config/instance.php @@ -39,5 +39,11 @@ return [ 'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.') ] ], - + 'username' => [ + 'remote' => [ + 'formats' => ['@', 'from', 'custom'], + 'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@', + 'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null) + ] + ], ]; \ No newline at end of file From d8a8c2d83dc3bd105999cbcc97fddeafd8269966 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Sun, 3 Nov 2019 11:45:03 +0100 Subject: [PATCH 18/38] Revert "docker: expose redis port so the app can connect to it" This reverts commit d4e1123ea7180828d7773f65dd225af1ff16d915. --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e19334ad3..27cec3fe4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,8 +74,6 @@ services: restart: unless-stopped env_file: - ./.env - ports: - - "6379:6379" volumes: - "redis-data:/data" networks: From 63514075bd78f2e5b145e37a414a50d1946176ea Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Sun, 3 Nov 2019 11:45:33 +0100 Subject: [PATCH 19/38] Revert "docker: provide .env to the redis container, too" This reverts commit c864f4b2221c3b6e6555864eb5d189cb890a2797. --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 27cec3fe4..9dc61f205 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,8 +72,6 @@ services: redis: image: redis:5-alpine restart: unless-stopped - env_file: - - ./.env volumes: - "redis-data:/data" networks: From a890426466fa9ecf288162208e9ecb7ee889c7f1 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 5 Nov 2019 23:33:50 -0700 Subject: [PATCH 20/38] Update custom sass --- resources/assets/sass/custom.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index ecff04bb3..fb3c9aa17 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -565,4 +565,8 @@ details summary::-webkit-details-marker { .VueCarousel-dot:focus, .VueCarousel-dot--active:focus { outline: 0px !important; +} + +.status-content > p:first-child { + display: inline; } \ No newline at end of file From b1ed4a2744a038465e277cf22cbb35ebe054f2b2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 5 Nov 2019 23:34:31 -0700 Subject: [PATCH 21/38] Update app sass --- resources/assets/sass/app.scss | 4 ---- resources/assets/sass/appdark.scss | 4 ---- 2 files changed, 8 deletions(-) diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 3aa42e500..428351bfa 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -21,8 +21,4 @@ @import '~bootstrap-vue/dist/bootstrap-vue.css'; -@import '~plyr/dist/plyr.css'; - -@import '~vue-loading-overlay/dist/vue-loading.css'; - @import "moment"; \ No newline at end of file diff --git a/resources/assets/sass/appdark.scss b/resources/assets/sass/appdark.scss index 08d8c02d9..d88a375e5 100644 --- a/resources/assets/sass/appdark.scss +++ b/resources/assets/sass/appdark.scss @@ -72,10 +72,6 @@ textarea { @import '~bootstrap-vue/dist/bootstrap-vue.css'; -@import '~plyr/dist/plyr.css'; - -@import '~vue-loading-overlay/dist/vue-loading.css'; - @import "moment"; .border { From 9ca8d88fdcf5330dd41ecb892dded1bf19f6cead Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 5 Nov 2019 23:36:18 -0700 Subject: [PATCH 22/38] Update Profile component --- resources/assets/js/components/Profile.vue | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index fb163fae2..7d7ea1efe 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -164,7 +164,7 @@
    - +
    @@ -329,7 +329,7 @@ :gutter="{default: '5px'}" >
    - +
    @@ -1080,6 +1080,22 @@ formatCount(count) { return App.util.format.count(count); + }, + + statusUrl(status) { + if(status.local == true) { + return status.url; + } + + return '/i/web/post/_/' + status.account.id + '/' + status.id; + }, + + profileUrl(status) { + if(status.local == true) { + return status.account.url; + } + + return '/i/web/profile/_/' + status.account.id; } } } From 6a81f161fad96c2c7c47be1c562d5f9514073602 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 10 Nov 2019 17:25:28 -0700 Subject: [PATCH 23/38] Update Story model --- app/Story.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/Story.php b/app/Story.php index 314679b69..104f0e58f 100644 --- a/app/Story.php +++ b/app/Story.php @@ -4,9 +4,26 @@ namespace App; use Auth; use Illuminate\Database\Eloquent\Model; +use Pixelfed\Snowflake\HasSnowflakePrimary; class Story extends Model { + use HasSnowflakePrimary; + + /** + * Indicates if the IDs are auto-incrementing. + * + * @var bool + */ + public $incrementing = false; + + /** + * The attributes that should be mutated to dates. + * + * @var array + */ + protected $dates = ['published_at', 'expires_at']; + protected $visible = ['id']; public function profile() From 3b8fe9d574ddd07d41cd65e66e734029a897b8b7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 10 Nov 2019 17:25:52 -0700 Subject: [PATCH 24/38] Update StoryItem model --- app/StoryItem.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app/StoryItem.php b/app/StoryItem.php index 263605768..7a87d18ef 100644 --- a/app/StoryItem.php +++ b/app/StoryItem.php @@ -3,10 +3,29 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Pixelfed\Snowflake\HasSnowflakePrimary; use Storage; class StoryItem extends Model { + use HasSnowflakePrimary; + + /** + * Indicates if the IDs are auto-incrementing. + * + * @var bool + */ + public $incrementing = false; + + /** + * The attributes that should be mutated to dates. + * + * @var array + */ + protected $dates = ['expires_at']; + + protected $visible = ['id']; + public function story() { return $this->belongsTo(Story::class); @@ -14,6 +33,6 @@ class StoryItem extends Model public function url() { - return Storage::url($this->media_path); + return url(Storage::url($this->media_path)); } } From b73823b11ad2924f15175b12fc4775f32b5321a4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 10 Nov 2019 17:26:29 -0700 Subject: [PATCH 25/38] Update StoryView model --- app/StoryView.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/StoryView.php b/app/StoryView.php index a2674519d..6d370435b 100644 --- a/app/StoryView.php +++ b/app/StoryView.php @@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model; class StoryView extends Model { + public $fillable = ['story_id', 'profile_id']; + public function story() { return $this->belongsTo(Story::class); From 16631d3599c783e4a122989df12c142a6742422b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 10 Nov 2019 17:41:27 -0700 Subject: [PATCH 26/38] Update app.js --- resources/assets/js/app.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 4593326a4..d3f7d4ecc 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -20,19 +20,18 @@ window.App.boot = function() { new Vue({ el: '#content'}); } + window.App.util = { time: (function() { return new Date; }), - version: (function() { - return 1; - }), + version: 1, format: { - count: (function(count = 0) { + count: (function(count = 0, locale = 'en-GB', notation = 'compact') { if(count < 1) { return 0; } - return new Intl.NumberFormat('en-GB', { notation: "compact" , compactDisplay: "short" }).format(count); + return new Intl.NumberFormat(locale, { notation: notation , compactDisplay: "short" }).format(count); }) }, filters: [ @@ -78,5 +77,6 @@ window.App.util = { ['Willow','filter-willow'], ['X-Pro II','filter-xpro-ii'] ], - emoji: ['😂','💯','❤️','🙌','👏','👌','😍','😯','😢','😅','😁','🙂','😎','😀','🤣','😃','😄','😆','😉','😊','😋','😘','😗','😙','😚','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','🙁','😖','😞','😟','😤','😭','😦','😧','😨','😩','🤯','😬','😰','😱','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾','🤲','👐','🤝','👍','👎','👊','✊','🤛','🤜','🤞','✌️','🤟','🤘','👈','👉','👆','👇','☝️','✋','🤚','🖐','🖖','👋','🤙','💪','🖕','✍️','🙏','💍','💄','💋','👄','👅','👂','👃','👣','👁','👀','🧠','🗣','👤','👥'], + emoji: ['😂','💯','❤️','🙌','👏','👌','😍','😯','😢','😅','😁','🙂','😎','😀','🤣','😃','😄','😆','😉','😊','😋','😘','😗','😙','😚','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','🙁','😖','😞','😟','😤','😭','😦','😧','😨','😩','🤯','😬','😰','😱','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾','🤲','👐','🤝','👍','👎','👊','✊','🤛','🤜','🤞','✌️','🤟','🤘','👈','👉','👆','👇','☝️','✋','🤚','🖐','🖖','👋','🤙','💪','🖕','✍️','🙏','💍','💄','💋','👄','👅','👂','👃','👣','👁','👀','🧠','🗣','👤','👥' + ], }; \ No newline at end of file From 420131a1adac34f43ff887fcb56a655b0eb95247 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 10 Nov 2019 18:19:00 -0700 Subject: [PATCH 27/38] Update CollectionComponent --- .../js/components/CollectionComponent.vue | 59 +++++++++++++++++-- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/CollectionComponent.vue b/resources/assets/js/components/CollectionComponent.vue index 56dd8318f..bf7c4b58f 100644 --- a/resources/assets/js/components/CollectionComponent.vue +++ b/resources/assets/js/components/CollectionComponent.vue @@ -15,7 +15,14 @@

    - +         @@ -62,7 +69,20 @@ - + +

    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -105,12 +125,15 @@ export default { return { loaded: false, posts: [], + ids: [], currentUser: false, owner: false, title: this.collectionTitle, description: this.collectionDescription, visibility: this.collectionVisibility, - photoId: '' + photoId: '', + postsList: [], + loadingPostList: false } }, @@ -135,6 +158,9 @@ export default { axios.get('/api/local/collection/items/' + this.collectionId) .then(res => { this.posts = res.data; + this.ids = this.posts.map(p => { + return p.id; + }); this.loaded = true; }); }, @@ -149,11 +175,34 @@ export default { }, addToCollection() { - this.$refs.addPhotoModal.show(); + let self = this; + this.loadingPostList = true; + if(this.postsList.length == 0) { + axios.get('/api/pixelfed/v1/accounts/'+this.profileId+'/statuses', { + params: { + min_id: 1, + limit: 13 + } + }) + .then(res => { + self.postsList = res.data.filter(l => { + return self.ids.indexOf(l.id) == -1; + }).splice(0,9); + self.loadingPostList = false; + self.$refs.addPhotoModal.show(); + }).catch(err => { + self.loadingPostList = false; + swal('An Error Occured', 'We cannot process your request at this time, please try again later.', 'error'); + }) + } else { + this.$refs.addPhotoModal.show(); + this.loadingPostList = false; + } }, pushId() { let max = 18; + let self = this; if(this.posts.length >= max) { swal('Error', 'You can only add ' + max + ' posts per collection', 'error'); return; @@ -174,7 +223,7 @@ export default { collection_id: this.collectionId, post_id: split[5] }).then(res => { - location.reload(); + self.ids.push(...split[5]); }).catch(err => { swal('Invalid URL', 'The post you entered was invalid', 'error'); this.photoId = ''; From bb929ac3468d29895ceaa5bac7b740139002508f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 10 Nov 2019 18:20:43 -0700 Subject: [PATCH 28/38] Update Timeline.vue component --- resources/assets/js/components/Timeline.vue | 80 +++++++++++++++++---- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 08ff05342..85c8b51c6 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -2,6 +2,7 @@
    +